tastytrade 10.2.2__tar.gz → 10.2.3__tar.gz

{tastytrade-10.2.2 → tastytrade-10.2.3}/PKG-INFO

@@ -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 → tastytrade-10.2.3}/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-10.2.2 → tastytrade-10.2.3}/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-10.2.2 → tastytrade-10.2.3}/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 → tastytrade-10.2.3}/tests/test_instruments.py

@@ -147,7 +147,10 @@ async def test_get_option_chain_async(session: Session):
     chain = await a_get_option_chain(session, "SPY")
     assert chain != {}
     for options in chain.values():
-        await Option.a_get(session, options[0].symbol)
+        single = await Option.a_get(session, options[0].symbol)
+        multiple = await Option.a_get(session, [options[0].symbol, options[1].symbol])
+        assert isinstance(single, Option)
+        assert isinstance(multiple, list)
         break
 
 
@@ -155,7 +158,14 @@ def test_get_option_chain(session: Session):
     chain = get_option_chain(session, "SPY")
     assert chain != {}
     for options in chain.values():
-        Option.get(session, options[0].symbol)
+        single = Option.get(session, options[0].symbol)
+        # test setting symbol
+        old = single.streamer_symbol
+        single._set_streamer_symbol()
+        assert single.streamer_symbol == old
+        multiple = Option.get(session, [options[0].symbol, options[1].symbol])
+        assert isinstance(single, Option)
+        assert isinstance(multiple, list)
         break