openfund-maker 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

maker/ThreeLineOrderBot.py

@@ -236,9 +236,7 @@ class ThreeLineOrdergBot:
 
 
     def place_order(self,symbol, price, amount_usdt, side):
-        if self.check_position(symbol=symbol) :
-            self.logger.info(f"{symbol} 有持仓合约，不进行下单。")
-            return 
+
         
         markets = self.exchange.load_markets()
         if symbol not in markets:
@@ -327,7 +325,7 @@ class ThreeLineOrdergBot:
             direction = 0
 
         
-        self.logger.debug(f"{symbol}: 极差={latest_ema_range} 斜率={latest_ema_slope}, K线方向 {direction}")
+        self.logger.debug(f"{symbol}: 极差={latest_ema_range:.9f} 斜率={latest_ema_slope:.9f}, K线方向 {direction}")
 
         return direction
   
@@ -403,6 +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)
@@ -482,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)     

{openfund_maker-1.0.2.dist-info → openfund_maker-1.0.4.dist-info}/METADATA

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

{openfund_maker-1.0.2.dist-info → openfund_maker-1.0.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maker/ThreeLineOrderBot.py,sha256=Adk7MsJNakmf3ekE8esGSyE1VV3sBFG3rKZ8g90AIK0,23405
+maker/ThreeLineOrderBot.py,sha256=AGPTm3hRho537aKKXhwIHbr4hVRlTVEh_axul0enMXg,23507
 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.2.dist-info/METADATA,sha256=yNEOQah1lPBe5pysgsHfRFslnUMyuRqkgYHgqMSM6rw,1965
-openfund_maker-1.0.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-1.0.2.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-1.0.2.dist-info/RECORD,,
+openfund_maker-1.0.4.dist-info/METADATA,sha256=cDXItR0Mz41fZ_xoiMVIIMBNv7CXMC480IrujQ_kvBQ,1965
+openfund_maker-1.0.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-1.0.4.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-1.0.4.dist-info/RECORD,,