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

bitunix_automated_crypto_trading/AsyncThreadRunner.py

@@ -28,7 +28,8 @@ class AsyncThreadRunner:
                             )
             self.loop.run_forever()
         except Exception as e:
-            logger.info(f"Async Thread function error: {e}")
+            logger.info(f"Async Thread function error: {e}, exiting app")
+            os._exit(1)  # Exit the program if the thread is stopped
         finally:
             pending = asyncio.all_tasks(self.loop)
             for task in pending:

bitunix_automated_crypto_trading/BitunixSignal.py

@@ -165,12 +165,13 @@ class BitunixSignal:
         self.AutoTradeProcessTask = AsyncThreadRunner(self.AutoTradeProcess, interval=int(self.settings.SIGNAL_CHECK_INTERVAL))
         self.AutoTradeProcessTask.start_thread(thread_name="AutoTradeProcess")
 
+        self.checkTickerAndAutotradeStatusTask = AsyncThreadRunner(self.checkTickerAndAutotradeStatus, interval=0)
+        self.checkTickerAndAutotradeStatusTask.start_thread(thread_name="checkTickerAndAutotradeStatus")
+
         if not self.settings.USE_PUBLIC_WEBSOCKET:
             self.GetTickerDataTask = AsyncThreadRunner(self.GetTickerData, interval=int(self.settings.TICKER_DATA_API_INTERVAL))
             self.GetTickerDataTask.start_thread(thread_name="GetTickerData")
 
-            self.checkPeriodicProcessTask = AsyncThreadRunner(self.checkPeriodicProcess, interval=0)
-            self.checkPeriodicProcessTask.start_thread(thread_name="checkPeriodicProcess")
 
 
     ###########################################################################################################
@@ -259,27 +260,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']:
@@ -295,26 +300,28 @@ class BitunixSignal:
                 logger.info(f"Function: ProcessTickerData, {e}, {e.args}, {type(e).__name__}")
                 logger.info(traceback.print_exc())
             await asyncio.sleep(0.5)
+        logger.info(f"ProcessTickerData: exitied out of the loop, exiting app")
+        os._exit(1)  # Exit the program 
+            
 
     #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']:
@@ -328,6 +335,8 @@ class BitunixSignal:
                 logger.info(f"Function: ProcessTickerData, {e}, {e.args}, {type(e).__name__}")
                 logger.info(traceback.print_exc())
             await asyncio.sleep(0.5)
+        logger.info(f"ProcessDepthData: exitied out of the loop, exiting app")
+        os._exit(1)  # Exit the program 
 
     def apply_depth_data2(self, row):
         row["tickerObj"].set_ask(row["ask"])
@@ -382,7 +391,7 @@ class BitunixSignal:
         gc.collect()
                 
     ###########################################################################################################
-    async def checkPeriodicProcess(self):
+    async def checkTickerAndAutotradeStatus(self):
         while True:
             if self.lastAutoTradeTime + 300 < time.time()  or self.lastTickerDataTime + 300 < time.time():
                 self.notifications.add_notification("AutoTradeProcess or GetTickerData is not running")

bitunix_automated_crypto_trading/bitunix.py

@@ -525,16 +525,26 @@ async def wschart(websocket):
 
         queue = asyncio.Queue()
         queueTask = asyncio.create_task(send_data_queue(websocket, queue))
-
+        period=settings.OPTION_MOVING_AVERAGE
         while True:
             stime=time.time()
             try:
 
+                # Receive period changed data from the WebSocket
+                try:
+                    message = await asyncio.wait_for(websocket.receive_text(), timeout=0.01)
+                    if message!="ping" and message!="":
+                        # Decode the new period from the incoming message
+                        data = json.loads(message)
+                        if "period" in data:
+                            period = data["period"]
+                except asyncio.TimeoutError:
+                    pass
+                
                 # Handle incoming ping messages
                 await asyncio.create_task(send_pong(websocket,queue))
 
                 if ticker in bitunix.bitunixSignal.tickerObjects.symbols():
-                    period=settings.OPTION_MOVING_AVERAGE
                     bars=settings.BARS
                     chart=list(bitunix.bitunixSignal.tickerObjects.get(ticker).get_interval_ticks(period).get_data()[-bars:])
                     buysell=list(bitunix.bitunixSignal.tickerObjects.get(ticker).trades)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitunix_automated_crypto_trading
-Version: 3.0.7
+Version: 3.1.0
 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.1.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-bitunix_automated_crypto_trading/AsyncThreadRunner.py,sha256=JDpAUiTZLB9KV4tGPonAvAUJyBqZz2-ehblH6vsunz8,3142
+bitunix_automated_crypto_trading/AsyncThreadRunner.py,sha256=LJ6ny1KSCVoIbfeNypsY4aHYcbkGME9M3epQ9e8B1O8,3224
 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=LKxWy_-alKkawB_l9_AdzwtCt0rx6lTqfBDuiGBMoe4,64669
 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
 bitunix_automated_crypto_trading/ThreadManager.py,sha256=WmYRQu8aNrgp5HwSqpBqX1WESNSEpbD2CznPFpd9HuI,2330
 bitunix_automated_crypto_trading/TickerManager.py,sha256=eeOK5paiae10XHjKMbucJnVAZkAsEC86N37bRPuCcFc,33427
 bitunix_automated_crypto_trading/__init__.py,sha256=1hzk6nX8NnUCr1tsq8oFq1qGCNhNwnwldWE75641Eew,78
-bitunix_automated_crypto_trading/bitunix.py,sha256=XLYaSSX0g2MMQ6TgR762qL1ppthKm2Ki6vMR77xSpdM,32248
+bitunix_automated_crypto_trading/bitunix.py,sha256=c5vKRuN1-UaNz_ZB5Txu4-2UM6PsnRhs-ztvhRtpEzc,32779
 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.1.0.dist-info/METADATA,sha256=XCBZ2j36c5DL7EKdjcUkS7dzCLMcq9c1TW9Ru5wt9pY,996
+bitunix_automated_crypto_trading-3.1.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+bitunix_automated_crypto_trading-3.1.0.dist-info/entry_points.txt,sha256=UXREYHuSl2XYd_tOtLIq0zg3d1kX3lixX5SpN8yGBw4,82
+bitunix_automated_crypto_trading-3.1.0.dist-info/top_level.txt,sha256=uyFzHUCOsp8elnG2Ovor6xXcf7dxRxY-C-Txiwix64Q,33
+bitunix_automated_crypto_trading-3.1.0.dist-info/RECORD,,