openfund-taker 2.1.13__py3-none-any.whl → 2.1.14__py3-none-any.whl

{openfund_taker-2.1.13.dist-info → openfund_taker-2.1.14.dist-info}/METADATA

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

{openfund_taker-2.1.13.dist-info → openfund_taker-2.1.14.dist-info}/RECORD

@@ -1,8 +1,8 @@
 taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
-taker/SMCSLAndTPTaker.py,sha256=MILrlvaQUje9Xnczi2rXszhk2XFUzeowJ_YBP4S9gNA,21241
+taker/SMCSLAndTPTaker.py,sha256=7Gfq4v6nnK-zVdXKe1-lhLlzfTg8BOEmhlRJ81vjDLA,20743
 taker/ThreeLineTradingTaker.py,sha256=ElD9pKDO4nxw5VKNRrvXqyiU0gkV_1Mg_zk-hftfaPs,20553
 taker/TrailingSLAndTPTaker.py,sha256=OPD1ZNqyM8jZ7Im-bWm_6Cu4_qfwKmNZ30XpbP6-l00,2746
-taker/TrailingSLTaker.py,sha256=xCRXuNuI0cdwHv1S3v44lw8wcrGYoa4cOTktjVAG0hw,47477
+taker/TrailingSLTaker.py,sha256=CIjlYqIM_1h4GTMGnCV67SQnk0QryPDL3u_kXJ3qioc,47853
 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=-EdrzLG6xK0nauItj3eRC8_xva2PnS9CQdzeFJI-6Wc,2769
-openfund_taker-2.1.13.dist-info/METADATA,sha256=CeMz6sD-9toZEEc9qo_hdmuCTmJgVjYPd9mK9-TRgyg,7528
-openfund_taker-2.1.13.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_taker-2.1.13.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
-openfund_taker-2.1.13.dist-info/RECORD,,
+openfund_taker-2.1.14.dist-info/METADATA,sha256=gDxo5iUe4Pl5pNdTwkzpL6iBbq6bxdADoQ2bCbIQDiI,7528
+openfund_taker-2.1.14.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_taker-2.1.14.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
+openfund_taker-2.1.14.dist-info/RECORD,,

taker/SMCSLAndTPTaker.py

@@ -20,18 +20,7 @@ class SMCSLAndTPTaker(TrailingSLTaker):
         self.logger.debug(f"{symbol}: 检查LTF-Struceture是否市价清仓。")
         # 根据LTF的Struceture识别
         
-    def format_klines(self,klines) -> pd.DataFrame:
-       
-        """_summary_
-            格式化K线数据
-        Args:
-            klines (_type_): _description_
-        """
-        klines_df = pd.DataFrame(klines, columns=['timestamp', 'open', 'high', 'low', 'close', 'volume']) 
-        # 转换时间戳为日期时间
-        klines_df['timestamp'] = pd.to_datetime(klines_df['timestamp'], unit='ms').dt.tz_localize('UTC').dt.tz_convert('Asia/Shanghai')
-        
-        return klines_df
+ 
      
     def build_struct(self, df, prd=20, check_bounds=True, global_extremum=False) :
         

taker/TrailingSLTaker.py

@@ -141,6 +141,18 @@ class TrailingSLTaker:
         else:
             raise ValueError("Unexpected response structure or missing candlestick data")
 
+    def format_klines(self,klines) -> pd.DataFrame:
+       
+        """_summary_
+            格式化K线数据
+        Args:
+            klines (_type_): _description_
+        """
+        klines_df = pd.DataFrame(klines, columns=['timestamp', 'open', 'high', 'low', 'close', 'volume']) 
+        # 转换时间戳为日期时间
+        klines_df['timestamp'] = pd.to_datetime(klines_df['timestamp'], unit='ms').dt.tz_localize('UTC').dt.tz_convert('Asia/Shanghai')
+        
+        return klines_df
 
     def is_pivot_high(self, data, index, period, check_bounds=False):
         """
@@ -177,9 +189,8 @@ class TrailingSLTaker:
 
 
     def get_last_solated_point(self,symbol,position,kLines ,prd=20):
-        # 将K线数据转换为DataFrame格式
-        df = pd.DataFrame(kLines, columns=['timestamp', 'open', 'high', 'low', 'close', 'volume'])
-        df['timestamp'] = pd.to_datetime(df['timestamp'], unit='ms')
+        # 将K线数据转换为DataFrame格式    
+        df = self.format_klines(kLines)
     
         # 根据position方向寻找孤立点
         side = position['side']