tastytrade 10.2.2__py3-none-any.whl → 10.2.3__py3-none-any.whl

tastytrade/__init__.py

@@ -4,7 +4,7 @@ API_URL = "https://api.tastyworks.com"
 BACKTEST_URL = "https://backtester.vast.tastyworks.com"
 CERT_URL = "https://api.cert.tastyworks.com"
 VAST_URL = "https://vast.tastyworks.com"
-VERSION = "10.2.2"
+VERSION = "10.2.3"
 
 __version__ = VERSION
 version_str: str = f"tastyware/tastytrade:v{VERSION}"

tastytrade/session.py

@@ -578,7 +578,8 @@ class OAuthSession(Session):  # pragma: no cover
         """
         Refreshes the acccess token using the stored refresh token.
         """
-        response = self.sync_client.post(
+        request = self.sync_client.build_request(
+            "POST",
             "/oauth/token",
             json={
                 "grant_type": "refresh_token",
@@ -586,6 +587,9 @@ class OAuthSession(Session):  # pragma: no cover
                 "refresh_token": self.refresh_token,
             },
         )
+        # Don't send the Authorization header for this request
+        request.headers.pop("Authorization", None)
+        response = self.sync_client.send(request)
         validate_response(response)
         data = response.json()
         # update the relevant tokens
@@ -602,7 +606,8 @@ class OAuthSession(Session):  # pragma: no cover
         """
         Refreshes the acccess token using the stored refresh token.
         """
-        response = await self.async_client.post(
+        request = self.async_client.build_request(
+            "POST",
             "/oauth/token",
             json={
                 "grant_type": "refresh_token",
@@ -610,6 +615,9 @@ class OAuthSession(Session):  # pragma: no cover
                 "refresh_token": self.refresh_token,
             },
         )
+        # Don't send the Authorization header for this request
+        request.headers.pop("Authorization", None)
+        response = await self.async_client.send(request)
         validate_response(response)
         data = response.json()
         # update the relevant tokens

tastytrade/streamer.py

@@ -278,17 +278,18 @@ class AlertStreamer:
         """
         Closes the websocket connection and cancels the pending tasks.
         """
-        self._closing = True
-        self._connect_task.cancel()
-        tasks = [self._connect_task]
-        if self._heartbeat_task and not self._heartbeat_task.done():
-            self._heartbeat_task.cancel()
-            tasks.append(self._heartbeat_task)
-        if self._reconnect_task and not self._reconnect_task.done():
-            self._reconnect_task.cancel()
-            tasks.append(self._reconnect_task)
-        await asyncio.gather(*tasks)
-        await self._websocket.wait_closed()  # type: ignore
+        if not self._closing:  # can only be called once
+            self._closing = True
+            self._connect_task.cancel()
+            tasks = [self._connect_task]
+            if self._heartbeat_task and not self._heartbeat_task.done():
+                self._heartbeat_task.cancel()
+                tasks.append(self._heartbeat_task)
+            if self._reconnect_task and not self._reconnect_task.done():
+                self._reconnect_task.cancel()
+                tasks.append(self._reconnect_task)
+            await asyncio.gather(*tasks)
+            await self._websocket.wait_closed()  # type: ignore
 
     async def _connect(self) -> None:
         """
@@ -316,9 +317,7 @@ class AlertStreamer:
                 logger.error(f"Websocket connection closed with {e}")
             except asyncio.CancelledError:
                 logger.debug("Websocket interrupted, cancelling main loop.")
-                if not self._closing:
-                    await self.close()
-                return
+                return await self.close()
             finally:
                 asyncio.create_task(self.disconnect_fn(self, *self.disconnect_args))
             logger.debug("Websocket connection closed, retrying...")
@@ -336,9 +335,12 @@ class AlertStreamer:
             the type of alert to listen for, should be of :any:`AlertType`
         """
         cls_str = next(k for k, v in MAP_ALERTS.items() if v == alert_class)
-        while True:
-            item = await self._queues[cls_str].get()
-            yield cast(T, item)
+        try:
+            while True:
+                item = await self._queues[cls_str].get()
+                yield cast(T, item)
+        except GeneratorExit:  # no cleanup needed
+            pass
 
     async def _map_message(self, type_str: str, data: dict[str, Any]) -> None:
         """
@@ -515,17 +517,18 @@ class DXLinkStreamer:
         """
         Closes the websocket connection and cancels the heartbeat task.
         """
-        self._closing = True
-        self._connect_task.cancel()
-        tasks = [self._connect_task]
-        if self._heartbeat_task:
-            self._heartbeat_task.cancel()
-            tasks.append(self._heartbeat_task)
-        if self._reconnect_task is not None and not self._reconnect_task.done():
-            self._reconnect_task.cancel()
-            tasks.append(self._reconnect_task)
-        await asyncio.gather(*tasks)
-        await self._websocket.wait_closed()
+        if not self._closing:  # can only be called once
+            self._closing = True
+            self._connect_task.cancel()
+            tasks = [self._connect_task]
+            if self._heartbeat_task:
+                self._heartbeat_task.cancel()
+                tasks.append(self._heartbeat_task)
+            if self._reconnect_task is not None and not self._reconnect_task.done():
+                self._reconnect_task.cancel()
+                tasks.append(self._reconnect_task)
+            await asyncio.gather(*tasks)
+            await self._websocket.wait_closed()
 
     async def _connect(self) -> None:
         """
@@ -592,8 +595,7 @@ class DXLinkStreamer:
                         pass
                     elif message["type"] == "ERROR":
                         logger.error(f"Fatal streamer error: {message['message']}")
-                        await self.close()
-                        return
+                        return await self.close()
                     else:
                         logger.error(f"Unknown message: {message}")
             except ConnectionClosed as e:
@@ -603,13 +605,10 @@ class DXLinkStreamer:
                         "Subscription message too long! Try reducing the number of "
                         "symbols."
                     )
-                    await self.close()
-                    return
+                    return await self.close()
             except asyncio.CancelledError:
                 logger.debug("Websocket interrupted, cancelling main loop.")
-                if not self._closing:
-                    await self.close()
-                return
+                return await self.close()
             finally:
                 asyncio.create_task(self.disconnect_fn(self, *self.disconnect_args))
             logger.debug("Websocket connection closed, retrying...")
@@ -645,8 +644,11 @@ class DXLinkStreamer:
         :param event_class:
             the type of alert to listen for, should be of :any:`EventType`
         """
-        while True:
-            yield await self._queues[MAP_EVENTS_REVERSE[event_class]].get()  # type: ignore
+        try:
+            while True:
+                yield await self._queues[MAP_EVENTS_REVERSE[event_class]].get()  # type: ignore
+        except GeneratorExit:  # no cleanup needed
+            pass
 
     def get_event_nowait(self, event_class: type[U]) -> Optional[U]:
         """

{tastytrade-10.2.2.dist-info → tastytrade-10.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tastytrade
-Version: 10.2.2
+Version: 10.2.3
 Summary: An unofficial, sync/async SDK for Tastytrade!
 Project-URL: Homepage, https://github.com/tastyware/tastytrade
 Project-URL: Documentation, https://tastyworks-api.rtfd.io

{tastytrade-10.2.2.dist-info → tastytrade-10.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tastytrade/__init__.py,sha256=ObxYGOZli9jgKd0iRZXiB-JanAzNZ8CAKdPSVUzl4Qs,581
+tastytrade/__init__.py,sha256=C1Ziu6t5GQoRBAP9TW_HtjES_m6HT3cJqZK0hBuOV3s,581
 tastytrade/account.py,sha256=zjeS3_snMh7QT21NrjPjJQ5RBPChdgHF3w1lMggdAw8,63578
 tastytrade/backtest.py,sha256=-IqzxT44d9rGpdCirEj2Kbcl0AaiBOqi9pELHHW6cY8,7898
 tastytrade/instruments.py,sha256=DX8gc81xhkKRRgoL7-g2aWXo_WX30N_3SmRSuYMZBxM,47062
@@ -8,8 +8,8 @@ tastytrade/metrics.py,sha256=yKZ1EoiQgCLEfdTF-sC9U_pgpeG27Bq717I-FQg1RZc,7256
 tastytrade/order.py,sha256=C7Eyn2uDCY5Ss3AG5xk5mnHu1W58P1Ji7pJEMAHHWiU,15107
 tastytrade/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tastytrade/search.py,sha256=LdoVEhiYNvtolXlf_jAVZUtA2ymUWOvHMhQxJxuVt_A,1529
-tastytrade/session.py,sha256=sJIT5uFxNVy4fqTHtalFNIkBUnLKfyCodmbA6gsq278,20724
-tastytrade/streamer.py,sha256=xADOJP8iTSw6sH0wVMMKs2oR5cXBui_fTvc0QkLdvBw,32759
+tastytrade/session.py,sha256=SOl4RLm1JAZTlLM0w8iR94bJPNWejh1MXchcbrIhG-4,21109
+tastytrade/streamer.py,sha256=-xLVwjB5ozgATZXfibJQIXaZNbz8sD696MkjoHVR_4A,32983
 tastytrade/utils.py,sha256=yUWSEux3XrDTOB184_YdDEuwIufITcnH5eUYXT38ukM,9702
 tastytrade/watchlists.py,sha256=rpZmtl-jGJVNXT_L9oD3khwiKKUy-0ilAixkMNC11uI,8731
 tastytrade/dxfeed/__init__.py,sha256=GmC0aKtiUjs7aqbX7PeqMaROxqalwzHOnJOMJn8TaZk,458
@@ -23,7 +23,7 @@ tastytrade/dxfeed/theoprice.py,sha256=L5aH--F_6xLZCSYZ4APpzlihbW0-cYEwRdeGVI-aNa
 tastytrade/dxfeed/timeandsale.py,sha256=QuMFoccq8x3c2y6s3DnwBNIVTrLS6OPqV6GmCNoXQEQ,1903
 tastytrade/dxfeed/trade.py,sha256=qNo4oKb7iq0Opoq3FCBEUUcGGF6udda1bD0eKQVty_0,1402
 tastytrade/dxfeed/underlying.py,sha256=YYqJNlmrlt6Kpg0F6voQ18g60obXiYTVlroXirBWPR8,1226
-tastytrade-10.2.2.dist-info/METADATA,sha256=fJX1rc15cxFnzgDkXFisDasIj14DRG1mw3nQbGL0lRc,10903
-tastytrade-10.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tastytrade-10.2.2.dist-info/licenses/LICENSE,sha256=enBkMN4OsfLt6Z_AsrGC7u5dAJkCEODnoN7BwMCzSfc,1072
-tastytrade-10.2.2.dist-info/RECORD,,
+tastytrade-10.2.3.dist-info/METADATA,sha256=0ehiijPEx7V1hDLPuvpJJ8f8vD42eNvOgTqSuiCvS7c,10903
+tastytrade-10.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tastytrade-10.2.3.dist-info/licenses/LICENSE,sha256=enBkMN4OsfLt6Z_AsrGC7u5dAJkCEODnoN7BwMCzSfc,1072
+tastytrade-10.2.3.dist-info/RECORD,,