wiz-trader 0.22.0__py3-none-any.whl → 0.24.0__py3-none-any.whl

wiz_trader/__init__.py

@@ -3,6 +3,6 @@
 from .quotes import QuotesClient
 from .apis import WizzerClient
 
-__version__ = "0.22.0"
+__version__ = "0.24.0"
 
 __all__ = ["QuotesClient", "WizzerClient"]

wiz_trader/quotes/client.py

@@ -60,6 +60,7 @@ class QuotesClient:
         self.subscribed_instruments: set = set()
         self._running = False
         self._background_task = None
+        self._loop: Optional[asyncio.AbstractEventLoop] = None
 
         self._backoff_base = 1
         self._backoff_factor = 2
@@ -162,9 +163,6 @@ class QuotesClient:
     # -- Async core methods (for internal use) --
 
     async def _subscribe_async(self, instruments: List[str]) -> None:
-        """
-        Internal async subscription. Use `subscribe()` wrapper to schedule this.
-        """
         if self.ws and self.ws.state == State.OPEN:
             new = set(instruments) - self.subscribed_instruments
             if new:
@@ -177,30 +175,13 @@ class QuotesClient:
                     }))
                     await asyncio.sleep(0.1)
         else:
-            # queue it for next connect
             self.subscribed_instruments |= set(instruments)
 
-    # -- Public wrappers for plain callback users --
-
-    def subscribe(self, instruments: List[str]) -> None:
-        """
-        Schedule an async subscribe so users can call this without 'await'.
-        """
-        try:
-            loop = asyncio.get_event_loop()
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-        loop.create_task(self._subscribe_async(instruments))
-
     async def _unsubscribe_async(self, instruments: List[str]) -> None:
-        """
-        Internal async unsubscription. Use `unsubscribe()` wrapper to schedule this.
-        """
-        # Only send unsubs if the socket is open
         if self.ws and self.ws.state == State.OPEN:
             to_remove = set(instruments) & self.subscribed_instruments
             if to_remove:
+                self.subscribed_instruments -= to_remove
                 for batch in self._chunk_list(list(to_remove), self.batch_size):
                     logger.info("Unsubscribing from %d instruments", len(batch))
                     await self.ws.send(json.dumps({
@@ -208,24 +189,41 @@ class QuotesClient:
                         "instruments": batch
                     }))
                     await asyncio.sleep(0.1)
-                # remove them from our local set
-                self.subscribed_instruments -= to_remove
         else:
-            # if we're not connected yet, just remove from the queue
             self.subscribed_instruments -= set(instruments)
 
+    # -- Public wrappers for plain callback users --
+
+    def subscribe(self, instruments: List[str]) -> None:
+        """
+        Schedule subscribe onto the client’s event loop.
+        """
+        if self._loop:
+            asyncio.run_coroutine_threadsafe(
+                self._subscribe_async(instruments),
+                self._loop
+            )
+        else:
+            self.subscribed_instruments |= set(instruments)
+
     def unsubscribe(self, instruments: List[str]) -> None:
         """
-        Schedule an async unsubscribe so users can call this without 'await'.
+        Schedule unsubscribe onto the client’s event loop.
         """
-        try:
-            loop = asyncio.get_event_loop()
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-        loop.create_task(self._unsubscribe_async(instruments))
-    
-    # You could add a similar unsubscribe wrapper if needed
+        if self._loop:
+            asyncio.run_coroutine_threadsafe(
+                self._unsubscribe_async(instruments),
+                self._loop
+            )
+        else:
+            self.subscribed_instruments -= set(instruments)
+
+    def unsubscribe_all(self) -> None:
+        """
+        Unsubscribe from all currently subscribed instruments.
+        """
+        if self.subscribed_instruments:
+            self.unsubscribe(list(self.subscribed_instruments))
 
     async def close(self) -> None:
         """
@@ -252,6 +250,7 @@ class QuotesClient:
         except RuntimeError:
             loop = asyncio.new_event_loop()
             asyncio.set_event_loop(loop)
+        self._loop = loop
 
         try:
             loop.run_until_complete(self._connect_with_backoff())
@@ -274,6 +273,7 @@ class QuotesClient:
             return
         self._running = True
         loop = asyncio.get_event_loop()
+        self._loop = loop
         self._background_task = loop.create_task(self._connect_with_backoff())
 
     def stop(self) -> None:

{wiz_trader-0.22.0.dist-info → wiz_trader-0.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wiz_trader
-Version: 0.22.0
+Version: 0.24.0
 Summary: A Python SDK for connecting to the Wizzer.
 Home-page: https://bitbucket.org/wizzer-tech/quotes_sdk.git
 Author: Pawan Wagh

wiz_trader-0.24.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+wiz_trader/__init__.py,sha256=hL8zImLBBtwxnrKrTpTqcsIzg5cxFMWDOfTkfKNwo9o,182
+wiz_trader/apis/__init__.py,sha256=ItWKMOl4omiW0g2f-M7WRW3v-dss_ULd9vYnFyIIT9o,132
+wiz_trader/apis/client.py,sha256=GY1aAaV4ia1tnFnB2qaNqnv-qeUvkVlvw9xOKN54qIs,59786
+wiz_trader/quotes/__init__.py,sha256=RF9g9CNP6bVWlmCh_ad8krm3-EWOIuVfLp0-H9fAeEM,108
+wiz_trader/quotes/client.py,sha256=oPDOKqc9EChID_V0_O7ziCdcDnyM_jC7uuKfkc1GwmI,10959
+wiz_trader-0.24.0.dist-info/METADATA,sha256=38v7XP4SiKWiNDaIAex2cHkv7afK8ExKzs5pv-MKFzM,87046
+wiz_trader-0.24.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wiz_trader-0.24.0.dist-info/top_level.txt,sha256=lnYS_g8LlA6ryKYnvY8xIQ6K2K-xzOsd-99AWgnW6VY,11
+wiz_trader-0.24.0.dist-info/RECORD,,

wiz_trader-0.22.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-wiz_trader/__init__.py,sha256=P9duxOjg6Hdg46ZYq-qkqtq40XGZap7TDsGyxVG3ZEs,182
-wiz_trader/apis/__init__.py,sha256=ItWKMOl4omiW0g2f-M7WRW3v-dss_ULd9vYnFyIIT9o,132
-wiz_trader/apis/client.py,sha256=GY1aAaV4ia1tnFnB2qaNqnv-qeUvkVlvw9xOKN54qIs,59786
-wiz_trader/quotes/__init__.py,sha256=RF9g9CNP6bVWlmCh_ad8krm3-EWOIuVfLp0-H9fAeEM,108
-wiz_trader/quotes/client.py,sha256=NBWH1nxI-PKPjTxrU4ibl0xxKbchHm1pWA4JkMLvWBA,11125
-wiz_trader-0.22.0.dist-info/METADATA,sha256=ZtYSZAMCOYs4ojPbZN5Shp0J2kthsdy7vUlfKFOa8og,87046
-wiz_trader-0.22.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wiz_trader-0.22.0.dist-info/top_level.txt,sha256=lnYS_g8LlA6ryKYnvY8xIQ6K2K-xzOsd-99AWgnW6VY,11
-wiz_trader-0.22.0.dist-info/RECORD,,