tastytrade 11.0.4__tar.gz → 11.1.0__tar.gz

{tastytrade-11.0.4 → tastytrade-11.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tastytrade
-Version: 11.0.4
+Version: 11.1.0
 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-11.0.4 → tastytrade-11.1.0}/pyproject.toml

@@ -66,6 +66,7 @@ dev = [
     "proxy-py>=2.4.9",
     "sphinx-immaterial>=0.12.5",
     "mypy>=1.18.2",
+    "pandas-stubs>=2.2.2.240807",
 ]
 
 [tool.setuptools.package-data]

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/__init__.py

@@ -3,8 +3,7 @@ import logging
 API_URL = "https://api.tastyworks.com"
 API_VERSION = "20251101"
 CERT_URL = "https://api.cert.tastyworks.com"
-VAST_URL = "https://vast.tastyworks.com"
-VERSION = "11.0.4"
+VERSION = "11.1.0"
 
 __version__ = VERSION
 version_str: str = f"tastyware/tastytrade:v{VERSION}"

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/account.py

@@ -2,17 +2,14 @@ from datetime import date, datetime
 from decimal import Decimal
 from typing import Any, Literal, cast, overload
 
-import httpx
 from pydantic import BaseModel, ConfigDict, model_validator
 from typing_extensions import Self
 
-from tastytrade import VAST_URL
 from tastytrade.order import (
     InstrumentType,
     NewComplexOrder,
     NewOrder,
     OrderAction,
-    OrderChain,
     OrderStatus,
     PlacedComplexOrder,
     PlacedComplexOrderResponse,
@@ -28,7 +25,6 @@ from tastytrade.utils import (
     paginate,
     set_sign_for,
     today_in_new_york,
-    validate_response,
 )
 
 TT_DATE_FMT = "%Y-%m-%dT%H:%M:%SZ"
@@ -296,23 +292,6 @@ class MarginReport(TastytradeData):
         )
 
 
-class MarginRequirement(TastytradeData):
-    """
-    Dataclass containing general margin requirement information for a symbol.
-    """
-
-    underlying_symbol: str
-    long_equity_initial: Decimal
-    short_equity_initial: Decimal
-    long_equity_maintenance: Decimal
-    short_equity_maintenance: Decimal
-    naked_option_standard: Decimal
-    naked_option_minimum: Decimal
-    naked_option_floor: Decimal
-    clearing_identifier: str | None = None
-    is_deleted: bool | None = None
-
-
 class NetLiqOhlc(TastytradeData):
     """
     Dataclass containing historical net liquidation data in OHLC format
@@ -334,23 +313,6 @@ class NetLiqOhlc(TastytradeData):
     time: str
 
 
-class PositionLimit(TastytradeData):
-    """
-    Dataclass containing information about general account limits.
-    """
-
-    account_number: str
-    equity_order_size: int
-    equity_option_order_size: int
-    future_order_size: int
-    future_option_order_size: int
-    underlying_opening_order_limit: int
-    equity_position_size: int
-    equity_option_position_size: int
-    future_position_size: int
-    future_option_position_size: int
-
-
 class TradingStatus(TastytradeData):
     """
     Dataclass containing information about an account's trading status, such
@@ -546,8 +508,6 @@ class Account(TastytradeData):
         :param session: the session to use for the request.
         :param account_number: the account ID to get.
         :param include_closed: whether to include closed accounts in the results
-
-        :return: an account if an ID was provided; otherwise, a single account.
         """
         if account_number:
             data = session._get(f"/customers/me/accounts/{account_number}")
@@ -1045,58 +1005,6 @@ class Account(TastytradeData):
         )
         return [NetLiqOhlc(**i) for i in data["items"]]
 
-    async def a_get_position_limit(self, session: Session) -> PositionLimit:
-        """
-        Get the maximum order size information for the account.
-
-        :param session: the session to use for the request.
-        """
-        data = await session._a_get(f"/accounts/{self.account_number}/position-limit")
-        return PositionLimit(**data)
-
-    def get_position_limit(self, session: Session) -> PositionLimit:
-        """
-        Get the maximum order size information for the account.
-
-        :param session: the session to use for the request.
-        """
-        data = session._get(f"/accounts/{self.account_number}/position-limit")
-        return PositionLimit(**data)
-
-    async def a_get_effective_margin_requirements(
-        self, session: Session, symbol: str
-    ) -> MarginRequirement:
-        """
-        Get the effective margin requirements for a given symbol.
-
-        :param session:
-            the session to use for the request, can't be certification
-        :param symbol: the symbol to get margin requirements for.
-        """
-        if symbol:
-            symbol = symbol.replace("/", "%2F")
-        data = await session._a_get(
-            f"/accounts/{self.account_number}/margin-requirements/{symbol}/effective"
-        )
-        return MarginRequirement(**data)
-
-    def get_effective_margin_requirements(
-        self, session: Session, symbol: str
-    ) -> MarginRequirement:
-        """
-        Get the effective margin requirements for a given symbol.
-
-        :param session:
-            the session to use for the request, can't be certification
-        :param symbol: the symbol to get margin requirements for.
-        """
-        if symbol:
-            symbol = symbol.replace("/", "%2F")
-        data = session._get(
-            f"/accounts/{self.account_number}/margin-requirements/{symbol}/effective"
-        )
-        return MarginRequirement(**data)
-
     async def a_get_margin_requirements(self, session: Session) -> MarginReport:
         """
         Get the margin report for the account, with total margin requirements
@@ -1502,84 +1410,3 @@ class Account(TastytradeData):
             ),
         )
         return PlacedOrder(**data)
-
-    async def a_get_order_chains(
-        self,
-        session: Session,
-        symbol: str,
-        start_time: datetime,
-        end_time: datetime,
-    ) -> list[OrderChain]:
-        """
-        Get a list of order chains (open + rolls + close) for given symbol
-        over the given time frame, with total P/L, commissions, etc.
-
-        Not supported for OAuth sessions--write Tasty to get this added!
-
-        :param session: the session to use for the request.
-        :param symbol: the underlying symbol for the chains.
-        :param start_time: the beginning time of the query.
-        :param end_time: the ending time of the query.
-        """
-        params = {
-            "account-numbers[]": self.account_number,
-            "underlying-symbols[]": symbol,
-            "start-at": start_time.strftime(TT_DATE_FMT),
-            "end-at": end_time.strftime(TT_DATE_FMT),
-            "defer-open-winner-loser-filtering-to-frontend": False,
-            "per-page": 250,
-        }
-        headers = {
-            "Authorization": session.session_token,
-            "Accept": "application/json",
-            "Content-Type": "application/json",
-        }
-        async with httpx.AsyncClient() as client:
-            response = await client.get(
-                f"{VAST_URL}/order-chains",
-                headers=headers,
-                params=params,  # type: ignore[arg-type]
-            )
-            validate_response(response)
-            chains = response.json()["data"]["items"]
-            return [OrderChain(**i) for i in chains]
-
-    def get_order_chains(
-        self,
-        session: Session,
-        symbol: str,
-        start_time: datetime,
-        end_time: datetime,
-    ) -> list[OrderChain]:
-        """
-        Get a list of order chains (open + rolls + close) for given symbol
-        over the given time frame, with total P/L, commissions, etc.
-
-        Not supported for OAuth sessions--write Tasty to get this added!
-
-        :param session: the session to use for the request.
-        :param symbol: the underlying symbol for the chains.
-        :param start_time: the beginning time of the query.
-        :param end_time: the ending time of the query.
-        """
-        params = {
-            "account-numbers[]": self.account_number,
-            "underlying-symbols[]": symbol,
-            "start-at": start_time.strftime(TT_DATE_FMT),
-            "end-at": end_time.strftime(TT_DATE_FMT),
-            "defer-open-winner-loser-filtering-to-frontend": False,
-            "per-page": 250,
-        }
-        headers = {
-            "Authorization": session.session_token,
-            "Accept": "application/json",
-            "Content-Type": "application/json",
-        }
-        response = httpx.get(
-            f"{VAST_URL}/order-chains",
-            headers=headers,
-            params=params,  # type: ignore[arg-type]
-        )
-        validate_response(response)
-        chains = response.json()["data"]["items"]
-        return [OrderChain(**i) for i in chains]

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/dxfeed/event.py

@@ -41,8 +41,6 @@ class Event(BaseModel):
         a :class:`~tastyworks.streamer.DXFeedStreamer`.
 
         :param data: list of raw quote data from streamer
-
-        :return: list of event objects from data
         """
         objs: list[Event] = []
         size = len(cls.model_fields)

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/instruments.py

@@ -490,8 +490,8 @@ class Option(TradeableTastytradeData):
     stops_trading_at: datetime
     market_time_instrument_collection: str
     days_to_expiration: int
-    expires_at: datetime
     is_closing_only: bool
+    expires_at: datetime | None = None
     streamer_symbol: str = ""
     listed_market: str | None = None
     halted_at: datetime | None = None

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/market_sessions.py

@@ -118,6 +118,25 @@ def get_market_holidays(session: Session) -> MarketCalendar:
     return MarketCalendar(**data)
 
 
+async def a_get_futures_holidays(
+    session: Session, exchange: ExchangeType
+) -> MarketCalendar:
+    """
+    Retrieves market calendar for half days and holidays for a futures exchange.
+
+    :param session: active user session to use
+    :param exchange: exchange to fetch calendar for
+    """
+    data = await session._a_get(f"/market-time/futures/holidays/{exchange.value}")
+    return MarketCalendar(**data)
+
+
 def get_futures_holidays(session: Session, exchange: ExchangeType) -> MarketCalendar:
+    """
+    Retrieves market calendar for half days and holidays for a futures exchange.
+
+    :param session: active user session to use
+    :param exchange: exchange to fetch calendar for
+    """
     data = session._get(f"/market-time/futures/holidays/{exchange.value}")
     return MarketCalendar(**data)

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/order.py

@@ -3,7 +3,7 @@ from decimal import Decimal
 from enum import Enum
 from typing import Any
 
-from pydantic import computed_field, field_serializer, model_validator
+from pydantic import ConfigDict, computed_field, field_serializer, model_validator
 
 from tastytrade import version_str
 from tastytrade.utils import (
@@ -133,7 +133,7 @@ class Leg(TastytradeData):
     instrument_type: InstrumentType
     symbol: str
     action: OrderAction
-    quantity: Decimal | None = None
+    quantity: Decimal | int | None = None
     remaining_quantity: Decimal | None = None
     fills: list[FillInfo] | None = None
 
@@ -149,15 +149,13 @@ class TradeableTastytradeData(TastytradeData):
     instrument_type: InstrumentType
     symbol: str
 
-    def build_leg(self, quantity: Decimal | None, action: OrderAction) -> Leg:
+    def build_leg(self, quantity: Decimal | int | None, action: OrderAction) -> Leg:
         """
         Builds an order :class:`Leg` from the dataclass.
 
         :param quantity:
             the quantity of the symbol to trade, set this as `None` for notional orders
         :param action: :class:`OrderAction` to perform, e.g. BUY_TO_OPEN
-
-        :return: a :class:`Leg` object
         """
         return Leg(
             instrument_type=self.instrument_type,
@@ -239,6 +237,8 @@ class NewOrder(TastytradeData):
     modifying existing orders.
     """
 
+    model_config = ConfigDict(extra="allow")
+
     time_in_force: OrderTimeInForce
     order_type: OrderType
     source: str = version_str
@@ -437,122 +437,3 @@ class PlacedOrderResponse(TastytradeData):
     fee_calculation: FeeCalculation | None = None
     warnings: list[Message] | None = None
     errors: list[Message] | None = None
-
-
-class OrderChainEntry(TastytradeData):
-    """
-    Dataclass containing information about a single order in an order chain.
-    """
-
-    symbol: str
-    instrument_type: InstrumentType
-    quantity: str
-    quantity_type: str
-    quantity_numeric: Decimal
-
-
-class OrderChainLeg(TastytradeData):
-    """
-    Dataclass containing information about a single leg in an order
-    from an order chain.
-    """
-
-    symbol: str
-    instrument_type: InstrumentType
-    action: OrderAction
-    fill_quantity: Decimal
-    order_quantity: Decimal
-
-
-class OrderChainNode(TastytradeData):
-    """
-    Dataclass containing information about a single node in an order chain.
-    """
-
-    node_type: str
-    id: str
-    description: str
-    occurred_at: datetime | None = None
-    total_fees: Decimal | None = None
-    total_fill_cost: Decimal | None = None
-    gcd_quantity: Decimal | None = None
-    fill_cost_per_quantity: Decimal | None = None
-    order_fill_count: int | None = None
-    roll: bool | None = None
-    legs: list[OrderChainLeg] | None = None
-    entries: list[OrderChainEntry] | None = None
-
-    @model_validator(mode="before")
-    @classmethod
-    def validate_price_effects(cls, data: Any) -> Any:
-        return set_sign_for(
-            data,
-            [
-                "total_fees",
-                "total_fill_cost",
-                "fill_cost_per_quantity",
-            ],
-        )
-
-
-class ComputedData(TastytradeData):
-    """
-    Dataclass containing computed data about an order chain.
-    """
-
-    open: bool
-    updated_at: datetime
-    total_fees: Decimal
-    total_commissions: Decimal
-    realized_gain: Decimal
-    realized_gain_with_fees: Decimal
-    winner_realized_and_closed: bool
-    winner_realized: bool
-    winner_realized_with_fees: bool
-    roll_count: int
-    opened_at: datetime
-    last_occurred_at: datetime
-    started_at_days_to_expiration: int
-    duration: int
-    total_opening_cost: Decimal
-    total_closing_cost: Decimal
-    total_cost: Decimal
-    gcd_open_quantity: Decimal
-    fees_missing: bool
-    open_entries: list[OrderChainEntry]
-    total_cost_per_unit: Decimal | None = None
-
-    @model_validator(mode="before")
-    @classmethod
-    def validate_price_effects(cls, data: Any) -> Any:
-        return set_sign_for(
-            data,
-            [
-                "total_fees",
-                "total_commissions",
-                "realized_gain",
-                "realized_gain_with_fees",
-                "total_opening_cost",
-                "total_closing_cost",
-                "total_cost",
-                "total_cost_per_unit",
-            ],
-        )
-
-
-class OrderChain(TastytradeData):
-    """
-    Dataclass containing information about an order chain: a group of orders
-    for a specific underlying, such as total P/L, rolls, current P/L in a
-    symbol, etc.
-    """
-
-    id: int
-    account_number: str
-    description: str
-    underlying_symbol: str
-    computed_data: ComputedData
-    lite_nodes: list[OrderChainNode]
-    lite_nodes_sizes: int | None = None
-    updated_at: datetime | None = None
-    created_at: datetime | None = None

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/session.py

@@ -233,7 +233,7 @@ class Customer(TastytradeData):
     desk_customer_id: str | None = None
     entity: CustomerEntity | None = None
     family_member_names: str | None = None
-    has_institutional_assets: str | None = None
+    has_institutional_assets: str | bool | None = None
     industry_affiliation_firm: str | None = None
     is_investment_adviser: bool | None = None
     listed_affiliation_symbol: str | None = None
@@ -289,9 +289,7 @@ class Session:
         self.streamer_expiration = now_in_new_york()
         self.refresh()
 
-    def _streamer_refresh(self) -> None:
-        # Pull streamer tokens and urls
-        data = self._get("/api-quote-tokens")
+    def _streamer_refresh(self, data: Any) -> None:
         # Auth token for dxfeed websocket
         self.streamer_token = data["token"]
         # URL for dxfeed websocket
@@ -331,7 +329,8 @@ class Session:
         self.async_client.headers.update(auth_headers)
         # update the streamer token if necessary
         if not self.is_test and self.streamer_expiration < self.session_expiration:
-            self._streamer_refresh()
+            data = self._get("/api-quote-tokens")
+            self._streamer_refresh(data)
 
     async def a_refresh(self) -> None:
         """
@@ -365,19 +364,11 @@ class Session:
         if not self.is_test and self.streamer_expiration < self.session_expiration:
             # Pull streamer tokens and urls
             data = await self._a_get("/api-quote-tokens")
-            # Auth token for dxfeed websocket
-            self.streamer_token = data["token"]
-            # URL for dxfeed websocket
-            self.dxlink_url = data["dxlink-url"]
-            self.streamer_expiration = datetime.fromisoformat(
-                data["expires-at"].replace("Z", "+00:00")
-            )
+            self._streamer_refresh(data)
 
     async def a_get_customer(self) -> Customer:
         """
         Gets the customer dict from the API.
-
-        :return: a Tastytrade 'Customer' object in JSON format.
         """
         data = await self._a_get("/customers/me")
         return Customer(**data)
@@ -385,8 +376,6 @@ class Session:
     def get_customer(self) -> Customer:
         """
         Gets the customer dict from the API.
-
-        :return: a Tastytrade 'Customer' object in JSON format.
         """
         data = self._get("/customers/me")
         return Customer(**data)
@@ -394,8 +383,6 @@ class Session:
     async def a_validate(self) -> bool:
         """
         Validates the current session by sending a request to the API.
-
-        :return: True if the session is valid and False otherwise.
         """
         response = await self.async_client.post("/sessions/validate")
         return response.status_code // 100 == 2
@@ -403,8 +390,6 @@ class Session:
     def validate(self) -> bool:
         """
         Validates the current session by sending a request to the API.
-
-        :return: True if the session is valid and False otherwise.
         """
         response = self.sync_client.post("/sessions/validate")
         return response.status_code // 100 == 2
@@ -420,6 +405,7 @@ class Session:
         del attrs["sync_client"]
         attrs["session_expiration"] = self.session_expiration.strftime(_fmt)
         attrs["streamer_expiration"] = self.streamer_expiration.strftime(_fmt)
+        attrs["headers"] = dict(self.sync_client.headers.copy())
         return json.dumps(attrs)
 
     @classmethod
@@ -427,17 +413,11 @@ class Session:
         """
         Create a new Session object from a serialized string.
         """
-        deserialized = json.loads(serialized)
+        deserialized: dict[str, Any] = json.loads(serialized)
+        headers = deserialized.pop("headers")
         self = cls.__new__(cls)
         self.__dict__ = deserialized
         base_url = CERT_URL if self.is_test else API_URL
-        headers = {
-            "Accept": "application/json",
-            "Content-Type": "application/json",
-            "Authorization": self.session_token
-            if "user" in deserialized
-            else f"Bearer {self.session_token}",
-        }
         self.session_expiration = datetime.strptime(
             deserialized["session_expiration"], _fmt
         )

{tastytrade-11.0.4 → tastytrade-11.1.0}/tastytrade/streamer.py

@@ -29,12 +29,7 @@ from tastytrade.dxfeed import (
     Trade,
     Underlying,
 )
-from tastytrade.order import (
-    InstrumentType,
-    OrderChain,
-    PlacedComplexOrder,
-    PlacedOrder,
-)
+from tastytrade.order import InstrumentType, PlacedComplexOrder, PlacedOrder
 from tastytrade.session import Session
 from tastytrade.utils import TastytradeData, TastytradeError, set_sign_for
 from tastytrade.watchlists import Watchlist
@@ -133,7 +128,6 @@ AlertType: TypeAlias = (
     | ExternalTransaction
     | PlacedComplexOrder
     | PlacedOrder
-    | OrderChain
     | CurrentPosition
     | QuoteAlert
     | TradingStatus
@@ -146,7 +140,6 @@ MAP_ALERTS: dict[str, type[AlertType]] = {
     "ComplexOrder": PlacedComplexOrder,
     "ExternalTransaction": ExternalTransaction,
     "Order": PlacedOrder,
-    "OrderChain": OrderChain,
     "CurrentPosition": CurrentPosition,
     "QuoteAlert": QuoteAlert,
     "TradingStatus": TradingStatus,
@@ -761,7 +754,7 @@ class DXLinkStreamer:
         }
 
         def dict_from_schema(event_class: Any) -> dict[str, list[Any]]:
-            schema = event_class.schema()
+            schema = event_class.model_json_schema()
             return {schema["title"]: list(schema["properties"].keys())}
 
         cls = MAP_EVENTS[event_type]