openfund-taker 2.1.10__py3-none-any.whl → 2.1.12__py3-none-any.whl

{openfund_taker-2.1.10.dist-info → openfund_taker-2.1.12.dist-info}/METADATA

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

{openfund_taker-2.1.10.dist-info → openfund_taker-2.1.12.dist-info}/RECORD

@@ -2,7 +2,7 @@ taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOM
 taker/SMCSLAndTPTaker.py,sha256=MILrlvaQUje9Xnczi2rXszhk2XFUzeowJ_YBP4S9gNA,21241
 taker/ThreeLineTradingTaker.py,sha256=ElD9pKDO4nxw5VKNRrvXqyiU0gkV_1Mg_zk-hftfaPs,20553
 taker/TrailingSLAndTPTaker.py,sha256=OPD1ZNqyM8jZ7Im-bWm_6Cu4_qfwKmNZ30XpbP6-l00,2746
-taker/TrailingSLTaker.py,sha256=dvKZ9x-uIq3hWuV_K_gpeDhdtoA99gk15X6z2xaPmbQ,47386
+taker/TrailingSLTaker.py,sha256=xCRXuNuI0cdwHv1S3v44lw8wcrGYoa4cOTktjVAG0hw,47477
 taker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taker/chua_bitget.py,sha256=YY6XK5Bd-wlArsN5BnAfiqE0h1DPkti6i4TEB4F5zDA,12918
 taker/chua_bn.py,sha256=GnTePWlgDwdHgroBbEp1Ajcsf5_m_Vn_RV63SYzu2jI,10668
@@ -10,8 +10,8 @@ taker/chua_ok.py,sha256=5pPAoEYbFuKxfZwqNvOO890s-2cy6n69QiI0ZA0GTCQ,12474
 taker/chua_ok_all.py,sha256=2XnZM6QdB3juSE1pqQIJyh2x1XuhlTlnBKNA3owlJ9E,15267
 taker/chua_ok_bot.py,sha256=9SW0ujhi6PfN4yR1JZ9NaA37HtnXJ2QAWUfW52NG68w,13109
 taker/config.py,sha256=YPxghO5i0vgRg9Cja8kGj9O7pgSbbtzOgf3RexqXXwY,1188
-taker/main.py,sha256=Ulz22BV34Mp8ugh-Dior1mIS8n8si8bMi5RCBit2G4U,2774
-openfund_taker-2.1.10.dist-info/METADATA,sha256=WvZ6UByU-e9v82fpFUWKFWxr4XZE8LsRf0T44i306ik,7528
-openfund_taker-2.1.10.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-2.1.10.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-2.1.10.dist-info/RECORD,,
+taker/main.py,sha256=-EdrzLG6xK0nauItj3eRC8_xva2PnS9CQdzeFJI-6Wc,2769
+openfund_taker-2.1.12.dist-info/METADATA,sha256=Ej040ZkKanG8zS4thk-HE1k6RbRCE0Vl20BwuIs7YzM,7528
+openfund_taker-2.1.12.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_taker-2.1.12.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
+openfund_taker-2.1.12.dist-info/RECORD,,

taker/TrailingSLTaker.py

@@ -1041,13 +1041,14 @@ class TrailingSLTaker:
                 for position in positions:
                     symbol = position['symbol']
                     cur_entry_price = position['entryPrice']
-                    # 检查仓位是否有变化
+                    # 检查仓位是否有变化 TODO 永远不会执行。
                     if symbol in self.positions_entry_price and cur_entry_price != self.positions_entry_price[symbol]:
                         # 新开仓
                         self.reset_all_cache(symbol)
+                    
+                    if symbol not in self.positions_entry_price:
                         self.positions_entry_price[symbol] = cur_entry_price
-                        
-                        msg = f"{symbol} : ## 新开仓。 入场方向={position['side']} 入场价格={cur_entry_price} ##"
+                        msg = f"{symbol} : ## 重新开仓。 入场方向={position['side']} 入场价格={cur_entry_price} ##"
                         self.logger.info(msg)
                         self.send_feishu_notification(msg)
                         

taker/main.py

@@ -57,7 +57,7 @@ def main():
     logger = build_logger(config_data["Logger"])
     package_name = __package__ or "taker" 
     
-    taker = config_data.get('actived_taker', 'TrailingSLAndTPTaker')
+    taker = config_data.get('actived_taker', 'SMCSLAndTPTaker')
         
     # 根据配置动态创建策略实例
     strategy_class = globals()[taker]