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

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

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

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

@@ -1,7 +1,7 @@
 taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
-taker/ThreeLineTradingBot.py,sha256=oXIoQ8z9AzKzk0z13d0ufj2KGBOk5iHJTJNZQRDKA5U,20625
-taker/TrailingSLAndTPTaker.py,sha256=gikp-Yahn4nWYk6PmUB02t8Sun--Fo4I7vDEU4U2uso,1263
-taker/TrailingSLTaker.py,sha256=LL6BxJQo6yhkruXRDA0jQMt9K-GxhMZiTmKrWwIuZzo,42277
+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
@@ -9,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=CYibDo9PEOWbhpSXZ5JTmE-NGJXqDdgvhpadXJNRX60,2557
-openfund_taker-1.3.2.dist-info/METADATA,sha256=JG97fvJiR96kRpwabOg1MlIRSTNGoBOX9A2bsymTm94,7527
-openfund_taker-1.3.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-1.3.2.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-1.3.2.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

@@ -1,10 +1,4 @@
-# -*- coding: utf-8 -*-
-import ccxt
-import time
-import requests
-import traceback
-import pandas as pd
-import talib as ta
+
 from taker.TrailingSLTaker import TrailingSLTaker
 '''
 自动设置移动止损单

taker/TrailingSLTaker.py

@@ -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()
@@ -788,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):
@@ -832,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

@@ -4,7 +4,7 @@ from logging.handlers import TimedRotatingFileHandler
 
 from taker.TrailingSLTaker import TrailingSLTaker
 from taker.TrailingSLAndTPTaker import TrailingSLAndTPTaker
-from taker.ThreeLineTradingBot import ThreeLineTradingBot
+from taker.ThreeLineTradingTaker import ThreeLineTradingTaker
 
 def build_logger(log_config) -> logging.Logger:
             # 配置日志