openfund-taker 1.1.5__py3-none-any.whl → 1.2.2__py3-none-any.whl

{openfund_taker-1.1.5.dist-info → openfund_taker-1.2.2.dist-info}/METADATA

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

{openfund_taker-1.1.5.dist-info → openfund_taker-1.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-taker/MultiAssetNewTradingBot.py,sha256=O9yhgiZIggSggdtbKsQsmd4sq3tMEarXDZzds0F-tzg,37100
+taker/MultiAssetNewTradingBot.py,sha256=TJGkAvuEgQv8AnaC3wmhAE9G9R6gJgXc1o4vtLplusQ,37564
 taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
 taker/ThreeLineTradingBot.py,sha256=oXIoQ8z9AzKzk0z13d0ufj2KGBOk5iHJTJNZQRDKA5U,20625
 taker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,7 +9,7 @@ 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=8cLWzEvQDeELbY5Av7JqkEyYbaNqSbAbVl1tQHXzU8s,1954
-openfund_taker-1.1.5.dist-info/METADATA,sha256=rTaexKjlzulJ-bihxUhNKEWJ48wfVxHTY7ZoIestcs4,7502
-openfund_taker-1.1.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-1.1.5.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-1.1.5.dist-info/RECORD,,
+openfund_taker-1.2.2.dist-info/METADATA,sha256=5L9h4JzuVYsPGByxHS0Cufwgn6tikgrBDKO28egKMW8,7502
+openfund_taker-1.2.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_taker-1.2.2.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
+openfund_taker-1.2.2.dist-info/RECORD,,

taker/MultiAssetNewTradingBot.py

@@ -231,7 +231,8 @@ class MultiAssetNewTradingBot:
     def check_reverse_position(self,symbol,position,pair_config):
         side = position['side']
         try:
-            klines = self.get_historical_klines(symbol=symbol)
+            klines_period = str(pair_config.get('klines_period', '1m'))
+            klines = self.get_historical_klines(symbol=symbol,bar=klines_period)
 
             # 计算 快线EMA & 慢线SMA
             ema_length = pair_config.get('ema', 15)
@@ -417,7 +418,7 @@ class MultiAssetNewTradingBot:
             'slTriggerPx':adjusted_price , 
             # 'slOrdPx':'-1', # 委托价格为-1时，执行市价止损
             'slOrdPx' : adjusted_price,
-            'slTriggerPxType':'mark',
+            'slTriggerPxType':'last',
             'tdMode':position['marginMode'],
             'sz': str(amount),
             # 'closeFraction': '1',
@@ -482,7 +483,7 @@ class MultiAssetNewTradingBot:
         """
         # 如果已经触发过全局止损并且有止损单，则跳过
         if self.global_symbol_stop_loss_flag.get(symbol, False):
-            
+
             return
         else :
             self.logger.debug(f"{symbol} - 是否设置过全局止损 {self.global_symbol_stop_loss_flag.get(symbol, False)} ")   
@@ -497,6 +498,12 @@ class MultiAssetNewTradingBot:
             stop_loss_price = position['entryPrice'] * (1 + stop_loss_pct/100)
             
         order_price = float(self.round_price_to_tick(symbol, stop_loss_price))
+        
+        last_take_profit_price= self.global_symbol_take_profit_price.get(symbol,None)  
+        if last_take_profit_price is not None and last_take_profit_price == order_price:
+            self.global_symbol_stop_loss_flag[symbol] = True
+            self.logger.debug(f"{symbol} - {side} 全局止损价没变化: {last_take_profit_price} = {order_price}")
+            return 
             
         try:
             # 设置止损单