openfund-taker 1.3.1__py3-none-any.whl → 1.3.4__py3-none-any.whl

{openfund_taker-1.3.1.dist-info → openfund_taker-1.3.4.dist-info}/METADATA

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

{openfund_taker-1.3.1.dist-info → openfund_taker-1.3.4.dist-info}/RECORD

@@ -1,6 +1,7 @@
 taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
-taker/ThreeLineTradingBot.py,sha256=oXIoQ8z9AzKzk0z13d0ufj2KGBOk5iHJTJNZQRDKA5U,20625
-taker/TrailingSLTaker.py,sha256=vYUrE-UO6s4xkDyToPoj_65-wsnuXnnCQT70X6Hmr30,42228
+taker/ThreeLineTradingTaker.py,sha256=ElD9pKDO4nxw5VKNRrvXqyiU0gkV_1Mg_zk-hftfaPs,20553
+taker/TrailingSLAndTPTaker.py,sha256=rx3tw9TwFCpqnz3e0WlTtFVcn8mBbPHtp62n3RF86Kg,1144
+taker/TrailingSLTaker.py,sha256=og_H02pTmUJISPAsHlLIBmNyTD3DLXuTnOTE-XnkkOY,42598
 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
@@ -8,8 +9,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=sNLe49TZZzE0FXmmGNzh8b3PyS5KnKS3SFcNKO8q8RU,2492
-openfund_taker-1.3.1.dist-info/METADATA,sha256=iUV2Dwu936Z5WXcVOmmgwBQo1GLOWnldfW7LXfthHuU,7527
-openfund_taker-1.3.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-1.3.1.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-1.3.1.dist-info/RECORD,,
+taker/main.py,sha256=QCEjINu3IgwWEGcuquHzeYjKJYAQrPe8ctQhMoIb9SA,2561
+openfund_taker-1.3.4.dist-info/METADATA,sha256=pumU5NKxk5BBlZrKwsY2OvWKi_gKSIZ_3yUHcneouz0,7527
+openfund_taker-1.3.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_taker-1.3.4.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
+openfund_taker-1.3.4.dist-info/RECORD,,

taker/{ThreeLineTradingBot.py → ThreeLineTradingTaker.py}

@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 import ccxt
-from ccxt.base.exchange import Exchange
-from ccxt.base.types import Order
 import time
 import logging
 import requests
 from logging.handlers import TimedRotatingFileHandler
 
 
-class ThreeLineTradingBot:
+class ThreeLineTradingTaker:
     def __init__(self, config, feishu_webhook=None, monitor_interval=60):
         self.stop_loss_pct = config["all_stop_loss_pct"]  # 全局止损百分比
         

taker/TrailingSLAndTPTaker.py

@@ -0,0 +1,22 @@
+
+from taker.TrailingSLTaker import TrailingSLTaker
+'''
+自动设置移动止损单
+'''
+class TrailingSLAndTPTaker(TrailingSLTaker):
+    def __init__(self,g_config, platform_config, feishu_webhook=None, monitor_interval=4,logger=None):
+        super().__init__(g_config, platform_config, feishu_webhook, monitor_interval,logger)
+        self.all_TP_LS_ratio = float(platform_config.get("all_TP_LS_ratio",1.5)) #The profit-loss ratio 盈亏比
+        self.all_take_profit_pct = self.stop_loss_pct *  self.all_TP_LS_ratio
+   
+    def set_stop_loss_take_profit(self, symbol, position, stop_loss_price=None, take_profit_price=None) -> bool:
+        is_successful = super().set_stop_loss_take_profit(symbol, position, stop_loss_price, take_profit_price)
+        # take_profile_pct = self.stop_loss_pct *  2
+        order_take_profit_price = take_profit_price
+        if take_profit_price is None:
+            order_take_profit_price = self.calculate_take_profile_price(symbol, position, self.all_take_profit_pct)
+            is_successful = self.set_take_profit(symbol, position, order_take_profit_price)
+    
+        
+        return is_successful
+

taker/TrailingSLTaker.py

@@ -13,8 +13,8 @@ class TrailingSLTaker:
         self.trading_pairs_config = g_config.get('tradingPairs', {})
         
         
-        self.stop_loss_pct = platform_config["all_stop_loss_pct"]  # 全局止损百分比
-        # 止盈比例
+        self.stop_loss_pct = float(platform_config.get("all_stop_loss_pct",2))  # 全局止损百分比
+        # 回撤比例
         self.low_trail_stop_loss_pct = platform_config["all_low_trail_stop_loss_pct"] # 第一档
         self.trail_stop_loss_pct = platform_config["all_trail_stop_loss_pct"]# 第二档
         self.higher_trail_stop_loss_pct = platform_config["all_higher_trail_stop_loss_pct"]# 第三档
@@ -52,6 +52,9 @@ class TrailingSLTaker:
         })
         self.logger = logger
         self.position_mode = self.get_position_mode()  # 获取持仓模式
+    
+    def get_pair_config(self,symbol):
+        return self.trading_pairs_config.get(symbol,{})
     # 获取市场信息
     def getMarket(self,symbol):
         self.exchange.load_markets()
@@ -467,7 +470,7 @@ class TrailingSLTaker:
         while retry_count < max_retries:
             try:
 
-                self.logger.debug(f"{symbol}: {orderSide} - TP at {take_profit_price} Starting....  ")
+                self.logger.debug(f"{symbol}: {orderSide} - TP at {adjusted_price} Starting....  ")
                 
                 self.exchange.create_order(
                     symbol=symbol,
@@ -479,7 +482,7 @@ class TrailingSLTaker:
                     params=tp_params
                 )
           
-                self.logger.info(f"{symbol}: TP at {take_profit_price} Done.")
+                self.logger.info(f"{symbol}: TP at {adjusted_price} Done.")
                 break
                 
                
@@ -550,7 +553,7 @@ class TrailingSLTaker:
         while retry_count < max_retries:
             try:
 
-                self.logger.debug(f"{symbol}: {orderSide} - Pre SL at {stop_loss_price} Starting....  ")
+                self.logger.debug(f"{symbol}: {orderSide} - Pre SL at {adjusted_price} Starting....  ")
                 
                 self.exchange.create_order(
                     symbol=symbol,
@@ -562,7 +565,7 @@ class TrailingSLTaker:
                     amount=amount,
                     params=sl_params
                 )
-                self.logger.info(f"{symbol}: SL at {stop_loss_price} Done.")
+                self.logger.info(f"{symbol}: SL at {adjusted_price} Done.")
                 break
                 
                
@@ -675,17 +678,15 @@ class TrailingSLTaker:
         # 计算止盈价格。
 
         if side == 'long':
-     
-            base_price = entry_price * (1-take_profile_pct)
-            take_profile_price = entry_price + base_price - offset * tick_size
+            take_profile_price = entry_price * (1+take_profile_pct/100) - offset * tick_size
 
 
         elif side == 'short':
         
-            base_price = entry_price * (1-take_profile_pct)
-            take_profile_price = entry_price - base_price + offset * tick_size
+            # base_price = entry_price * (1-take_profile_pct)
+            take_profile_price = entry_price * (1-take_profile_pct/100) + offset * tick_size
      
-        return take_profile_price
+        return float(self.round_price_to_tick(symbol,take_profile_price))
     
     # 计算回撤止盈价格
     def calculate_stop_loss_price(self, symbol, position, stop_loss_pct, offset=1) -> float:
@@ -711,7 +712,7 @@ class TrailingSLTaker:
             stop_loss_price = entry_price - base_price + offset * tick_size
             if latest_stop_loss_price :
                 stop_loss_price = min(stop_loss_price,latest_stop_loss_price)
-        return stop_loss_price
+        return float(self.round_price_to_tick(symbol,stop_loss_price))
     
     # 市价仓位平仓    
     def close_all_positions(self,symbol,position):
@@ -790,9 +791,9 @@ class TrailingSLTaker:
         self.check_reverse_position(symbol=symbol, position=position, pair_config=pair_config)
         
         # 检查止损是否触发止盈
-        if self.check_stop_loss_trigger(symbol, position):
-            self.close_all_positions(symbol=symbol, position=position)
-            return
+        # if self.check_stop_loss_trigger(symbol, position):
+        #     self.close_all_positions(symbol=symbol, position=position)
+        #     return
         
     
     def check_total_profit(self, symbol, position):
@@ -834,17 +835,17 @@ class TrailingSLTaker:
         
         '''
         # 各档止盈逻辑
-           
-        # 根据不同档位设置止损价格和通知
+        pair_config = self.get_pair_config(symbol)   
+        # 根据不同档位设置止损价格,没有单独为交易对设置，用全局参数代替
         tier_config = {
             "低档": {
-                "stop_loss_pct": float(self.low_trail_stop_loss_pct)
+                "stop_loss_pct": float(pair_config.get('low_trail_stop_loss_pct',self.low_trail_stop_loss_pct))
             },
             "中档": {
-                "stop_loss_pct": float(self.trail_stop_loss_pct)
+                "stop_loss_pct": float(pair_config.get('trail_stop_loss_pct',self.trail_stop_loss_pct))
             },
             "高档": {
-                "stop_loss_pct": float(self.higher_trail_stop_loss_pct)
+                "stop_loss_pct": float(pair_config.get('higher_trail_stop_loss_pct',self.higher_trail_stop_loss_pct))
             }
         }
 

taker/main.py

@@ -3,7 +3,8 @@ import yaml
 from logging.handlers import TimedRotatingFileHandler
 
 from taker.TrailingSLTaker import TrailingSLTaker
-from taker.ThreeLineTradingBot import ThreeLineTradingBot
+from taker.TrailingSLAndTPTaker import TrailingSLAndTPTaker
+from taker.ThreeLineTradingTaker import ThreeLineTradingTaker
 
 def build_logger(log_config) -> logging.Logger:
             # 配置日志
@@ -56,7 +57,7 @@ def main():
     package_name = __package__ or "taker"
     
     logger.info(f" ++ {package_name}:{version} is doing...")
-    bot = TrailingSLTaker(config_data, platform_config, feishu_webhook=feishu_webhook_url, monitor_interval=monitor_interval,logger=logger)
+    bot = TrailingSLAndTPTaker(config_data, platform_config, feishu_webhook=feishu_webhook_url, monitor_interval=monitor_interval,logger=logger)
     bot.monitor_total_profit()
     # bot = ThreeLineTradingBot(platform_config, feishu_webhook=feishu_webhook_url, monitor_interval=monitor_interval)
     # bot.monitor_klines()