openfund-taker 1.3.5__py3-none-any.whl → 1.3.7__py3-none-any.whl

{openfund_taker-1.3.5.dist-info → openfund_taker-1.3.7.dist-info}/METADATA

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

{openfund_taker-1.3.5.dist-info → openfund_taker-1.3.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
 taker/ThreeLineTradingTaker.py,sha256=ElD9pKDO4nxw5VKNRrvXqyiU0gkV_1Mg_zk-hftfaPs,20553
 taker/TrailingSLAndTPTaker.py,sha256=rx3tw9TwFCpqnz3e0WlTtFVcn8mBbPHtp62n3RF86Kg,1144
-taker/TrailingSLTaker.py,sha256=og_H02pTmUJISPAsHlLIBmNyTD3DLXuTnOTE-XnkkOY,42598
+taker/TrailingSLTaker.py,sha256=u7W66JOittHC1dKfczNvgX11XPZccu-v-DU1ejalxg4,42791
 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,7 +10,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=QCEjINu3IgwWEGcuquHzeYjKJYAQrPe8ctQhMoIb9SA,2561
-openfund_taker-1.3.5.dist-info/METADATA,sha256=WsnDnxpdurdjtMJFuI8Z4MmWYWIHFeAamn91nWyhcnI,7527
-openfund_taker-1.3.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-1.3.5.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-1.3.5.dist-info/RECORD,,
+openfund_taker-1.3.7.dist-info/METADATA,sha256=0qK0S7CqunZcgqeykp0gI8sHkz4CCViOiO7z-3t0-zI,7527
+openfund_taker-1.3.7.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_taker-1.3.7.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
+openfund_taker-1.3.7.dist-info/RECORD,,

taker/TrailingSLTaker.py

@@ -418,15 +418,15 @@ class TrailingSLTaker:
             self.logger.warning(f"{symbol}: No position found for {symbol}")
             return False
         
-        if_stop_loss_success = False
-        if_take_profit_success = False
+        if_stop_loss_success = True
+        if_take_profit_success = True
         
         if stop_loss_price :
             if_stop_loss_success = self.set_stop_loss(symbol=symbol, position=position, stop_loss_price=stop_loss_price)
         if take_profit_price :
             if_take_profit_success = self.set_take_profit(symbol=symbol, position=position, take_profit_price=take_profit_price)
             
-        return if_stop_loss_success or if_take_profit_success
+        return if_stop_loss_success and if_take_profit_success
           
     def set_take_profit(self, symbol, position, take_profit_price=None) -> bool:
 
@@ -513,7 +513,7 @@ class TrailingSLTaker:
         
 
             
-    def set_stop_loss(self, symbol, position, stop_loss_price=None) -> bool:
+    def set_stop_loss(self, symbol, position, stop_loss_price=None , ord_type='market') -> bool:
   
         # 计算下单数量
         amount = abs(float(position['contracts']))
@@ -528,11 +528,12 @@ class TrailingSLTaker:
 
         # 止损单逻辑 
         adjusted_price = self.round_price_to_tick(symbol, stop_loss_price)
-         
+        
+        # 默认市价止损，委托价格为-1时，执行市价止损。
         sl_params = {
             'slTriggerPx':adjusted_price , 
-            # 'slOrdPx':'-1', # 委托价格为-1时，执行市价止损
-            'slOrdPx' : adjusted_price,
+            'slOrdPx':'-1', # 委托价格为-1时，执行市价止损
+            # 'slOrdPx' : adjusted_price,
             'slTriggerPxType':'last',
             'tdMode':position['marginMode'],
             'sz': str(amount),
@@ -540,6 +541,8 @@ class TrailingSLTaker:
             'cxlOnClosePos': True,
             'reduceOnly':True
         }
+        if ord_type == 'limit':
+            sl_params['slOrdPx'] = adjusted_price
         
         side = 'short' 
         if position['side'] == side: # 和持仓反向相反下单
@@ -557,8 +560,8 @@ class TrailingSLTaker:
                 
                 self.exchange.create_order(
                     symbol=symbol,
-                    type='optimal_limit_ioc',
-                    # type='conditional',
+                    # type='optimal_limit_ioc',
+                    type='conditional',
                     # type='limit',
                     price=adjusted_price,
                     side=orderSide,
@@ -566,6 +569,7 @@ class TrailingSLTaker:
                     params=sl_params
                 )
                 self.logger.info(f"{symbol}: SL at {adjusted_price} Done.")
+                
                 break