openfund-maker 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

maker/ThreeLineOrderBot.py

@@ -307,8 +307,8 @@ class ThreeLineOrdergBot:
     def judge_k_line_direction(self,symbol, pair_config, ema) -> int:
         tick_size = float(self.exchange.market(symbol)['precision']['price'])
         
-        ema_range_period = int(pair_config.get('ema_range_period', 3))
-        ema_range_limit = int(pair_config.get('ema_range_limit', 2))
+        ema_range_period = float(pair_config.get('ema_range_period', 3))
+        ema_range_limit = float(pair_config.get('ema_range_limit', 1))
         # 20250210 判断EMA均线是否走平，用EMA周期内的极差计算，极差在阈值范围内为平
         ema_ranges = ema.rolling(window=ema_range_period).max() - ema.rolling(window=ema_range_period).min()
         ema_slope = ema.diff()
@@ -401,9 +401,12 @@ class ThreeLineOrdergBot:
         return float(self.round_price_to_tick(place_order_price,tick_size))
       
     def process_pair(self,symbol,pair_config):
+        # 检查是否有持仓，有持仓不进行下单
         if self.check_position(symbol=symbol) :
             self.logger.info(f"{symbol} 有持仓合约，不进行下单。")
             return 
+        # 取消之前的挂单
+        self.cancel_all_orders(symbol=symbol)  
            
         try:
             klines = self.get_historical_klines(symbol=symbol)
@@ -483,7 +486,7 @@ class ThreeLineOrdergBot:
             
             self.logger.debug(f"{symbol} 当前K线的前三根K线 最高价: {max_high}, 最低价: {min_low}")
   
-            self.cancel_all_orders(symbol=symbol)  
+     
             
             long_amount_usdt = pair_config.get('long_amount_usdt', 5)
             short_amount_usdt = pair_config.get('short_amount_usdt', 5)     
@@ -529,11 +532,6 @@ class ThreeLineOrdergBot:
 
             
     def monitor_klines(self):
-        # self.fetch_and_store_all_instruments()
-        import importlib.metadata
-
-        version = importlib.metadata.version("openfund-wick-reversal")
-        self.logger.info(f" ++ openfund-wick-reversal:{version} is doing...")
         symbols = list(self.trading_pairs_config.keys())  # 获取所有币对的ID
         batch_size = 5  # 每批处理的数量
         while True:

{openfund_maker-1.0.3.dist-info → openfund_maker-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openfund-maker
-Version: 1.0.3
+Version: 1.0.5
 Summary: Openfund-maker.
 Requires-Python: >=3.9,<4.0
 Classifier: Programming Language :: Python :: 3

{openfund_maker-1.0.3.dist-info → openfund_maker-1.0.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maker/ThreeLineOrderBot.py,sha256=9JWfSxI4ad9uedXMq2pKxDfSY3A_nKdLpFWAMRWbq5s,23414
+maker/ThreeLineOrderBot.py,sha256=t4AFalkMoO-UBE-0go5kU7u5ge5ZJ6Lk3D-yKOdOvUM,23278
 maker/WickReversalOrderBot.py,sha256=Oc6wChdWu39lfWh3NRHM8BqvaRIYDNZiDR6PDnE9XUM,17374
 maker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maker/config.py,sha256=YPxghO5i0vgRg9Cja8kGj9O7pgSbbtzOgf3RexqXXwY,1188
@@ -7,7 +7,7 @@ maker/main_m.py,sha256=0PzDTnuBrxfpy5WDfsIHKAzZ_7pkuvuqqeWik0vpWio,15522
 maker/okxapi.py,sha256=_9G0U_o0ZC8NxaT6PqpiLgxBm9gPobC9PsFHZE1c5w0,553
 maker/zhen.py.bak,sha256=HNkrQbJts8G9umE9chEFsc0cLQApcM9KOVNMYPpkBXM,10918
 maker/zhen_2.py,sha256=4IaHVtTCMSlrLGSTZrWpW2q-f7HZsUNRkW_-5QgWv24,10509
-openfund_maker-1.0.3.dist-info/METADATA,sha256=goG2Pv4hLuF7DLikthsfP5DwFZsK6k4p2rxHdoG60gs,1965
-openfund_maker-1.0.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-1.0.3.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-1.0.3.dist-info/RECORD,,
+openfund_maker-1.0.5.dist-info/METADATA,sha256=SbFTNFcQFCMR3Knw2ExvO3Z_Xr9M3NZrGmHFQr2Cdn0,1965
+openfund_maker-1.0.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-1.0.5.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-1.0.5.dist-info/RECORD,,