tpluspy 0.2.0__tar.gz → 0.2.1__tar.gz

{tpluspy-0.2.0 → tpluspy-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpluspy
-Version: 0.2.0
+Version: 0.2.1
 Summary: tpluspy: Client utilities for interacting with tplus
 Home-page: https://github.com/tpluslabs/tpluspy
 Author: TPlus Labs

{tpluspy-0.2.0 → tpluspy-0.2.1}/setup.py

@@ -8,7 +8,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="tpluspy",
-    version="0.2.0",
+    version="0.2.1",
     description="""tpluspy: Client utilities for interacting with tplus""",
     long_description=long_description,
     long_description_content_type="text/markdown",

{tpluspy-0.2.0 → tpluspy-0.2.1}/tplus/client/clearingengine/admin.py

@@ -275,6 +275,19 @@ class AdminClient(BaseClearingEngineClient):
             json_data={"fee_account": user},
         )
 
+    async def set_avs_backstop_target(
+        self, user: UserPublicKey | None, account_index: int | None = None
+    ):
+        """Configure the AVS backstop target, or clear it (disabling the
+        post-liquidation transfer) when ``user`` is ``None``."""
+        await self._post(
+            "admin/avs-backstop-target/modify",
+            json_data={"user": user, "account_index": account_index},
+        )
+
+    async def clear_avs_backstop_target(self):
+        await self.set_avs_backstop_target(None)
+
     async def reset_users(self):
         await self._post(
             "admin/users/reset",

{tpluspy-0.2.0 → tpluspy-0.2.1}/tplus/client/orderbook.py

@@ -184,6 +184,7 @@ class OrderBookClient(AuthenticatedClient):
         quote_quantity: int | None = None,
         fill_or_kill: bool = False,
         asset_id: AssetIdentifier | None = None,
+        order_id: str | None = None,
         target: TradeTarget | None = None,
         max_trading_fees_rate: int | None = None,
         trigger: OrderTrigger | None = None,
@@ -202,6 +203,8 @@ class OrderBookClient(AuthenticatedClient):
             quote_quantity: Quantity expressed in quote-asset units.
             fill_or_kill: If True, the entire order must fill or be cancelled.
             asset_id: Asset to trade.
+            order_id: Optional caller-supplied order id. When omitted, tpluspy
+                preserves its legacy generated id behavior.
             target: Optional sub-account / collateral target for the trade.
             max_trading_fees_rate: Optional maximum trading fee rate the
                 caller is willing to pay (basis points; book-specific).
@@ -210,7 +213,6 @@ class OrderBookClient(AuthenticatedClient):
                 ``base_quantity``.
             max_sellable_quantity: Slippage cap on base sold. Pairs with
                 ``quote_quantity``.
-
         Returns:
             The :class:`OrderOperationResponse` from the OMS.
 
@@ -228,7 +230,7 @@ class OrderBookClient(AuthenticatedClient):
         if max_sellable_quantity is not None and quote_quantity is None:
             raise ValueError("max_sellable_quantity requires quote_quantity")
 
-        order_id = str(base64.b64encode(uuid.uuid4().bytes).decode("ascii"))
+        order_id = order_id or str(base64.b64encode(uuid.uuid4().bytes).decode("ascii"))
         market = await self.get_market(asset_id_unwrapped)
         base_qty_model = (
             MarketBaseQuantity(quantity=base_quantity, max_sellable_amount=max_sellable_amount)
@@ -276,6 +278,7 @@ class OrderBookClient(AuthenticatedClient):
         side: str,
         time_in_force: GTC | GTD | IOC | None = None,
         asset_id: AssetIdentifier | None = None,
+        order_id: str | None = None,
         target: TradeTarget | None = None,
         max_trading_fees_rate: int | None = None,
         trigger: OrderTrigger | None = None,
@@ -290,11 +293,12 @@ class OrderBookClient(AuthenticatedClient):
             time_in_force: One of :class:`GTC`, :class:`IOC`, or :class:`GTD`.
                 Defaults to GTC if omitted.
             asset_id: Asset to trade.
+            order_id: Optional caller-supplied order id. When omitted, tpluspy
+                preserves its legacy generated id behavior.
             target: Optional sub-account / collateral target for the trade.
             max_trading_fees_rate: Optional maximum trading fee rate the
                 caller is willing to pay.
             trigger: Optional :class:`OrderTrigger` for conditional activation.
-
         Returns:
             The :class:`OrderOperationResponse` from the OMS.
 
@@ -312,6 +316,7 @@ class OrderBookClient(AuthenticatedClient):
             side,
             target,
             time_in_force,
+            order_id=order_id,
             max_trading_fees_rate=max_trading_fees_rate,
             trigger=trigger,
             user=user,
@@ -337,11 +342,12 @@ class OrderBookClient(AuthenticatedClient):
         time_in_force,
         max_trading_fees_rate: int | None = None,
         trigger: OrderTrigger | None = None,
+        order_id: str | None = None,
         user: "User | None" = None,
     ):
         user = self._resolve_user(user=user)
         asset_id_unwrapped: AssetIdentifier = asset_id  # type: ignore
-        order_id = str(base64.b64encode(uuid.uuid4().bytes).decode("ascii"))
+        order_id = order_id or str(base64.b64encode(uuid.uuid4().bytes).decode("ascii"))
         market = await self.get_market(asset_id_unwrapped)
         signed_message = create_limit_order_ob_request_payload(
             quantity=quantity,

{tpluspy-0.2.0 → tpluspy-0.2.1}/tplus/model/order.py

@@ -170,6 +170,21 @@ class OrderCancelledEvent(BaseOrderEvent):
     reason: str | None = None
 
 
+class OrderRemovedEvent(BaseOrderEvent):
+    event_type: Literal["REMOVED"]
+    order_id: str
+    asset_id: AssetIdentifier
+    user_id: str
+    timestamp_ns: int
+    operator_pubkey: str | None = None
+    reason: str
+    filled_quantity: int = 0
+    confirmed_quantity: int = 0
+    filled_amount: int = 0
+    confirmed_amount: int = 0
+    book_quantity_decimals: int = 0
+
+
 class OrderReplacedEvent(BaseOrderEvent):
     event_type: Literal["REPLACED"]
     order_id: str
@@ -204,6 +219,7 @@ OrderEvent = (
     OrderCreatedEvent
     | OrderUpdatedEvent
     | OrderCancelledEvent
+    | OrderRemovedEvent
     | OrderReplacedEvent
     | OrderCreateFailedEvent
     | OrderReplaceFailedEvent
@@ -215,6 +231,7 @@ _EVENT_TYPE_MODEL_MAP: dict[str, type[BaseOrderEvent]] = {
     "CREATED": OrderCreatedEvent,
     "UPDATED": OrderUpdatedEvent,
     "CANCELED": OrderCancelledEvent,
+    "REMOVED": OrderRemovedEvent,
     "REPLACED": OrderReplacedEvent,
     "CREATEFAILED": OrderCreateFailedEvent,
     "REPLACEFAILED": OrderReplaceFailedEvent,

{tpluspy-0.2.0 → tpluspy-0.2.1}/tplus/model/trades.py

@@ -29,7 +29,15 @@ class UserTrade(BaseModel):
     is_maker: bool = Field(..., description="True if this user was the maker")
     is_buyer: bool = Field(..., description="True if this user was the buyer")
     status: Literal["Pending", "Confirmed", "Rollbacked"]
-    rollback_reason: str | None
+    rollback_reason: str | None = None
+    is_liquidation: bool = False
+    sub_account: int = Field(
+        default=0, description="Sub-account index (0=main/spot, 1=default margin)"
+    )
+    trading_fee: Decimal = Field(
+        default=Decimal(0),
+        description="Trading fee in USD; positive=paid, negative=rebate",
+    )
 
     @property
     def buyer_is_maker(self) -> bool:
@@ -134,7 +142,10 @@ def parse_single_user_trade(item: dict[str, Any]) -> UserTrade:
             is_maker=bool(item["is_maker"]),
             is_buyer=bool(item["is_buyer"]),
             status=item["status"],
-            rollback_reason=item["rollback_reason"],
+            rollback_reason=item.get("rollback_reason"),
+            is_liquidation=bool(item.get("is_liquidation", False)),
+            sub_account=int(item.get("sub_account", 0)),
+            trading_fee=Decimal(str(item.get("trading_fee", 0))),
         )
     except (KeyError, ValueError, TypeError) as e:
         raise ValueError(f"Invalid user trade data: {item}") from e

{tpluspy-0.2.0 → tpluspy-0.2.1}/tplus/model/user_margin.py

@@ -25,6 +25,16 @@ class PositionSide(str, Enum):
     LONG = "Long"
     SHORT = "Short"
 
+    @classmethod
+    def _missing_(cls, value: object) -> "PositionSide | None":
+        # Accept lowercase values from margin read responses.
+        if isinstance(value, str):
+            folded = value.strip().lower()
+            for member in cls:
+                if member.value.lower() == folded:
+                    return member
+        return None
+
 
 class PositionMarginInfo(BaseModel):
     """

{tpluspy-0.2.0 → tpluspy-0.2.1}/tpluspy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpluspy
-Version: 0.2.0
+Version: 0.2.1
 Summary: tpluspy: Client utilities for interacting with tplus
 Home-page: https://github.com/tpluslabs/tpluspy
 Author: TPlus Labs