openfund-taker 2.2.1__py3-none-any.whl → 2.2.3__py3-none-any.whl

{openfund_taker-2.2.1.dist-info → openfund_taker-2.2.3.dist-info}/METADATA

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

{openfund_taker-2.2.1.dist-info → openfund_taker-2.2.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOM
 taker/SMCSLAndTPTaker.py,sha256=rKt_TDT8kKiyYjfz0rC77MDygvuvjsmAO_hXoLDd8dU,28432
 taker/ThreeLineTradingTaker.py,sha256=ElD9pKDO4nxw5VKNRrvXqyiU0gkV_1Mg_zk-hftfaPs,20553
 taker/TrailingSLAndTPTaker.py,sha256=OPD1ZNqyM8jZ7Im-bWm_6Cu4_qfwKmNZ30XpbP6-l00,2746
-taker/TrailingSLTaker.py,sha256=i9t2AwkF4kMweP4BUW-ZfDmOacb0aJO_NLq8hE6SBQg,48489
+taker/TrailingSLTaker.py,sha256=WmgWfQim1cu5l2NQT4dfmSYaerhjYUUMKVKTF54W_y4,48884
 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
@@ -11,7 +11,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=3M1y_1sRIfkYNGWP0Wb3DfZFgHb0y4Cd45ERPnc1J9w,2927
-openfund_taker-2.2.1.dist-info/METADATA,sha256=NP4IEU9ZAnL890nT9m2RpkCZJa4Mt2_EWNb8A2zGU9w,7529
-openfund_taker-2.2.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-2.2.1.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-2.2.1.dist-info/RECORD,,
+openfund_taker-2.2.3.dist-info/METADATA,sha256=NqNvnMYs_QdI-j5pNQC1dgzn8VA4KxOttaxsqpFQWAY,7529
+openfund_taker-2.2.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_taker-2.2.3.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
+openfund_taker-2.2.3.dist-info/RECORD,,

taker/TrailingSLTaker.py

@@ -4,7 +4,7 @@ import time
 import requests
 import traceback
 import pandas as pd
-import talib as ta
+# import talib as ta
 from decimal import Decimal
 '''
 自动设置移动止损单
@@ -240,7 +240,16 @@ class TrailingSLTaker:
         macd['timestamp'] = pd.to_datetime(macd['timestamp'], unit='ms').dt.strftime('%m-%d %H:%M')
             
         # 使用 TA-Lib 计算 MACD
-        macd[['macd', 'signal', 'hist']] = pd.DataFrame(ta.MACD(macd['close'], fastperiod=12, slowperiod=26, signalperiod=9)).T
+        # macd[['macd', 'signal', 'hist']] = pd.DataFrame(ta.MACD(macd['close'], fastperiod=12, slowperiod=26, signalperiod=9)).T
+        # 计算EMA12和EMA26
+        exp1 = macd['close'].ewm(span=12, adjust=False).mean()
+        exp2 = macd['close'].ewm(span=26, adjust=False).mean()
+        # 计算MACD线
+        macd['macd'] = exp1 - exp2
+        # 计算信号线
+        macd['signal'] = macd['macd'].ewm(span=9, adjust=False).mean()
+        # 计算柱状图
+        macd['hist'] = macd['macd'] - macd['signal']
         # self.logger.debug(f"{symbol} : MACD Values = \n {macd.tail(5)}")