openfund-maker 2.1.9__py3-none-any.whl → 2.1.10__py3-none-any.whl

maker/BestFVGStrategyMaker.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import traceback
+from typing import override
 import pandas as pd
 
 from maker.SMCStrategyMaker import SMCStrategyMaker
@@ -8,7 +9,7 @@ from maker.SMCStrategyMaker import SMCStrategyMaker
 class BestFVGStrategyMaker(SMCStrategyMaker):
     def __init__(self, config, platform_config, feishu_webhook=None,logger=None):
         super().__init__(config, platform_config, feishu_webhook, logger)
-        self.place_order_prices = {} # 记录每个symbol的挂单价格
+
         self.htf_last_CHoCH = {} #记录HTF的CHoCH struct
         
     def check_price_in_fvg(self, df, side, fvg):
@@ -37,6 +38,13 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             max_price = max(df['high'].iloc[fvg_index+2:])
             return fvg_bot <= max_price 
 
+    @override
+    def reset_all_cache(self, symbol):
+        """
+        重置所有缓存
+        """
+        super().reset_all_cache(symbol)
+        self.htf_last_CHoCH[symbol] = {}
     
     def process_pair(self,symbol,pair_config):
         self.logger.info("=" * 60)

maker/SMCStrategyMaker.py

@@ -516,6 +516,15 @@ class SMCStrategyMaker(ThreeLineStrategyMaker):
         ce = (pivot_high + pivot_low) / 2
         return float(self.round_price(symbol, ce))
  
+    def calculate_pe(self,symbol,pivot_high, pivot_low) -> float:
+        pe = (pivot_high + pivot_low) / 2
+        return float(self.round_price(symbol, pe))
+    
+    def reset_all_cache(self, symbol):
+        """_summary_
+            重置所有缓存数据
+        """
+        self.place_order_prices[symbol] = {}
     
     def process_pair(self,symbol,pair_config):
         self.logger.info("=" * 60)
@@ -531,7 +540,8 @@ class SMCStrategyMaker(ThreeLineStrategyMaker):
             if self.check_position(symbol=symbol) :
                 self.logger.info(f"{symbol} : 有持仓合约，不进行下单。")  
                 if symbol in self.place_order_prices:  
-                    self.place_order_prices[symbol] = {}
+                    self.reset_all_cache(symbol)
+                    
                 return           
            
             

{openfund_maker-2.1.9.dist-info → openfund_maker-2.1.10.dist-info}/METADATA

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

{openfund_maker-2.1.9.dist-info → openfund_maker-2.1.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
-maker/BestFVGStrategyMaker.py,sha256=IGCk6TUwaJMWOSjM4fJU5BQ7ckCfTZBOMoSlI9Cka8U,11391
+maker/BestFVGStrategyMaker.py,sha256=KnrqOaWEJSoba549CiOzSjoC6oQk42YVxa5e_pZJhSg,11532
 maker/MACDStrategyMaker.py,sha256=iS5HO04piKHFJxUI2e5QmicxzGeK-V1aphJSr2n_4Ac,12651
-maker/SMCStrategyMaker.py,sha256=gXhYs-QvKBZ-mdR4UN2EF7OwFGI5JyW2-0RJLXq7SSc,34695
+maker/SMCStrategyMaker.py,sha256=w1ARnwVAkbm1R5ZeI_XX3dMevz5-lQGvtWqoEFHNVRA,35026
 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.9.dist-info/METADATA,sha256=c1XSHMHdIfzcFnDqdI3yk6JvWnRXrNnvRUKHf-sEEu0,1953
-openfund_maker-2.1.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-2.1.9.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-2.1.9.dist-info/RECORD,,
+openfund_maker-2.1.10.dist-info/METADATA,sha256=OjXDHNmAz3AJNRy7tav1RuJhBicfPvbhmHCFJaWYX20,1954
+openfund_maker-2.1.10.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-2.1.10.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-2.1.10.dist-info/RECORD,,