quantplay 2.1.63__tar.gz → 2.1.64__tar.gz

{quantplay-2.1.63 → quantplay-2.1.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: quantplay
-Version: 2.1.63
+Version: 2.1.64
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 

{quantplay-2.1.63 → quantplay-2.1.64}/quantplay/broker/aliceblue.py

@@ -726,39 +726,55 @@ class Aliceblue(Broker):
             logger.error("[ORDER_UPDATE_PROCESSING_FAILED] {}".format(e))
             traceback.print_exc()
 
-    def start_order_websocket(self):
+    def start_order_websocket(self) -> None:
         ws_token = self.create_websocket_token()
         print(f"{self.user_id}: WebSocket connection established.")
         headers = {"Content-Type": "application/json"}
         payload = {"orderToken": ws_token, "userId": self.user_id}
         session_data = json.dumps(payload)
 
-        def on_message(ws: websocket.WebSocket, message: Any):
+        stop_event = threading.Event()
+
+        def on_message(ws: websocket.WebSocket, message: Any) -> None:
             order = json.loads(message)
 
+            if order.get("status", "") == "Ok":
+                return
+
             if order["t"] == "om":
                 self.handle_order_update(order)
 
-        def on_error(ws: websocket.WebSocket, error: Any):
+        def on_error(ws: websocket.WebSocket, error: Any) -> None:
             if type(ws) is not websocket.WebSocketApp:  # type: ignore
                 error = ws
 
-            logger.error(f"{self.user_id}: WebSocket Closed. Reason: {error}")
+            traceback.print_exc()
+            logger.error(f"{self.user_id}: WebSocket Error. Reason: {error}")
 
-        def on_close(ws: websocket.WebSocket, close_status_code: int, close_msg: str):
+        def on_close(
+            ws: websocket.WebSocket, close_status_code: int, close_msg: str
+        ) -> None:
+            traceback.print_exc()
             logger.error(
                 f"{self.user_id}: WebSocket Closed. Status code: {close_status_code}, Reason: {close_msg}"
             )
 
-        def on_open(ws: websocket.WebSocket):
+            time.sleep(2)
+
+            stop_event.set()
+            self.stream_order_data()
+
+            return
+
+        def on_open(ws: websocket.WebSocket) -> None:
             print(f"{self.user_id}: WebSocket Connection Opened")
             ws.send(session_data)
             threading.Thread(
                 target=heart_beat_connection, args=(ws,), daemon=True
             ).start()
 
-        def heart_beat_connection(ws: websocket.WebSocket):
-            while True:
+        def heart_beat_connection(ws: websocket.WebSocket) -> None:
+            while not stop_event.is_set():
                 try:
                     payload = {"heartbeat": "h", "userId": self.user_id}
                     hearbeat_data = json.dumps(payload)
@@ -779,6 +795,6 @@ class Aliceblue(Broker):
         )
         ws.run_forever()  # type: ignore
 
-    def stream_order_data(self):
+    def stream_order_data(self) -> None:
         thread = threading.Thread(target=self.start_order_websocket, daemon=True)
         thread.start()

{quantplay-2.1.63 → quantplay-2.1.64}/quantplay/broker/ft_utils/ft_noren.py

@@ -172,7 +172,7 @@ class FT_NorenApi:
 
     def __on_error_callback(
         self, ws: websocket.WebSocket | None = None, error: Any | None = None
-    ):
+    ) -> None:
         if type(ws) is not websocket.WebSocketApp:
             error = ws
 

{quantplay-2.1.63 → quantplay-2.1.64}/quantplay.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: quantplay
-Version: 2.1.63
+Version: 2.1.64
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 

{quantplay-2.1.63 → quantplay-2.1.64}/setup.py

@@ -21,7 +21,7 @@ requirements = [
 setup(
     name="quantplay",
     long_description=Path("README.md").read_text(),
-    version="2.1.63",
+    version="2.1.64",
     setup_requires=["pytest-runner"],
     install_requires=requirements,
     tests_require=[],