openfund-maker 2.2.3__tar.gz → 2.2.5__tar.gz

{openfund_maker-2.2.3 → openfund_maker-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openfund-maker
-Version: 2.2.3
+Version: 2.2.5
 Summary: Openfund-maker.
 Requires-Python: >=3.9,<4.0
 Classifier: Programming Language :: Python :: 3

{openfund_maker-2.2.3 → openfund_maker-2.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openfund-maker"
-version = "2.2.3"
+version = "2.2.5"
 description = "Openfund-maker."
 authors = []
 readme = "README.md"
@@ -30,7 +30,7 @@ priority = "primary"
 
 [tool.pytest.ini_options] # mandatory section name
 addopts = "-vs --no-header --no-summary"
-log_cli = 1
+log_cli = true
 log_cli_level = "DEBUG"
 log_cli_format = "%(asctime)s.%(msecs)03d - %(filename)s:%(lineno)d - %(funcName)s - %(levelname)s - %(message)s"
 log_cli_datefmt = "%Y-%m-%d-%H:%M:%S"

{openfund_maker-2.2.3 → openfund_maker-2.2.5}/src/maker/ThreeLineStrategyMaker.py

@@ -20,6 +20,10 @@ class ThreeLineStrategyMaker:
         self.is_demo_trading = self.g_config.get('is_demo_trading', 1)  # live trading: 0, demo trading: 1
         # self.instrument_info_dict = {}
         self.cross_directions = {} # 持仓期间，存储每个交易对的交叉方向 
+        proxies = {
+            "http": self.g_config.get('proxy', "http://localhost:7890"),
+            "https": self.g_config.get('proxy', "http://localhost:7890")
+        }
 
         # 配置交易所
         self.exchange = ccxt.okx({
@@ -29,7 +33,7 @@ class ThreeLineStrategyMaker:
             'timeout': 3000,
             'rateLimit': 50,
             'options': {'defaultType': 'future'},
-            # 'proxies': {'http': 'http://127.0.0.1:7890', 'https': 'http://127.0.0.1:7890'},
+            'proxies': proxies
         })