openfund-maker 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

maker/MACDOrderBot.py

@@ -63,14 +63,14 @@ 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 all_cross[0][0] == 'golden' and all_cross[0][1] == last_up_crosses[0][1] and len(macd) - all_cross[0][1] <= valid_klines:
+        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'
             self.logger.debug(f"{symbol} : 零轴之上的macd与signal形成金叉{all_cross[0]} 。") 
             
         # 如果最新的交叉是死叉，且又是零轴下方的死叉
-        elif all_cross[0][0] == 'death' and all_cross[0][1] == last_down_crosses[0][1] and len(macd) - all_cross[0][1] <= valid_klines:
+        elif len(last_down_crosses) > 0 and all_cross[0][0] == 'death' and all_cross[0][1] == last_down_crosses[0][1] and len(macd) - all_cross[0][1] <= valid_klines:
             order_side ='sell'
             self.logger.debug(f"{symbol} : 零轴之下的macd与signal形成死叉{all_cross[0]} 。")
         # 分析交叉点模式，要满足连续的三个交叉都是零上
@@ -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.3.dist-info → openfund_maker-1.2.5.dist-info}/METADATA

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

{openfund_maker-1.2.3.dist-info → openfund_maker-1.2.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maker/MACDOrderBot.py,sha256=4H82wAmTvXNcv9JloJD9bVf-TLyJyfUumVcB8C1IY0k,8722
+maker/MACDOrderBot.py,sha256=XA-eZBMJ3zYFrpafMiH8YDmT_IKNQMDVr0pq4xMPRiQ,8962
 maker/ThreeLineOrderBot.py,sha256=I-Y-bMUfBKUB00rNF1UtTc08T5IND1LEBVjHUzG89vU,29064
 maker/WickReversalOrderBot.py,sha256=Oc6wChdWu39lfWh3NRHM8BqvaRIYDNZiDR6PDnE9XUM,17374
 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.2.3.dist-info/METADATA,sha256=O5Fnst4_dQnjVXuvxv5X6_XiA7KoVt26whJi7gyzgdY,1965
-openfund_maker-1.2.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-1.2.3.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-1.2.3.dist-info/RECORD,,
+openfund_maker-1.2.5.dist-info/METADATA,sha256=rWWARTIvhux8zmS795-yK0GTtXEe1dJDuugl4bzTTVc,1965
+openfund_maker-1.2.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-1.2.5.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-1.2.5.dist-info/RECORD,,