openfund-maker 2.0.7__tar.gz → 2.1.1__tar.gz

{openfund_maker-2.0.7 → openfund_maker-2.1.1}/PKG-INFO

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

{openfund_maker-2.0.7 → openfund_maker-2.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openfund-maker"
-version = "2.0.7"
+version = "2.1.1"
 description = "Openfund-maker."
 authors = []
 readme = "README.md"

{openfund_maker-2.0.7 → openfund_maker-2.1.1}/src/maker/BestFVGStrategyMaker.py

@@ -68,6 +68,8 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             ltf = str(smc_strategy.get('LTF', '1m'))           
             htf_prd = int(smc_strategy.get('HTF_swing_points_length',15))
             ltf_prd = int(smc_strategy.get('LTF_swing_points_length',3))
+            htf_entry_struct = str(smc_strategy.get('HTF_entry_struct','CHoCH'))
+            ltf_entry_struct = str(smc_strategy.get('LTF_entry_struct','CHoCH'))
             enable_FVG = bool(smc_strategy.get('enable_FVG',True)) # 是否启用FVG
             enable_OB = bool(smc_strategy.get('enable_OB',True))# 是否启用OB
             self.logger.info(f"{symbol} : BestFVGSMC策略 {ltf}|{htf} \nenable_FVG={enable_FVG} enable_OB={enable_OB} \nHTF_swing_points_length={htf_prd} LTF_swing_points_length={ltf_prd}")
@@ -81,7 +83,7 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             htf_struct = {"struct": "None"}
             # 检查是否有上一个CHoCH结构
             htf_last_CHoCH = self.htf_last_CHoCH.get(symbol,None)
-            htf_struct = self.detect_struct(htf_df, prd=htf_prd, struct_key="CHoCH") # HTF结构要严谨，prd周期要长一些
+            htf_struct = self.detect_struct(htf_df, prd=htf_prd, struct_key=htf_entry_struct) # HTF结构要严谨，prd周期要长一些
         
             # 如果存在上一个CHoCH结构，更新趋势标签和方向
             if htf_last_CHoCH:
@@ -91,19 +93,19 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
                 # 优化: 只在没有新CHoCH结构时使用上一个结构
                 if htf_struct["struct"] == "None":
                     htf_struct = htf_last_CHoCH
-                    self.logger.debug(f"{symbol} : {htf} 使用之前 CHoCH struct。{htf_struct['struct']} prd={htf_prd}。")
+                    self.logger.debug(f"{symbol} : {htf} 使用之前 {htf_entry_struct} struct。{htf_struct['struct']} prd={htf_prd}。")
                 else:
-                    self.logger.debug(f"{symbol} : {htf} 形成新的 CHoCH struct。{htf_struct['struct']} prd={htf_prd}。")
+                    self.logger.debug(f"{symbol} : {htf} 形成新的 {htf_entry_struct} struct。{htf_struct['struct']} prd={htf_prd}。")
             
             # 检查是否已形成有效的CHoCH结构
             htf_struct_label = htf_struct["struct"]
             htf_side = htf_struct["side"] 
             if htf_struct_label == "None" and not htf_last_CHoCH:
-                self.logger.debug(f"{symbol} : {htf} 未形成有效的 CHoCH struct,不下单。{htf_struct}。")
+                self.logger.debug(f"{symbol} : {htf} is {htf_struct}, 未形成有效的 {htf_entry_struct} struct,不下单。")
                 return
            
-            # 更新最新的CHoCH结构信息                  
-            if 'CHoCH' in htf_struct_label and htf_struct_label != htf_last_CHoCH_label:
+            # 更新最新的结构信息                  
+            if ltf_entry_struct in htf_struct_label and htf_struct_label != htf_last_CHoCH_label:
                 self.htf_last_CHoCH[symbol] = htf_struct
                 htf_last_CHoCH = htf_struct
                 htf_last_CHoCH_label = htf_struct_label
@@ -128,7 +130,7 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             }
             
             self.logger.info(f"{symbol} : {htf} 趋势={htf_last_CHoCH_label}")
-            self.logger.debug(f"{symbol} : \npivot_high={htf_pivot_high} pivot_low={htf_pivot_low} mid_line={htf_mid_line}\n溢价区={premium_box}\n折价区={discount_box}")
+            self.logger.debug(f"{symbol} : {htf}\npivot_high={htf_pivot_high} pivot_low={htf_pivot_low} mid_line={htf_mid_line}\n溢价区={premium_box}\n折价区={discount_box}")
 
             # 3. find HTF FVG
             pivot_index = htf_struct["pivot_low_index"] if htf_side == "buy" else htf_struct["pivot_high_index"]       
@@ -173,7 +175,7 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             }
             
             self.logger.info(f"{symbol} : {ltf} 趋势={ltf_struct_label} struct={ltf_struct}")
-            self.logger.debug(f"{symbol} : \npivot_high={ltf_last_pivot_high} pivot_low={ltf_last_pivot_low} mid_line={ltf_last_mid_line}\n溢价区={ltf_premium_box}\n折价区={ltf_discount_box}")
+            self.logger.debug(f"{symbol} : {ltf} \npivot_high={ltf_last_pivot_high} pivot_low={ltf_last_pivot_low} mid_line={ltf_last_mid_line}\n溢价区={ltf_premium_box}\n折价区={ltf_discount_box}")
 
 
             # 5. LTF 寻找FVG，下单