Merge pull request #2 from lowwor/master

feat: remove limit of coin pairs
zvtvz · Aug 28, 2020 · ea4648d · ea4648d
2 parents 520bf5e + 03199a5
commit ea4648d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/zvt_ccxt/accounts/ccxt_account.py b/zvt_ccxt/accounts/ccxt_account.py
@@ -8,6 +8,7 @@
 
 
 class CCXTAccount(object):
+    exchange_cache = {}
     exchanges = COIN_EXCHANGES
     exchange_conf = {}
 
@@ -37,9 +38,13 @@ def get_safe_sleeping_time(cls, exchange):
 
     @classmethod
     def get_ccxt_exchange(cls, exchange_str) -> ccxt.Exchange:
+        if cls.exchange_cache.get(exchange_str):
+            return cls.exchange_cache[exchange_str]
+
         exchange = eval("ccxt.{}()".format(exchange_str))
         exchange.apiKey = cls.exchange_conf[exchange_str]['apiKey']
         exchange.secret = cls.exchange_conf[exchange_str]['secret']
         # set to your proxies if need
         exchange.proxies = {'http': zvt_env['http_proxy'], 'https': zvt_env['https_proxy']}
+        cls.exchange_cache[exchange_str] = exchange
         return exchange
diff --git a/zvt_ccxt/recorders/coin_kdata_recorder.py b/zvt_ccxt/recorders/coin_kdata_recorder.py
@@ -28,7 +28,7 @@ def __init__(self,
                  codes=None,
                  batch_size=10,
                  force_update=True,
-                 sleeping_time=10,
+                 sleeping_time=1,
                  default_size=2000,
                  real_time=False,
                  fix_duplicate_way='ignore',

diff --git a/zvt_ccxt/recorders/coin_recorder.py b/zvt_ccxt/recorders/coin_recorder.py
@@ -1,17 +1,17 @@
 import pandas as pd
-
 from zvt.contract.api import df_to_db
 from zvt.contract.recorder import Recorder
+
 from zvt_ccxt.accounts import CCXTAccount
 from zvt_ccxt.domain import Coin
-from zvt_ccxt.settings import COIN_EXCHANGES, COIN_PAIRS
+from zvt_ccxt.settings import COIN_EXCHANGES
 
 
 class CoinMetaRecorder(Recorder):
     provider = 'ccxt'
     data_schema = Coin
 
-    def __init__(self, batch_size=10, force_update=False, sleeping_time=10, exchanges=COIN_EXCHANGES) -> None:
+    def __init__(self, batch_size=10, force_update=False, sleeping_time=1, exchanges=COIN_EXCHANGES) -> None:
         super().__init__(batch_size, force_update, sleeping_time)
         self.exchanges = exchanges
 
@@ -30,6 +30,8 @@ def run(self):
 
                 aa = []
                 for market in markets:
+                    if not market['active']:
+                        continue
                     if markets_type == dict:
                         name = market
                         code = market
@@ -38,8 +40,7 @@ def run(self):
                         code = market['symbol']
                         name = market['symbol']
 
-                    if name not in COIN_PAIRS:
-                        continue
+
                     aa.append(market)
 
                     security_item = {