bitunix-automated-crypto-trading 3.2.2__py3-none-any.whl → 3.2.5__py3-none-any.whl

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -75,7 +75,7 @@ class BitunixSignal:
         self.signaldf_filtered = pd.DataFrame()
 
         #websockets
-        self.bitunixPrivateWebSocketClient = BitunixPrivateWebSocketClient(self.api_key, self.secret_key)
+        self.bitunixPrivateWebSocketClient = BitunixPrivateWebSocketClient(self.api_key, self.secret_key, logger)
         
         if self.settings.USE_PUBLIC_WEBSOCKET:
             self.bitunixPublicDepthWebSocketClient = BitunixPublicWebSocketClient(self.api_key, self.secret_key, "depth", logger)
@@ -462,7 +462,7 @@ class BitunixSignal:
                 self.positiondf['ask'] = self.positiondf['ask'].astype('float64')
             else:
                 self.positiondf = pd.DataFrame()
-            #self.positiondfStyle= self.positiondfrenderer.render_html(self.positiondf)    
+                self.positiondfStyle= self.positiondfrenderer.render_html(self.positiondf)    
 
             #if not self.settings.USE_PUBLIC_WEBSOCKET:                    
             #get bid las ask using api for the symbols in pending psotion
@@ -1041,7 +1041,7 @@ class BitunixSignal:
 
                             # candle reversed
                             if self.settings.CANDLE_TREND_STUDY and self.settings.CANDLE_TREND_REVERSAL_CHECK_ON_CLOSE:
-                                if row.side == 'BUY' and self.signaldf_full.at[row.symbol, f'{period}_barcolor'] == self.red and self.signaldf_full.at[row.symbol, f'{period}_cb'] > 1 and self.signaldf_full.at[row.symbol, f'{period}_candle_trend'] == "BULLISH" and total_pnl < 0:
+                                if row.side == 'BUY' and self.signaldf_full.at[row.symbol, f'{period}_barcolor'] == self.red and self.signaldf_full.at[row.symbol, f'{period}_cb'] > 1 and self.signaldf_full.at[row.symbol, f'{period}_candle_trend'] == "BEARISH" and total_pnl < 0:
                                     last, bid, ask, mtv = await self.GetTickerBidLastAsk(row.symbol)
                                     price = (ask if row['side'] == "BUY" else bid if row['side'] == "SELL" else last) if bid<=last<=ask else last
 

bitunix_automated_crypto_trading/BitunixWebSocket.py

@@ -56,10 +56,10 @@ class BitunixPublicWebSocketClient:
                     self.recv_task = asyncio.create_task(self.receive_messages(process_func))
                     await self.recv_task                    
             except websockets.exceptions.ConnectionClosedError as e:
-                logger.warning(f"{self.url} {self.type}  WebSocket connection closed. Retrying in 5 seconds: {e}")
+                self.logger.warning(f"{self.url} {self.type}  WebSocket connection closed. Retrying in 5 seconds: {e}")
                 await asyncio.sleep(5)  # Delay before retrying
             except Exception as e:
-                logger.error(f"{self.url} {self.type} Unexpected error during WebSocket operation: {e}")
+                self.logger.error(f"{self.url} {self.type} Unexpected error during WebSocket operation: {e}")
                 await asyncio.sleep(5)  # Delay before retrying
     
     def create_subscription_message(self, ticker):
@@ -79,7 +79,7 @@ class BitunixPublicWebSocketClient:
             while self.running:
                 message = await self.websocket.recv()
                 await process_func(message)
-            logger.warning(f"{self.url} {self.type}  WebSocket connection closed")
+            self.logger.warning(f"{self.url} {self.type}  WebSocket connection closed")
         except asyncio.CancelledError:
             self.logger.info(f"{self.url} {self.type}  WebSocket receive task cancelled")
             self.running = False                        
@@ -120,14 +120,14 @@ class BitunixPublicWebSocketClient:
                self.loop.call_soon_threadsafe(self.websocket.close)  # 
  
         except Exception as e:
-            logger.error(f"{self.url} {self.type} Unexpected error during WebSocket shutdown: {e}")
+            self.logger.error(f"{self.url} {self.type} Unexpected error during WebSocket shutdown: {e}")
         finally:
             # Stop the event loop
             self.loop.call_soon_threadsafe(self.loop.stop)
             self.logger.info(f"{self.url} {self.type} WebSocket thread stopped and resources cleaned up.")
 
 class BitunixPrivateWebSocketClient:
-    def __init__(self, api_key, secret_key):
+    def __init__(self, api_key, secret_key, logger):
         self.api_key = api_key
         self.secret_key = secret_key
         self.url = "wss://fapi.bitunix.com/private/"
@@ -136,6 +136,7 @@ class BitunixPrivateWebSocketClient:
         self.loop = asyncio.new_event_loop()
         self.loop_thread = threading.Thread(target=self.start_loop)
         self.loop_thread.daemon = True  # Ensure the thread closes with the program
+        self.logger=logger
         self.loop_thread.start()
 
 
@@ -182,10 +183,10 @@ class BitunixPrivateWebSocketClient:
                     await self.recv_task                    
 
             except websockets.exceptions.ConnectionClosedError as e:
-                logger.warning(f"{self.type} WebSocket connection closed. Retrying in 5 seconds: {e}")
+                self.logger.warning(f"{self.type} WebSocket connection closed. Retrying in 5 seconds: {e}")
                 await asyncio.sleep(5)  # Delay before retrying
             except Exception as e:
-                logger.error(f"Unexpected error during {self.type} WebSocket operation: {e}")
+                self.logger.error(f"Unexpected error during {self.type} WebSocket operation: {e}")
                 await asyncio.sleep(5)  # Delay before retrying
 
     async def receive_messages(self, process_func: Callable):
@@ -193,7 +194,7 @@ class BitunixPrivateWebSocketClient:
             while self.running:
                 message = await self.websocket.recv()
                 await process_func(message)
-            logger.warning(f"{self.type} WebSocket connection closed")
+            self.logger.warning(f"{self.type} WebSocket connection closed")
         except asyncio.CancelledError:
             self.logger.info(f"{self.url} WebSocket receive task cancelled")
             self.running = False                        
@@ -234,7 +235,7 @@ class BitunixPrivateWebSocketClient:
                self.loop.call_soon_threadsafe(self.websocket.close)  # 
  
         except Exception as e:
-            logger.error(f"Unexpected error during {self.url} WebSocket shutdown: {e}")
+            self.logger.error(f"Unexpected error during {self.url} WebSocket shutdown: {e}")
         finally:
             # Stop the event loop
             self.loop.call_soon_threadsafe(self.loop.stop)

bitunix_automated_crypto_trading/bitunix.py

@@ -65,7 +65,7 @@ HOST = os.getenv('HOST')
 logger = Logger(__name__, LOG_FILE).get_logger()
 
 def get_version():
-    version_file = os.path.abspath("bitunix_automated_crypto_trading/version.py")
+    version_file = os.path.abspath("version.py")
     with open(version_file) as f:
         return re.search(r'__version__ = "(.*?)"', f.read()).group(1)
     

bitunix_automated_crypto_trading/version.py

@@ -1 +1 @@
-__version__ = "3.2.2"
+__version__ = "3.2.5"

{bitunix_automated_crypto_trading-3.2.2.dist-info → bitunix_automated_crypto_trading-3.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitunix_automated_crypto_trading
-Version: 3.2.2
+Version: 3.2.5
 Summary: Bitunix Futures Auto Trading Platform
 Home-page: https://github.com/tcj2001/bitunix-automated-crypto-trading
 Author: tcj2001

{bitunix_automated_crypto_trading-3.2.2.dist-info → bitunix_automated_crypto_trading-3.2.5.dist-info}/RECORD

@@ -1,19 +1,19 @@
 bitunix_automated_crypto_trading/AsyncThreadRunner.py,sha256=bNIM_1xRYQOFEsIn74EX6qVpC59-GMhhr2CeiPr_GWg,3253
 bitunix_automated_crypto_trading/BitunixApi.py,sha256=udgBwbWowf7v46jVVyfs-VjeNh9ajnghTiJf70lvn5w,11269
-bitunix_automated_crypto_trading/BitunixSignal.py,sha256=6IZJiFh7OiEYNBIMdUQcfQ7ErcfP64JKyUqnpJ8V4Fc,74449
-bitunix_automated_crypto_trading/BitunixWebSocket.py,sha256=-_7wRAZxJXG63joBq2k3TUC4qd06v7Miki-LGVtNIDk,11234
+bitunix_automated_crypto_trading/BitunixSignal.py,sha256=h55dbrRDyKA0N8XX8WRpZC9w3a7Rv8uA6lC_3oxojJ4,74460
+bitunix_automated_crypto_trading/BitunixWebSocket.py,sha256=uiqAcis3u-ct07tjaTiC87ujzvcAtVRZ31CMiTBDW_M,11309
 bitunix_automated_crypto_trading/DataFrameHtmlRenderer.py,sha256=Pqdzhh_nfIxFEZH9L_R5QXB8moDPbgeTGT_hmBkHWMg,2899
 bitunix_automated_crypto_trading/NotificationManager.py,sha256=exs6REABBA1omTeTGuUuECzxs5dGqdyL7oI8WyxS6Xc,798
 bitunix_automated_crypto_trading/SupportResistance.py,sha256=x_to4M4OHg0h8o40DXDBa4E_5io-y2Lb5qo2VzFnu_8,5765
 bitunix_automated_crypto_trading/ThreadManager.py,sha256=Lw5_1EIT0m3AFSv5CIMpnjtA0DnNw2qQ6JtSpT34LyM,2349
 bitunix_automated_crypto_trading/TickerManager.py,sha256=xzFzH1qDxCGi2bNji1fO8t7WM971RtN-HsUTWxTn7Ic,42717
 bitunix_automated_crypto_trading/__init__.py,sha256=1hzk6nX8NnUCr1tsq8oFq1qGCNhNwnwldWE75641Eew,78
-bitunix_automated_crypto_trading/bitunix.py,sha256=JGjPiFbk5HIuCFGyMhpqCIKKD2MXrpoxTXPvzLyBJ7A,27165
+bitunix_automated_crypto_trading/bitunix.py,sha256=dNCrQfUNj8jn0jxnP47p9G7QGGuta4nC6GanXPeV9yw,27132
 bitunix_automated_crypto_trading/config.py,sha256=H9iMKzibh295kQrf4RG66hv7_zF_x8Dvp7uCnFU7Voo,5478
 bitunix_automated_crypto_trading/logger.py,sha256=NHnA5JZdUFkTAhB7i-1iCAwrdf1fxhDuRvJUkbKPi9Y,2923
-bitunix_automated_crypto_trading/version.py,sha256=R7a6WjysoMfI8qkLqJaYaPI4eOym9VJ7tZDd_62BSVI,21
-bitunix_automated_crypto_trading-3.2.2.dist-info/METADATA,sha256=yVbyK24xHD3DFCfqzGIOqB3_F2rh_8JcAGbBXbwgu-k,996
-bitunix_automated_crypto_trading-3.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bitunix_automated_crypto_trading-3.2.2.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
-bitunix_automated_crypto_trading-3.2.2.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
-bitunix_automated_crypto_trading-3.2.2.dist-info/RECORD,,
+bitunix_automated_crypto_trading/version.py,sha256=ufPRYI3RSwxsCvCYdJ7jV_Dl1zssfPz7Ye9vyr2dUt0,21
+bitunix_automated_crypto_trading-3.2.5.dist-info/METADATA,sha256=Xg7_0EYIGDSL6u6LgqN8w66W7Tp1oozohgDT4p0SjWc,996
+bitunix_automated_crypto_trading-3.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bitunix_automated_crypto_trading-3.2.5.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
+bitunix_automated_crypto_trading-3.2.5.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
+bitunix_automated_crypto_trading-3.2.5.dist-info/RECORD,,