tpluspy 0.2.4__tar.gz → 0.3.1__tar.gz

{tpluspy-0.2.4 → tpluspy-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpluspy
-Version: 0.2.4
+Version: 0.3.1
 Summary: tpluspy: Client utilities for interacting with tplus
 Home-page: https://github.com/tpluslabs/tpluspy
 Author: TPlus Labs
@@ -37,7 +37,7 @@ Requires-Dist: anyio>=4; extra == "test"
 Requires-Dist: pytest-anyio>=0.0.0; extra == "test"
 Requires-Dist: trio>=0.24; extra == "test"
 Provides-Extra: lint
-Requires-Dist: ruff>=0.11.7; extra == "lint"
+Requires-Dist: ruff<0.16,>=0.11.7; extra == "lint"
 Requires-Dist: mypy<2,>=1.18.2; extra == "lint"
 Provides-Extra: release
 Requires-Dist: setuptools>=75.6.0; extra == "release"
@@ -131,12 +131,14 @@ from tplus.utils.user import User
 API_BASE_URL = "http://127.0.0.1:8000"  # Replace with your API URL
 user = User()
 
+
 async def run_client():
     # Use async context manager for automatic cleanup
     async with OrderBookClient(API_BASE_URL, default_user=user) as client:
         print("Client initialized.")
         # ... use client methods ...
 
+
 asyncio.run(run_client())
 ```
 
@@ -160,14 +162,19 @@ print(f"Klines: {klines}")
 
 # Get Market Details for an asset
 market_details = await client.get_market(example_asset)
-print(f"Market Details: Price Decimals={market_details.book_price_decimals}, Quantity Decimals={market_details.book_quantity_decimals}")
+print(
+    f"Market Details: Price Decimals={market_details.book_price_decimals}, Quantity Decimals={market_details.book_quantity_decimals}"
+)
 
 # Get orders for the user
 user_orders, _ = await client.get_user_orders()
 print(f"User Orders: {user_orders}")
 
-# Get trades for the user and asset
-user_asset_trades = await client.get_user_trades_for_asset(example_asset)
+# Get trades for the user and asset (per-user trades live on the market-data-service)
+from tplus.client import MarketDataClient
+
+md_client = MarketDataClient("http://localhost:8011", default_user=user)
+user_asset_trades = await md_client.get_user_trades_for_asset(example_asset, user=user)
 print(f"User Asset Trades: {user_asset_trades}")
 
 # Get user inventory
@@ -180,6 +187,7 @@ print(f"Inventory: {inventory}")
 ```python
 # Ensure example_asset is defined (e.g., from "Fetching Data" section)
 from tplus.model.asset_identifier import AssetIdentifier
+
 example_asset = AssetIdentifier(200)
 
 # Create a Market for an asset (idempotent)
@@ -198,6 +206,7 @@ print(f"Market Order Response: {market_response}")
 # Create a Limit Order for a specific asset
 # Good-Till-Cancelled limit order
 from tplus.model.limit_order import GTC
+
 limit_response = await client.create_limit_order(
     asset_id=example_asset,
     quantity=5,
@@ -210,10 +219,7 @@ print(f"Limit Order Response: {limit_response}")
 # Cancel an Order
 # Order ID should be obtained from an order creation response.
 order_id_to_cancel = "actual-order-id-from-api"  # Replace with a real order ID
-cancel_response = await client.cancel_order(
-    order_id=order_id_to_cancel,
-    asset_id=example_asset
-)
+cancel_response = await client.cancel_order(order_id=order_id_to_cancel, asset_id=example_asset)
 print(f"Cancel Order Response: {cancel_response}")
 
 # Replace an Order
@@ -222,8 +228,8 @@ original_order_id_to_replace = "actual-original-order-id"  # Replace with a real
 replace_response = await client.replace_order(
     original_order_id=original_order_id_to_replace,
     asset_id=example_asset,
-    new_quantity=6, # Optional: New integer quantity
-    new_price=1050   # Optional: New integer price
+    new_quantity=6,  # Optional: New integer quantity
+    new_price=1050,  # Optional: New integer price
 )
 print(f"Replace Order Response: {replace_response}")
 ```
@@ -244,14 +250,16 @@ example_asset = AssetIdentifier(200)
 # Stream Order Book Diffs
 async for diff_update in client.stream_depth(example_asset):
     if isinstance(diff_update, OrderBookDiff):
-        print(f"[Depth] Seq={diff_update.sequence_number}, Asks={len(diff_update.asks)}, Bids={len(diff_update.bids)}")
+        print(
+            f"[Depth] Seq={diff_update.sequence_number}, Asks={len(diff_update.asks)}, Bids={len(diff_update.bids)}"
+        )
     # Add logic to handle the update, e.g., update a local order book
 
 # Stream Finalized Trades
 async for trade in client.stream_finalized_trades():
-     if isinstance(trade, Trade):
+    if isinstance(trade, Trade):
         print(f"[Trade] ID: {trade.trade_id}, Price: {trade.price}, Qty: {trade.quantity}")
-    # Add logic to handle the trade
+# Add logic to handle the trade
 
 # Other available streams:
 # client.stream_orders() -> OrderEvent
@@ -281,10 +289,16 @@ ape console --network ethereum:sepolia:alchemy
 Then, once in the console, you will already have access to contracts that you can call methods on:
 
 ```python
-In [1]: registry.getAssets()
-Out[1]: [getAssets_return(assetAddress=HexBytes('0x000000000000000000000000f08a50178dfcde18524640ea6618a1f965821715'), chainId=11155111, maxDeposits=100)]
-In [2]: registry.admin()
-Out[2]: '0x467a95fC5359edE5d5dDc4f10A1F4B680694858E'
+In[1]: registry.getAssets()
+Out[1]: [
+    getAssets_return(
+        assetAddress=HexBytes("0x000000000000000000000000f08a50178dfcde18524640ea6618a1f965821715"),
+        chainId=11155111,
+        maxDeposits=100,
+    )
+]
+In[2]: registry.admin()
+Out[2]: "0x467a95fC5359edE5d5dDc4f10A1F4B680694858E"
 ```
 
 #### Settlement signatures

{tpluspy-0.2.4 → tpluspy-0.3.1}/README.md

@@ -60,12 +60,14 @@ from tplus.utils.user import User
 API_BASE_URL = "http://127.0.0.1:8000"  # Replace with your API URL
 user = User()
 
+
 async def run_client():
     # Use async context manager for automatic cleanup
     async with OrderBookClient(API_BASE_URL, default_user=user) as client:
         print("Client initialized.")
         # ... use client methods ...
 
+
 asyncio.run(run_client())
 ```
 
@@ -89,14 +91,19 @@ print(f"Klines: {klines}")
 
 # Get Market Details for an asset
 market_details = await client.get_market(example_asset)
-print(f"Market Details: Price Decimals={market_details.book_price_decimals}, Quantity Decimals={market_details.book_quantity_decimals}")
+print(
+    f"Market Details: Price Decimals={market_details.book_price_decimals}, Quantity Decimals={market_details.book_quantity_decimals}"
+)
 
 # Get orders for the user
 user_orders, _ = await client.get_user_orders()
 print(f"User Orders: {user_orders}")
 
-# Get trades for the user and asset
-user_asset_trades = await client.get_user_trades_for_asset(example_asset)
+# Get trades for the user and asset (per-user trades live on the market-data-service)
+from tplus.client import MarketDataClient
+
+md_client = MarketDataClient("http://localhost:8011", default_user=user)
+user_asset_trades = await md_client.get_user_trades_for_asset(example_asset, user=user)
 print(f"User Asset Trades: {user_asset_trades}")
 
 # Get user inventory
@@ -109,6 +116,7 @@ print(f"Inventory: {inventory}")
 ```python
 # Ensure example_asset is defined (e.g., from "Fetching Data" section)
 from tplus.model.asset_identifier import AssetIdentifier
+
 example_asset = AssetIdentifier(200)
 
 # Create a Market for an asset (idempotent)
@@ -127,6 +135,7 @@ print(f"Market Order Response: {market_response}")
 # Create a Limit Order for a specific asset
 # Good-Till-Cancelled limit order
 from tplus.model.limit_order import GTC
+
 limit_response = await client.create_limit_order(
     asset_id=example_asset,
     quantity=5,
@@ -139,10 +148,7 @@ print(f"Limit Order Response: {limit_response}")
 # Cancel an Order
 # Order ID should be obtained from an order creation response.
 order_id_to_cancel = "actual-order-id-from-api"  # Replace with a real order ID
-cancel_response = await client.cancel_order(
-    order_id=order_id_to_cancel,
-    asset_id=example_asset
-)
+cancel_response = await client.cancel_order(order_id=order_id_to_cancel, asset_id=example_asset)
 print(f"Cancel Order Response: {cancel_response}")
 
 # Replace an Order
@@ -151,8 +157,8 @@ original_order_id_to_replace = "actual-original-order-id"  # Replace with a real
 replace_response = await client.replace_order(
     original_order_id=original_order_id_to_replace,
     asset_id=example_asset,
-    new_quantity=6, # Optional: New integer quantity
-    new_price=1050   # Optional: New integer price
+    new_quantity=6,  # Optional: New integer quantity
+    new_price=1050,  # Optional: New integer price
 )
 print(f"Replace Order Response: {replace_response}")
 ```
@@ -173,14 +179,16 @@ example_asset = AssetIdentifier(200)
 # Stream Order Book Diffs
 async for diff_update in client.stream_depth(example_asset):
     if isinstance(diff_update, OrderBookDiff):
-        print(f"[Depth] Seq={diff_update.sequence_number}, Asks={len(diff_update.asks)}, Bids={len(diff_update.bids)}")
+        print(
+            f"[Depth] Seq={diff_update.sequence_number}, Asks={len(diff_update.asks)}, Bids={len(diff_update.bids)}"
+        )
     # Add logic to handle the update, e.g., update a local order book
 
 # Stream Finalized Trades
 async for trade in client.stream_finalized_trades():
-     if isinstance(trade, Trade):
+    if isinstance(trade, Trade):
         print(f"[Trade] ID: {trade.trade_id}, Price: {trade.price}, Qty: {trade.quantity}")
-    # Add logic to handle the trade
+# Add logic to handle the trade
 
 # Other available streams:
 # client.stream_orders() -> OrderEvent
@@ -210,10 +218,16 @@ ape console --network ethereum:sepolia:alchemy
 Then, once in the console, you will already have access to contracts that you can call methods on:
 
 ```python
-In [1]: registry.getAssets()
-Out[1]: [getAssets_return(assetAddress=HexBytes('0x000000000000000000000000f08a50178dfcde18524640ea6618a1f965821715'), chainId=11155111, maxDeposits=100)]
-In [2]: registry.admin()
-Out[2]: '0x467a95fC5359edE5d5dDc4f10A1F4B680694858E'
+In[1]: registry.getAssets()
+Out[1]: [
+    getAssets_return(
+        assetAddress=HexBytes("0x000000000000000000000000f08a50178dfcde18524640ea6618a1f965821715"),
+        chainId=11155111,
+        maxDeposits=100,
+    )
+]
+In[2]: registry.admin()
+Out[2]: "0x467a95fC5359edE5d5dDc4f10A1F4B680694858E"
 ```
 
 #### Settlement signatures

{tpluspy-0.2.4 → tpluspy-0.3.1}/setup.py

@@ -8,7 +8,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="tpluspy",
-    version="0.2.4",
+    version="0.3.1",
     description="""tpluspy: Client utilities for interacting with tplus""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -43,7 +43,7 @@ setup(
             "trio>=0.24",
         ],
         "lint": [
-            "ruff>=0.11.7",
+            "ruff>=0.11.7,<0.16",
             "mypy>=1.18.2,<2",
         ],
         "release": [

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/__init__.py

@@ -1,3 +1,4 @@
+from tplus.client import TplusApiClient
 from tplus.exceptions import (
     AuthError,
     NotFoundError,
@@ -5,6 +6,7 @@ from tplus.exceptions import (
     OrderRejected,
     RateLimitError,
     ServerError,
+    SignerRegistryUnavailable,
 )
 
 __all__ = [
@@ -14,4 +16,6 @@ __all__ = [
     "OrderRejected",
     "RateLimitError",
     "ServerError",
+    "SignerRegistryUnavailable",
+    "TplusApiClient",
 ]

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/_cli/_context.py

@@ -164,9 +164,20 @@ class CLIContext(dict):
 
         return BlockchainClient(base_url=self.blockchain_base_url, insecure_ssl=self.ignore_ssl)
 
-    def market_data_client(self) -> "MarketDataClient":
+    def market_data_client(
+        self, alias: str | None = None, *, authed: bool = False
+    ) -> "MarketDataClient":
+        from tplus.client.auth import Auth
         from tplus.client.market_data import MarketDataClient
 
+        if authed:
+            return MarketDataClient(
+                base_url=self._resolved_market_data_url(),
+                default_user=self.load_user(alias),
+                auth=Auth(cache_dir=_AUTH_CACHE_DIR),
+                insecure_ssl=self.ignore_ssl,
+            )
+
         return MarketDataClient(
             base_url=self._resolved_market_data_url(),
             insecure_ssl=self.ignore_ssl,

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/_cli/orders.py

@@ -94,20 +94,26 @@ def _cancel(cli_ctx: CLIContext, order_id: str, asset_id: str):
 @tplus_account_option()
 @click.argument("order_id")
 @click.option("--asset", "asset_id", required=True, help="Asset identifier.")
-@click.option("--quantity", type=int, help="New base quantity.")
-@click.option("--price", type=int, help="New price.")
+@click.option(
+    "--quantity",
+    type=int,
+    required=True,
+    help="Effective lifetime-total base quantity after the replace.",
+)
+@click.option("--price", type=int, required=True, help="Effective price after the replace.")
 @pass_cli_context
 def _replace(
     cli_ctx: CLIContext,
     order_id: str,
     asset_id: str,
-    quantity: int | None,
-    price: int | None,
+    quantity: int,
+    price: int,
 ):
-    """Replace ORDER_ID with new parameters."""
-    if quantity is None and price is None:
-        raise click.UsageError("Pass --quantity and/or --price.")
+    """Replace ORDER_ID with new parameters.
 
+    A replacement is signed over its complete effective terms, so both --quantity and
+    --price are required even when only one of them changes.
+    """
     from tplus.model.asset_identifier import AssetIdentifier
 
     client = cli_ctx.orderbook_client()

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/_cli/trades.py

@@ -4,6 +4,7 @@ import click
 
 from tplus._cli._context import (
     CLIContext,
+    market_data_url_option,
     orderbook_url_option,
     pass_cli_context,
     tplus_account_option,
@@ -23,6 +24,7 @@ def trades():
 
 
 @trades.command("list")
+@market_data_url_option()
 @orderbook_url_option()
 @ignore_ssl_option()
 @tplus_account_option()
@@ -34,11 +36,12 @@ def _list(cli_ctx: CLIContext, output_format: str, no_pager: bool, asset_id: str
     """List user trades."""
     from tplus.model.asset_identifier import AssetIdentifier
 
-    client = cli_ctx.orderbook_client()
+    client = cli_ctx.market_data_client(authed=True)
+    user = cli_ctx.load_user()
     if asset_id:
-        result = asyncio.run(client.get_user_trades_for_asset(AssetIdentifier(asset_id)))
+        result = asyncio.run(client.get_user_trades_for_asset(AssetIdentifier(asset_id), user=user))
     else:
-        result = asyncio.run(client.get_user_trades())
+        result = asyncio.run(client.get_user_trades(user=user))
 
     if not result:
         click.echo("No trades.")

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/_cli/vaults.py

@@ -36,11 +36,8 @@ def vaults():
 
 
 def _list_via_oms(cli_ctx: CLIContext, output_format: str, no_pager: bool):
-    from tplus.model.chain_address import ChainAddress
-
     client = cli_ctx.orderbook_client(anonymous=True)
-    raw = asyncio.run(client.assets.get_vaults())
-    addresses = [ChainAddress.model_validate(a) for a in raw]
+    addresses = asyncio.run(client.assets.get_vaults())
 
     if output_format == "raw":
         echo_with_pager([str(a) for a in addresses], no_pager=no_pager)

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/client/__init__.py

@@ -1,3 +1,4 @@
+from .api import TplusApiClient
 from .blockchain import BlockchainClient
 from .clearingengine import ClearingEngineClient
 from .market_data import MarketDataClient
@@ -10,6 +11,7 @@ __all__ = (
     "ClearingEngineClient",
     "MarketDataClient",
     "OrderBookClient",
+    "TplusApiClient",
     "WithdrawalClient",
     "AssetRegistryClient",
 )

tpluspy-0.3.1/tplus/client/api.py

@@ -0,0 +1,50 @@
+"""Unified client for the T+ API gateway (one origin fronting OMS + MDS)."""
+
+from typing import Any
+
+from tplus.client.auth import AuthenticatedClient
+from tplus.client.market_data import MarketDataClient
+from tplus.client.orderbook import OrderBookClient
+
+DEFAULT_BASE_URL = "http://localhost:8080"
+
+
+class TplusApiClient(AuthenticatedClient):
+    """Single-token client for the T+ API gateway.
+
+    The gateway is a reverse proxy exposing both the OMS and the MDS behind one
+    origin and one auth token, so a single nonce/token handshake authenticates
+    every endpoint. This client owns the shared httpx connection and ``Auth``;
+    the two service namespaces are composed off it so they reuse both:
+
+    - ``.oms`` — :class:`OrderBookClient` (orders, inventory, positions, margin).
+    - ``.mds`` — :class:`MarketDataClient` (klines, depth, tickers, user trades).
+
+    It is a **drop-in replacement** for either sub-client: any method not defined
+    on the facade itself is proxied to ``.oms`` first, then ``.mds`` (OMS is the
+    primary trading surface), so code written against one sub-client keeps working
+    when swapped to this facade. Use ``.oms`` / ``.mds`` explicitly to disambiguate
+    when both define the same name.
+
+    Closing this client (or exiting its ``async with`` block) closes the one
+    shared connection.
+    """
+
+    def __init__(self, base_url: str = DEFAULT_BASE_URL, **kwargs) -> None:
+        super().__init__(base_url, **kwargs)
+        self.oms = OrderBookClient.from_client(self)
+        self.mds = MarketDataClient.from_client(self)
+
+    def __getattr__(self, name: str) -> Any:
+        # Only reached when normal lookup fails, so real inherited attributes
+        # (_client, _auth, oms, mds, close, …) never hit this path.
+        if name.startswith("_"):
+            raise AttributeError(name)
+
+        for sub_client in ("oms", "mds"):
+            # __dict__ avoids re-entering __getattr__ before __init__ assigns them.
+            client = self.__dict__.get(sub_client)
+            if client is not None and hasattr(client, name):
+                return getattr(client, name)
+
+        raise AttributeError(f"{type(self).__name__!r} object has no attribute {name!r}")

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/client/auth.py

@@ -96,9 +96,11 @@ class AuthenticatedClient(BaseClient):
         *,
         requires_auth: bool = True,
         user: "UserType | None" = None,
+        headers: dict[str, str] | None = None,
         request_timeout: float | None = None,
     ) -> dict[str, Any]:
         relative_url = endpoint if endpoint.startswith("/") else f"/{endpoint}"
+        extra_headers = headers
 
         # Sign in opportunistically so authed callers get the higher-tier rate
         # limits even on endpoints flagged requires_auth=False.
@@ -120,7 +122,10 @@ class AuthenticatedClient(BaseClient):
                 )
                 use_auth = False
 
-        headers = self._build_headers(with_auth=use_auth, user=auth_user)
+        headers = self._build_headers(with_auth=use_auth, user=user)
+        if extra_headers:
+            headers.update(extra_headers)
+
         response = await self._send(
             method,
             relative_url,
@@ -150,7 +155,7 @@ class AuthenticatedClient(BaseClient):
                 )
                 use_auth = False
 
-            headers = self._build_headers(with_auth=use_auth, user=auth_user)
+            headers = self._build_headers(with_auth=use_auth, user=user)
             response = await self._send(
                 method,
                 relative_url,
@@ -219,8 +224,7 @@ class AuthenticatedClient(BaseClient):
         # NOTE: nonce_value **must** be a `str` here.
         nonce_value = f"{nonce_data['value']}" if isinstance(nonce_data, dict) else f"{nonce_data}"
 
-        signature_bytes = user.sign(nonce_value)
-        signature_array = list(signature_bytes)
+        signature_array, additional_signers = user.signing_parts(nonce_value)
         nonce_value_len = len(nonce_value)
 
         self.logger.debug(f"AUTH DEBUG: nonce={nonce_value} (len={nonce_value_len})")
@@ -232,6 +236,7 @@ class AuthenticatedClient(BaseClient):
             "user_id": user.public_key,
             "nonce": nonce_value,
             "signature": signature_array,
+            "additional_signers": [signer.model_dump(mode="json") for signer in additional_signers],
         }
 
         token_resp = await self._client.post("/auth", json=auth_payload)

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/client/base.py

@@ -10,7 +10,7 @@ import websockets
 from pydantic import BaseModel, Field
 from typing_extensions import Self
 
-from tplus.exceptions import MissingClientUserError, from_error_body
+from tplus.exceptions import MissingClientUserError, from_error_body, from_flat_error
 from tplus.logger import get_logger
 from tplus.utils.user import User
 
@@ -74,6 +74,16 @@ def create_httpx_client(settings: ClientSettings) -> httpx.AsyncClient:
     )
 
 
+def page_params(page: int | None, limit: int | None, **extra: Any) -> dict[str, Any] | None:
+    """Query params for a paginated GET; drops `None`s and returns `None` if empty."""
+    params: dict[str, Any] = {k: v for k, v in extra.items() if v is not None}
+    if page is not None:
+        params["page"] = int(page)
+    if limit is not None:
+        params["limit"] = int(limit)
+    return params or None
+
+
 class BaseClient:
     """
     Base client to use across T+ services.
@@ -135,37 +145,20 @@ class BaseClient:
             return user
         return self._resolve_user(user=user).public_key
 
-    async def _get(
-        self,
-        endpoint: str,
-        json_data: dict[str, Any] | None = None,
-        *,
-        requires_auth: bool = True,
-        request_timeout: float | None = None,
-    ) -> dict[str, Any]:
-        return await self._request(
-            "GET",
-            endpoint,
-            json_data=json_data,
-            requires_auth=requires_auth,
-            request_timeout=request_timeout,
-        )
+    async def _get(self, endpoint: str, *args: Any, **kwargs: Any) -> dict[str, Any]:
+        return await self._request("GET", endpoint, *args, **kwargs)
 
-    async def _post(
-        self,
-        endpoint: str,
-        json_data: dict[str, Any] | None = None,
-        *,
-        requires_auth: bool = True,
-        request_timeout: float | None = None,
-    ) -> dict[str, Any]:
-        return await self._request(
-            "POST",
-            endpoint,
-            json_data=json_data,
-            requires_auth=requires_auth,
-            request_timeout=request_timeout,
-        )
+    async def _post(self, endpoint: str, *args: Any, **kwargs: Any) -> dict[str, Any]:
+        return await self._request("POST", endpoint, *args, **kwargs)
+
+    async def _put(self, endpoint: str, *args: Any, **kwargs: Any) -> dict[str, Any]:
+        return await self._request("PUT", endpoint, *args, **kwargs)
+
+    async def _patch(self, endpoint: str, *args: Any, **kwargs: Any) -> dict[str, Any]:
+        return await self._request("PATCH", endpoint, *args, **kwargs)
+
+    async def _delete(self, endpoint: str, *args: Any, **kwargs: Any) -> dict[str, Any]:
+        return await self._request("DELETE", endpoint, *args, **kwargs)
 
     async def _request(
         self,
@@ -176,13 +169,19 @@ class BaseClient:
         *,
         requires_auth: bool = True,
         user: "UserType | None" = None,
+        headers: dict[str, str] | None = None,
         request_timeout: float | None = None,
     ) -> dict[str, Any]:
+        merged_headers = None
+        if headers is not None:
+            merged_headers = {**self._get_request_headers(), **headers}
+
         response = await self._send(
             method,
             endpoint,
             json_data=json_data,
             params=params,
+            headers=merged_headers,
             request_timeout=request_timeout,
         )
         return self._handle_response(response)
@@ -393,14 +392,20 @@ def raise_for_status_with_body(response: httpx.Response) -> None:
     if response.is_success:
         return
 
-    # Try to parse the standardised error envelope
+    # Try to parse the standardised error envelope, or a flat `{"error": "<reason>"}`.
+    flat_message = None
     try:
         data = response.json()
         if isinstance(data, dict) and isinstance(data.get("error"), dict):
             raise from_error_body(data["error"], response.status_code, response=response)
+        if isinstance(data, dict) and isinstance(data.get("error"), str):
+            flat_message = data["error"]
     except (json.JSONDecodeError, ValueError, KeyError):
         pass
 
+    if flat_message is not None:
+        raise from_flat_error(flat_message, response.status_code, response=response)
+
     # Fallback: plain httpx error with body context (pre-existing behaviour)
     try:
         response.raise_for_status()

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/client/clearingengine/admin.py

@@ -131,6 +131,7 @@ class AdminClient(BaseClearingEngineClient):
         premium_clamp: int,
         buffer_multiplier: int,
         min_sub_account_balance: str | int = 0,
+        max_adl: str | int = 0,
     ):
         asset_index = _asset_id_to_index(asset_id)
         risk_parameters = {
@@ -155,6 +156,8 @@ class AdminClient(BaseClearingEngineClient):
             "premium_clamp": premium_clamp,
             "buffer_multiplier": buffer_multiplier,
             "min_sub_account_balance": min_sub_account_balance,
+            # Zero disables auto-deleverage for the asset.
+            "max_adl_usd": max_adl,
         }
         await self._post(
             "admin/risk-parameters/modify",
@@ -240,10 +243,15 @@ class AdminClient(BaseClearingEngineClient):
 
     async def set_book_decimals(
         self,
-        asset_id: AssetIdentifier,
+        asset_id: int | AssetIdentifier | str,
         book_price_decimals: int,
         book_quantity_decimals: int,
     ):
+        if not isinstance(asset_id, AssetIdentifier):
+            asset_id = AssetIdentifier.model_validate(asset_id)
+
+        asset_id = asset_id.model_dump()
+
         await self._post(
             "admin/book-decimals/modify",
             json_data={

{tpluspy-0.2.4 → tpluspy-0.3.1}/tplus/client/clearingengine/cross_venue.py

@@ -15,9 +15,11 @@ class CrossVenueClient(BaseClearingEngineClient):
 
         User-authenticated: the query is signed with ``user``'s key, so a user
         can only read their own venue state. Returns
-        ``{venue_present, allocation_bps, locked, usd_balance}`` — ``venue_present``
-        flips true once the adapter binding reaches the CE, and ``allocation_bps``
-        is non-zero once the credit line is applied.
+        ``{venue_present, allocation_bps, assigned_to, locked, usd_balance}`` —
+        ``venue_present`` flips true once the adapter binding reaches the CE,
+        ``allocation_bps`` is non-zero once the credit line is applied, and
+        ``assigned_to`` is its sub-account index under ``user`` (or ``None``
+        before a credit line exists).
         """
         ts = time.time_ns()
         sep = b"\x1f"