PyAlgoEngine 0.7.4.post1__tar.gz → 0.7.5.post1__tar.gz

{pyalgoengine-0.7.4.post1 → pyalgoengine-0.7.5.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyAlgoEngine
-Version: 0.7.4.post1
+Version: 0.7.5.post1
 Summary: Basic algo engine
 Home-page: https://github.com/BolunHan/PyAlgoEngine
 Author: Bolun.Han

{pyalgoengine-0.7.4.post1 → pyalgoengine-0.7.5.post1}/PyAlgoEngine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyAlgoEngine
-Version: 0.7.4.post1
+Version: 0.7.5.post1
 Summary: Basic algo engine
 Home-page: https://github.com/BolunHan/PyAlgoEngine
 Author: Bolun.Han

{pyalgoengine-0.7.4.post1 → pyalgoengine-0.7.5.post1}/algo_engine/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.4.post1"
+__version__ = "0.7.5.post1"
 
 import logging
 import os

{pyalgoengine-0.7.4.post1 → pyalgoengine-0.7.5.post1}/algo_engine/apps/bokeh_server.py

@@ -2,7 +2,7 @@ import abc
 import uuid
 from copy import deepcopy
 from functools import partial
-from threading import Thread, Lock
+from threading import Thread, Lock, Event
 from typing import overload
 
 from . import LOGGER
@@ -144,7 +144,9 @@ class DocManager(object):
 
         self.doc_server: dict[str, DocServer] = {}
         self.doc_url: dict[DocServer, str] = {}
-        self.bokeh_thread = Thread(target=self.serve_bokeh, daemon=True)
+        self.bokeh_thread = Thread(target=self.serve_bokeh)
+        self.stop_event = Event()
+        self.bokeh_server = None
 
     def __getitem__(self, url: str):
         return self.doc_server.__getitem__(url)
@@ -180,7 +182,7 @@ class DocManager(object):
                     LOGGER.info(f"Binding network interface: {interface}, IP Address: {addr.address}")
                     websocket_origin.append(f"{addr.address}:{self.port}")
 
-        server = Server(
+        self.bokeh_server = Server(
             applications=self.doc_server,
             address=self.bokeh_host,
             port=self.bokeh_port,
@@ -194,12 +196,35 @@ class DocManager(object):
             '\n'.join([f'http://{self.bokeh_host}:{self.bokeh_port}{url} => {app}' for url, app in self.doc_server.items()])
         )
 
-        server.start()
+        self.bokeh_server.start()
 
-        # for url in applications:
-        #     server.io_loop.add_callback(server.show, url)
-
-        server.io_loop.start()
+        # Start the Bokeh server IOLoop unless stop_event is triggered
+        while not self.stop_event.is_set():
+            try:
+                self.bokeh_server.io_loop.start()
+            except Exception as e:
+                LOGGER.error(f"Error in Bokeh server: {e}")
+            finally:
+                LOGGER.info("Bokeh server has been stopped.")
+                break
 
     def start(self):
+        LOGGER.info(f'Starting Bokeh service...')
         self.bokeh_thread.start()
+
+    def stop(self):
+        LOGGER.info(f'Stopping Bokeh service...')
+
+        # Signal the event to stop
+        self.stop_event.set()
+
+        # Stop the Bokeh server gracefully
+        if self.bokeh_server is not None:
+            self.bokeh_server.io_loop.stop()  # Stop the IOLoop
+            self.bokeh_server.stop()  # Stop the Bokeh server itself
+
+        # Wait for the Bokeh thread to finish if it's still running
+        if self.bokeh_thread.is_alive():
+            self.bokeh_thread.join()
+
+        LOGGER.info('Bokeh service has been stopped.')

{pyalgoengine-0.7.4.post1 → pyalgoengine-0.7.5.post1}/algo_engine/base/__init__.py

@@ -9,7 +9,11 @@ def set_logger(logger: logging.Logger):
     global LOGGER
     LOGGER = logger
 
-    market_utils.LOGGER = logger.getChild('MarketUtils')
+    if os.name == 'nt':
+        market_utils_nt.LOGGER = logger.getChild('MarketUtils')
+    else:
+        market_utils_posix.LOGGER = logger.getChild('MarketUtils')
+
     trade_utils.LOGGER = logger.getChild('TradeUtils')
     technical_analysis.LOGGER = logger.getChild('TA')
     console_utils.LOGGER = logger.getChild('Console')

{pyalgoengine-0.7.4.post1 → pyalgoengine-0.7.5.post1}/algo_engine/base/market_utils_posix.py

@@ -2111,6 +2111,12 @@ class TickData(MarketData):
             self._order_book = OrderBook(ticker=ticker, timestamp=timestamp, bid=bid, ask=ask)
             buffer.order_book = self._order_book._buffer
 
+        if hasattr(self, '_order_book'):
+            buffer.bid_price = self._order_book.best_bid_price
+            buffer.bid_volume = self._order_book.best_bid_volume
+            buffer.ask_price = self._order_book.best_ask_price
+            buffer.ask_volume = self._order_book.best_ask_volume
+
     def __repr__(self) -> str:
         """
         Returns a string representation of the `TickData` instance.