bitunix-automated-crypto-trading 3.0.7__py3-none-any.whl → 3.0.9__py3-none-any.whl

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -259,27 +259,31 @@ class BitunixSignal:
                 self.cursor.execute("INSERT INTO benchmark (process_name, time) VALUES (?, ?)", ("GetTickerData", time.time()-start))
                 self.connection.commit()
     
-    
+    async def drain_queue(self, queue):
+        items = []
+        while not queue.empty():
+            items.append(await queue.get())
+        return deque(items[::-1][:self.settings.BATCH_PROCESS_SIZE])  # Reverse items    
+
     #websocket data to update ticker lastprice and other relavent data
     # Function to add data to the last price deque
     async def StoreTickerData(self, message):
-        if self.settings.USE_PUBLIC_WEBSOCKET:
-            if message=="":
-                return
-            data = json.loads(message)
-            if 'symbol' in data and data['ch'] in ['ticker']:
-                await self.ticker_que.put(data)
+        if self.settings.USE_PUBLIC_WEBSOCKET and message:
+            try:
+                data = json.loads(message)
+                if data.get('symbol') and data.get('ch') == 'ticker':
+                    await self.ticker_que.put(data)
+            except json.JSONDecodeError as e:
+                logger.warning(f"Failed to decode message: {message}. Error: {e}")
 
     # Function to process the last price deque
     async def ProcessTickerData(self):
         while True:
             try:
-                batch_size = self.settings.BATCH_PROCESS_SIZE   
                 latest_data = {}
-                reversed_items = list(self.ticker_que._queue)[::-1]
-                self.ticker_que._queue.clear()
-                for i in range(min(batch_size, len(reversed_items))):
-                    data = reversed_items[i]
+                reversed_items = await self.drain_queue(self.ticker_que)
+                while reversed_items:
+                    data = reversed_items.popleft()
                     symbol = data["symbol"]
                     ts = data["ts"]
                     if symbol not in latest_data or ts > latest_data[symbol]['ts']:
@@ -298,23 +302,22 @@ class BitunixSignal:
 
     #websocket data to update bid and ask
     async def StoreDepthData(self, message):
-        if self.settings.USE_PUBLIC_WEBSOCKET:
-            if message=="":
-                return
-            data = json.loads(message)
-            if 'symbol' in data and data['ch'] in ['depth_book1']:
-                await self.depth_que.put(data)
+        if self.settings.USE_PUBLIC_WEBSOCKET and message:
+            try:
+                data = json.loads(message)
+                if data.get('symbol') and data.get('ch') == 'depth_book1':
+                    await self.depth_que.put(data)
+            except json.JSONDecodeError as e:
+                logger.warning(f"Failed to decode message: {message}. Error: {e}")        
 
     # Function to process the bid, ask
     async def ProcessDepthData(self):
         while True:
             try:
-                batch_size = self.settings.BATCH_PROCESS_SIZE   
                 latest_data = {}
-                reversed_items = list(self.depth_que._queue)[::-1]
-                self.depth_que._queue.clear()
-                for i in range(min(batch_size, len(reversed_items))):
-                    data = reversed_items[i]
+                reversed_items = await self.drain_queue(self.depth_que)
+                while reversed_items:
+                    data = reversed_items.popleft()
                     symbol = data["symbol"]
                     ts = data["ts"]
                     if symbol not in latest_data or ts > latest_data[symbol]['ts']:

{bitunix_automated_crypto_trading-3.0.7.dist-info → bitunix_automated_crypto_trading-3.0.9.dist-info}/METADATA

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

{bitunix_automated_crypto_trading-3.0.7.dist-info → bitunix_automated_crypto_trading-3.0.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 bitunix_automated_crypto_trading/AsyncThreadRunner.py,sha256=JDpAUiTZLB9KV4tGPonAvAUJyBqZz2-ehblH6vsunz8,3142
 bitunix_automated_crypto_trading/BitunixApi.py,sha256=wJhknpmVFrckoL89h-nlWUAMsPxhIacY0nOGJT9M6Vw,11360
-bitunix_automated_crypto_trading/BitunixSignal.py,sha256=fqmarMKcJi8qmXaF-O0EjN-ROTR5BBAbeGCmlkF-zgA,64164
+bitunix_automated_crypto_trading/BitunixSignal.py,sha256=sArNBVXFZu4unBeTBhv3S1yNuZd-8PZtu10yGBGVkW8,64377
 bitunix_automated_crypto_trading/BitunixWebSocket.py,sha256=mbuvk8UFWKgv4KLV07TgLgxLVTRJnOKuf02mLB-VoCY,11143
 bitunix_automated_crypto_trading/DataFrameHtmlRenderer.py,sha256=Pqdzhh_nfIxFEZH9L_R5QXB8moDPbgeTGT_hmBkHWMg,2899
 bitunix_automated_crypto_trading/NotificationManager.py,sha256=pqDquEe-oujD2v8B543524vo62aRMjfB4YW-3DMhVGQ,795
@@ -10,8 +10,8 @@ bitunix_automated_crypto_trading/__init__.py,sha256=1hzk6nX8NnUCr1tsq8oFq1qGCNhN
 bitunix_automated_crypto_trading/bitunix.py,sha256=XLYaSSX0g2MMQ6TgR762qL1ppthKm2Ki6vMR77xSpdM,32248
 bitunix_automated_crypto_trading/config.py,sha256=QWAe5Ruq8A5anaFS-CamVm-3t1wMJjGG1DWaPIIWfiM,4521
 bitunix_automated_crypto_trading/logger.py,sha256=tAaTQcv5r--zupk_Fhfe1USfBAzSiXzVa4QRnaOFIFY,2933
-bitunix_automated_crypto_trading-3.0.7.dist-info/METADATA,sha256=6XzEoQONyYR3KuG5Q3r-8-td9F3AtWdQU0M0vWrUXTw,996
-bitunix_automated_crypto_trading-3.0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-bitunix_automated_crypto_trading-3.0.7.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
-bitunix_automated_crypto_trading-3.0.7.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
-bitunix_automated_crypto_trading-3.0.7.dist-info/RECORD,,
+bitunix_automated_crypto_trading-3.0.9.dist-info/METADATA,sha256=h3fxV9vRsIa5kna4waL0fpixwZ_PnpqTgOSTcyjB2U4,996
+bitunix_automated_crypto_trading-3.0.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+bitunix_automated_crypto_trading-3.0.9.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
+bitunix_automated_crypto_trading-3.0.9.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
+bitunix_automated_crypto_trading-3.0.9.dist-info/RECORD,,