openfund-maker 2.1.11__py3-none-any.whl → 2.1.13__py3-none-any.whl

maker/BestFVGStrategyMaker.py

@@ -103,7 +103,7 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
                     return
             else:
                 valid_htf_struct = htf_struct
-                self.logger.debug(f"{symbol} : {htf} 形成新的 {htf_entry_struct} struct。{valid_htf_struct['struct']} prd={htf_prd}。")
+                self.logger.debug(f"{symbol} : {htf} 形成新的struct。{valid_htf_struct['struct']} prd={htf_prd}。")
             
             # 检查是否已形成有效的结构
             htf_struct_label = valid_htf_struct["struct"]
@@ -112,7 +112,7 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             # 20250417 优化: 最新的HTF_entry_struct结构要满足，才能下单。
             if  htf_entry_struct not in htf_struct_label :
                 # 如果是反转结构判断一下方向是否一致，不一致重置缓存。
-                if "CHoCH" in htf_struct_label and htf_last_CHoCH["side"] != htf_side:
+                if "CHoCH" in htf_struct_label and htf_last_CHoCH and htf_last_CHoCH["side"] != htf_side:
                     self.htf_last_CHoCH[symbol] = {}
                 self.logger.debug(f"{symbol} : {htf} is {htf_struct_label}, 未形成有效的 {htf_entry_struct} struct,不下单。")
                 return

maker/SMCStrategyMaker.py

@@ -489,8 +489,8 @@ class SMCStrategyMaker(ThreeLineStrategyMaker):
             return False
         current_high = data.at[index, 'high']
         prev_highs = data['high'].iloc[max(0,index - period):index]
-        next_highs = data['high'].iloc[index :min(len(data),index + period + 1)]
-        return all(current_high >= prev_highs) and all(current_high >= next_highs)
+        next_highs = data['high'].iloc[index+1 :min(len(data),index + period )+1]
+        return all(current_high >= prev_highs) and all(current_high > next_highs)
 
 
     def is_pivot_low(self, data, index, period, check_bounds=False):
@@ -505,7 +505,7 @@ class SMCStrategyMaker(ThreeLineStrategyMaker):
             return False
         current_low = data.at[index, 'low']
         prev_lows = data['low'].iloc[max(0,index - period):index]
-        next_lows = data['low'].iloc[index :min(len(data),index + period + 1)]
+        next_lows = data['low'].iloc[index+1 :min(len(data),index + period)+1]
         return all(current_low <= prev_lows) and all(current_low <= next_lows)
     
     def round_price(self,symbol, price):

{openfund_maker-2.1.11.dist-info → openfund_maker-2.1.13.dist-info}/METADATA

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

{openfund_maker-2.1.11.dist-info → openfund_maker-2.1.13.dist-info}/RECORD

@@ -1,6 +1,6 @@
-maker/BestFVGStrategyMaker.py,sha256=eQrBB8qCf3ErweYhcQI_eaa3smPw3lQ5J8pQYgHd9Go,11682
+maker/BestFVGStrategyMaker.py,sha256=oZafiWLkyIY6Su17eqF27cXeRSYrmLnGWDeEejVLMsU,11681
 maker/MACDStrategyMaker.py,sha256=iS5HO04piKHFJxUI2e5QmicxzGeK-V1aphJSr2n_4Ac,12651
-maker/SMCStrategyMaker.py,sha256=ThXxa-mfbxNavqok86fUg-HstMdVrBVS75TeCJCt2Ck,35087
+maker/SMCStrategyMaker.py,sha256=7WxwfDpuxED3-HO9vcqGZJQYMoMBIBSnOpWVl1Wc78c,35087
 maker/ThreeLineStrategyMaker.py,sha256=ArjnHlGECiD3cCFXxO0Ex5scR2agwoxZY-4mKukyKc4,30402
 maker/WickReversalStrategyMaker.py,sha256=7DqPDVJot4EM0_lSAcFAHrR9rNvkIds9KLMoDOiAHEc,17486
 maker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,7 +10,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-2.1.11.dist-info/METADATA,sha256=Gtv2JpXBjB9wokm71fY3ltGqXBo1EE7tIwbl0K2o6ik,1954
-openfund_maker-2.1.11.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-2.1.11.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-2.1.11.dist-info/RECORD,,
+openfund_maker-2.1.13.dist-info/METADATA,sha256=PAWFcYJ99IKCCB57hgSpc3M3Prd5SaIUncaZFNDW1kI,1954
+openfund_maker-2.1.13.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-2.1.13.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-2.1.13.dist-info/RECORD,,