openfund-maker 1.2.4__tar.gz → 1.2.7__tar.gz

{openfund_maker-1.2.4 → openfund_maker-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openfund-maker
-Version: 1.2.4
+Version: 1.2.7
 Summary: Openfund-maker.
 Requires-Python: >=3.9,<4.0
 Classifier: Programming Language :: Python :: 3
@@ -9,11 +9,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: TA-Lib (>=0.6.3,<0.7.0)
 Requires-Dist: ccxt (>=4.4.26,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
-Requires-Dist: pydantic-settings (>=2.1.0,<3.0.0)
-Requires-Dist: python-okx (>=0.3.5,<0.4.0)
-Requires-Dist: requests (>=2.27.1,<3.0.0)
+Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Description-Content-Type: text/markdown
 
 # jiezhen

{openfund_maker-1.2.4 → openfund_maker-1.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openfund-maker"
-version = "1.2.4"
+version = "1.2.7"
 description = "Openfund-maker."
 authors = []
 readme = "README.md"
@@ -11,10 +11,9 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.9"
 ccxt = "^4.4.26"
-requests = "^2.27.1"
-pydantic-settings = "^2.1.0"
-python-okx = "^0.3.5"
 pandas = "^2.2.3"
+TA-Lib = "^0.6.3"
+pyyaml = "^6.0.2"
 
 
 [tool.poetry.group.dev.dependencies]

{openfund_maker-1.2.4 → openfund_maker-1.2.7}/src/maker/MACDOrderBot.py

@@ -63,7 +63,7 @@ class MACDOrdergBot(ThreeLineOrdergBot):
                 break
             
         self.logger.debug(f"{symbol} : \n- 所有cross {all_cross} \n- 零轴之上cross {last_up_crosses} \n- 零轴之下cross {last_down_crosses} \n- 其他corss {other_crosses}。")
-        valid_klines = pair_config.get('valid_klines', 3)
+        valid_klines = pair_config.get('valid_klines', 5)
         # 如果最新的交叉是金叉，且又是零轴上方的金叉
         if len(last_up_crosses) > 0 and all_cross[0][0] == 'golden' and all_cross[0][1] == last_up_crosses[0][1] and len(macd) - all_cross[0][1] <= valid_klines:
             order_side =  'buy'
@@ -79,7 +79,9 @@ class MACDOrdergBot(ThreeLineOrdergBot):
            # 零轴之上的死叉-金叉-死叉模式
             if (last_up_crosses[0][0] == 'death' and 
                 last_up_crosses[1][0] == 'golden' and 
-                last_up_crosses[2][0] == 'death'):
+                last_up_crosses[2][0] == 'death' and
+                len(macd) - last_up_crosses[0][1] <= valid_klines
+                ):
                 order_side = 'sell'
                 self.logger.debug(f"{symbol} : 零轴之上的死叉-金叉-死叉模式 {order_side}。")
             
@@ -87,7 +89,9 @@ class MACDOrdergBot(ThreeLineOrdergBot):
             # 零轴之下的金叉-死叉-金叉模式
             if (last_down_crosses[0][0] == 'golden' and 
                   last_down_crosses[1][0] == 'death' and 
-                  last_down_crosses[2][0] == 'golden'):
+                  last_down_crosses[2][0] == 'golden' and
+                  len(macd) - last_down_crosses[0][1] <= valid_klines
+                  ):
                 order_side = 'buy'
                 self.logger.debug(f"{symbol} : 零轴之下的金叉-死叉-金叉模式 {order_side}。")
                 

{openfund_maker-1.2.4 → openfund_maker-1.2.7}/src/maker/main.py

@@ -1,6 +1,5 @@
-import os
-import json
 import logging
+import yaml
 from logging.handlers import TimedRotatingFileHandler
 
 from maker.WickReversalOrderBot import WickReversalOrderBot
@@ -25,13 +24,24 @@ def build_logger(log_config) -> logging.Logger:
         
         return logger
     
+def read_config_file(file_path):
+    try:
+        # 打开 YAML 文件
+        with open(file_path, 'r', encoding='utf-8') as file:
+            # 使用 yaml.safe_load 方法解析 YAML 文件内容
+            data = yaml.safe_load(file)
+            return data
+    except FileNotFoundError:
+        raise Exception(f"文件 {file_path} 未找到。")
+    except yaml.YAMLError as e:
+        raise Exception(f"解析 {file_path} 文件时出错: {e}")
+    
 def main():   
     import importlib.metadata
     version = importlib.metadata.version("openfund-maker")
-
-    wick_reversal_config_path = 'config.json'
-    with open(wick_reversal_config_path, 'r') as f:
-        config_data = json.load(f)
+    
+    maker_config_path = 'maker_config.yaml'
+    config_data = read_config_file(maker_config_path)
         
     platform_config = config_data['okx']
     feishu_webhook_url = config_data['feishu_webhook']