openfund-maker 1.3.13__py3-none-any.whl → 1.3.15__py3-none-any.whl

maker/MACDStrategyMaker.py

@@ -109,22 +109,22 @@ class MACDStrategyMaker(ThreeLineStrategyMaker):
         
         # valid_klines = strategy.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(kLines) - all_cross[0][1] <= valid_klines):
-            order_side =  'buy'
-            self.logger.debug(f"{symbol} : 零轴之上的macd与signal形成金叉{all_cross[0]} 。") 
+        # if (len(last_up_crosses) > 0 and 
+        #     all_cross[0][0] == 'golden' and 
+        #     all_cross[0][1] == last_up_crosses[0][1] and 
+        #     len(kLines) - all_cross[0][1] <= valid_klines):
+        #     order_side =  'buy'
+        #     self.logger.debug(f"{symbol} : 零轴之上的macd与signal形成金叉{all_cross[0]} 。") 
             
-        # # 如果最新的交叉是死叉，且又是零轴下方的死叉
-        elif (len(last_down_crosses) > 0 and 
-              all_cross[0][0] == 'death' and 
-              all_cross[0][1] == last_down_crosses[0][1] and 
-              len(kLines) - all_cross[0][1] <= valid_klines):
-            order_side ='sell'
-            self.logger.debug(f"{symbol} : 零轴之下的macd与signal形成死叉{all_cross[0]} 。")
+        # # # 如果最新的交叉是死叉，且又是零轴下方的死叉
+        # elif (len(last_down_crosses) > 0 and 
+        #       all_cross[0][0] == 'death' and 
+        #       all_cross[0][1] == last_down_crosses[0][1] and 
+        #       len(kLines) - all_cross[0][1] <= valid_klines):
+        #     order_side ='sell'
+        #     self.logger.debug(f"{symbol} : 零轴之下的macd与signal形成死叉{all_cross[0]} 。")
         # 分析交叉点模式，要满足连续的三个交叉都是零上
-        elif len(last_up_crosses) == 3 and len(all_cross) == 3:
+        if len(last_up_crosses) == 3 and len(all_cross) == 3:
       
            # 零轴之上的死叉-金叉-死叉模式
             if (last_up_crosses[0][0] == 'death' and 
@@ -153,24 +153,28 @@ class MACDStrategyMaker(ThreeLineStrategyMaker):
         
         order_side = 'none'
         try:
+            # 20250312 增加validate_mode, 0: 严格模式，用MACD形态校验 1: 宽松模式，只看K线金叉死叉
+            validate_mode = int(strategy.get('validate_mode', 0)) 
             htf = str(strategy.get('HTF', '1h')) 
             htf_kLines = self.get_historical_klines(symbol=symbol, bar=htf)
             
-            # 20250312 修改为MACD形态校验，而不只是金死叉
-            order_side = self.judge_order_side(symbol, kLines=htf_kLines)
-            self.logger.debug(f"{symbol} : HTF={htf} , {order_side}。")
-            # crosses = self.get_macd_cross_direction(symbol, htf_kLines, strategy)
-            # all_cross = crosses.get('all_cross',[])
-            # if len(all_cross) > 1:
-            #     if all_cross[0][0] == 'golden':
-            #         order_side = 'buy'
-            #     else:
-            #         order_side = 'sell'
-       
-            #     self.logger.debug(f"{symbol} : HTF={htf} , {order_side}。")
+            if validate_mode == 0 : # 0: 严格模式，用MACD形态校验
+                # 20250312 修改为MACD形态校验，而不只是金死叉
+                order_side = self.judge_order_side(symbol, kLines=htf_kLines)
+                self.logger.debug(f"{symbol} : HTF={htf} , {order_side}。")
+            else: # 1: 宽松模式，只看K线金叉死叉               
+                crosses = self.get_macd_cross_direction(symbol, htf_kLines, strategy)
+                all_cross = crosses.get('all_cross',[])
+                if len(all_cross) > 1:
+                    if all_cross[0][0] == 'golden':
+                        order_side = 'buy'
+                    else:
+                        order_side = 'sell'
+        
+                    self.logger.debug(f"{symbol} : HTF={htf} , {order_side}。")
 
-            # else:
-            #     self.logger.debug(f"{symbol} : HTF={htf} ,没有满足条件的交叉点。")
+                else:
+                    self.logger.debug(f"{symbol} : HTF={htf} ,没有满足条件的交叉点。")
 
         except Exception as e:
             error_message = f"程序异常退出: {str(e)}"

{openfund_maker-1.3.13.dist-info → openfund_maker-1.3.15.dist-info}/METADATA

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

{openfund_maker-1.3.13.dist-info → openfund_maker-1.3.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maker/MACDStrategyMaker.py,sha256=7qH295CZrnGgJr9THo_EYZ65R5mni6DlSaw_8tTWSWY,12252
+maker/MACDStrategyMaker.py,sha256=iS5HO04piKHFJxUI2e5QmicxzGeK-V1aphJSr2n_4Ac,12651
 maker/ThreeLineStrategyMaker.py,sha256=5uUTRMOCe0-0d2Ll7Bzhe-0WKpnfddhDEaj3XTGDgyA,30270
 maker/WickReversalStrategyMaker.py,sha256=7DqPDVJot4EM0_lSAcFAHrR9rNvkIds9KLMoDOiAHEc,17486
 maker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,7 +8,7 @@ maker/main_m.py,sha256=0PzDTnuBrxfpy5WDfsIHKAzZ_7pkuvuqqeWik0vpWio,15522
 maker/okxapi.py,sha256=_9G0U_o0ZC8NxaT6PqpiLgxBm9gPobC9PsFHZE1c5w0,553
 maker/zhen.py.bak,sha256=HNkrQbJts8G9umE9chEFsc0cLQApcM9KOVNMYPpkBXM,10918
 maker/zhen_2.py,sha256=4IaHVtTCMSlrLGSTZrWpW2q-f7HZsUNRkW_-5QgWv24,10509
-openfund_maker-1.3.13.dist-info/METADATA,sha256=82LdYVRVcA-0gddtCmDItaA2J2TgsKmopVYWqH6V9Qc,1954
-openfund_maker-1.3.13.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-1.3.13.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-1.3.13.dist-info/RECORD,,
+openfund_maker-1.3.15.dist-info/METADATA,sha256=Owok3SrtHJfxyx8TvF0gk8WKZEyqD8kFmOkS-_T9UpQ,1954
+openfund_maker-1.3.15.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-1.3.15.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-1.3.15.dist-info/RECORD,,