tpluspy 0.3.0__tar.gz → 0.3.2__tar.gz

{tpluspy-0.3.0 → tpluspy-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpluspy
-Version: 0.3.0
+Version: 0.3.2
 Summary: tpluspy: Client utilities for interacting with tplus
 Home-page: https://github.com/tpluslabs/tpluspy
 Author: TPlus Labs
@@ -264,7 +264,7 @@ async for trade in client.stream_finalized_trades():
 # Other available streams:
 # client.stream_orders() -> OrderEvent
 # client.stream_all_trades() -> TradeEvent
-# client.stream_klines(asset_id) -> KlineUpdate
+# client.stream_klines(asset_id) -> Timebar
 ```
 
 See `examples/websocket_usage.py` for a runnable demonstration using `asyncio.gather` to run multiple streams concurrently.

{tpluspy-0.3.0 → tpluspy-0.3.2}/README.md

@@ -193,7 +193,7 @@ async for trade in client.stream_finalized_trades():
 # Other available streams:
 # client.stream_orders() -> OrderEvent
 # client.stream_all_trades() -> TradeEvent
-# client.stream_klines(asset_id) -> KlineUpdate
+# client.stream_klines(asset_id) -> Timebar
 ```
 
 See `examples/websocket_usage.py` for a runnable demonstration using `asyncio.gather` to run multiple streams concurrently.

{tpluspy-0.3.0 → tpluspy-0.3.2}/setup.py

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

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/_cli/markets.py

@@ -120,6 +120,7 @@ def _depth(cli_ctx: CLIContext, asset_id: str):
 @click.option("--page", type=int)
 @click.option("--limit", type=int)
 @click.option("--end-timestamp-ns", "end_timestamp_ns", type=int)
+@click.option("--interval", help="Bucket width, e.g. 1, 5m, 4h, 1D, 1W or 1M (a month).")
 @pass_cli_context
 def _klines(
     cli_ctx: CLIContext,
@@ -129,6 +130,7 @@ def _klines(
     page: int | None,
     limit: int | None,
     end_timestamp_ns: int | None,
+    interval: str | None,
 ):
     """Get candlestick data for ASSET_ID."""
     from tplus.model.asset_identifier import AssetIdentifier
@@ -136,7 +138,11 @@ def _klines(
     client = cli_ctx.market_data_client()
     klines = asyncio.run(
         client.get_klines(
-            AssetIdentifier(asset_id), page=page, limit=limit, end_timestamp_ns=end_timestamp_ns
+            AssetIdentifier(asset_id),
+            page=page,
+            limit=limit,
+            end_timestamp_ns=end_timestamp_ns,
+            interval=interval,
         )
     )
     if output_format == "raw":

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/client/market_data.py

@@ -7,7 +7,13 @@ from tplus.client.auth import AuthenticatedClient
 from tplus.client.base import page_params
 from tplus.exceptions import NotFoundError
 from tplus.model.asset_identifier import AssetIdentifier
-from tplus.model.klines import KlinesPage, KlineUpdate, parse_kline_update, parse_klines_page
+from tplus.model.klines import (
+    Interval,
+    KlinesPage,
+    Timebar,
+    parse_klines_page,
+    parse_timebars,
+)
 from tplus.model.order import OrderResponse, parse_orders
 from tplus.model.orderbook import OrderBook, OrderBookDiff
 from tplus.model.trades import (
@@ -25,17 +31,6 @@ from tplus.types import UserType
 DEFAULT_BASE_URL = "http://localhost:8011"
 
 
-def _pagination(page: int | None, limit: int | None) -> dict[str, Any]:
-    params: dict[str, Any] = {}
-    if page:
-        params["page"] = page
-
-    if limit:
-        params["limit"] = limit
-
-    return params
-
-
 class MarketDataClient(AuthenticatedClient):
     """Klines, order-book depth, public trades and 24h tickers (REST + WS streams).
 
@@ -63,12 +58,19 @@ class MarketDataClient(AuthenticatedClient):
         page: int | None = None,
         limit: int | None = None,
         end_timestamp_ns: int | None = None,
+        interval: Interval | str | None = None,
     ) -> KlinesPage:
-        """A page of k-line (candlestick) data for `asset_id`, with pagination metadata."""
-        params = _pagination(page, limit)
-        if end_timestamp_ns:
-            params["end_timestamp_ns"] = end_timestamp_ns
+        """A page of k-line (candlestick) data for `asset_id`, with pagination metadata.
 
+        `interval` asks for wider candlesticks, e.g. `Interval.HOUR_4`. A raw string is
+        passed through, so the suffixed forms (`4h`, `1d`) also work.
+        """
+        params = page_params(
+            page,
+            limit,
+            end_timestamp_ns=end_timestamp_ns,
+            interval=str(interval) if interval is not None else None,
+        )
         response = await self._get(f"/klines/{asset_id}", params=params, requires_auth=False)
         if not isinstance(response, dict | list):
             raise ValueError(f"Invalid response from get_klines: {response}")
@@ -93,7 +95,7 @@ class MarketDataClient(AuthenticatedClient):
 
     async def get_trades(self, page: int | None = None, limit: int | None = None) -> list[Trade]:
         """Confirmed trades across all markets."""
-        response = await self._get("/trades", params=_pagination(page, limit), requires_auth=False)
+        response = await self._get("/trades", params=page_params(page, limit), requires_auth=False)
         if not isinstance(response, list):
             raise ValueError(f"Invalid response from get_trades: {response}")
 
@@ -104,7 +106,7 @@ class MarketDataClient(AuthenticatedClient):
     ) -> list[Trade]:
         """Confirmed trades for `asset_id`."""
         response = await self._get(
-            f"/trades/{asset_id}", params=_pagination(page, limit), requires_auth=False
+            f"/trades/{asset_id}", params=page_params(page, limit), requires_auth=False
         )
         if not isinstance(response, list):
             raise ValueError(f"Invalid response from get_trades_for_asset: {response}")
@@ -328,9 +330,9 @@ class MarketDataClient(AuthenticatedClient):
         async for diff in self._stream_ws(path, lambda d: OrderBookDiff(**d), requires_auth=False):
             yield diff
 
-    async def stream_klines(self, asset_id: AssetIdentifier) -> AsyncIterator[KlineUpdate]:
+    async def stream_klines(self, asset_id: AssetIdentifier) -> AsyncIterator[Timebar]:
         """Candlestick (kline) updates for `asset_id`."""
         async for kline in self._stream_ws(
-            f"/klines/diff/{asset_id}", parse_kline_update, requires_auth=False
+            f"/klines/diff/{asset_id}", parse_timebars, requires_auth=False
         ):
             yield kline

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/client/oms/oms_admin.py

@@ -8,6 +8,7 @@ class OmsAdminClient(AuthenticatedClient):
         solvency_verifier: str,
         auto_reduce_enabled: bool,
         interest_reservation_enabled: bool | None = None,
+        liquidation_monitor_enabled: bool | None = None,
     ):
         config = {
             "solvency_verifier": solvency_verifier,
@@ -15,6 +16,8 @@ class OmsAdminClient(AuthenticatedClient):
         }
         if interest_reservation_enabled is not None:
             config["interest_reservation_enabled"] = interest_reservation_enabled
+        if liquidation_monitor_enabled is not None:
+            config["liquidation_monitor_enabled"] = liquidation_monitor_enabled
 
         await self._post(
             "admin/settings/modify",

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/client/orderbook.py

@@ -770,6 +770,10 @@ class OrderBookClient(AuthenticatedClient):
                 content["order"].get("base_asset"), str
             ):
                 asset_id = content["order"]["base_asset"]
+            elif isinstance(content.get("request"), dict) and isinstance(
+                content["request"].get("base_asset"), str
+            ):
+                asset_id = content["request"]["base_asset"]
         if asset_id is None:
             raise ValueError("WS control payload missing asset_id")
         key = f"{response_variant}:{asset_id}:{expected_order_id}"
@@ -1123,7 +1127,10 @@ class OrderBookClient(AuthenticatedClient):
         return parsed_data
 
     async def set_mds_export(self, enabled: bool, user: UserType | None = None) -> dict[str, Any]:
-        """Set whether the user's trade history is exported to the market-data service."""
+        """Set whether the user's trade history is exported to the market-data service.
+
+        Export is on by default; pass ``enabled=False`` to opt out.
+        """
         public_key = self._validate_user_public_key(user=user)
         return await self._put(
             f"/account/{public_key}/mds-export",

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/model/klines.py

@@ -1,17 +1,50 @@
 import datetime
 from decimal import Decimal
+from enum import Enum
 from typing import Any
 
 from pydantic import BaseModel
 
 
-class KlineUpdate(BaseModel):
-    """Represents a single K-line (candlestick) update from the WebSocket stream."""
+class Interval(str, Enum):
+    """Kline bucket width, mirroring `orderbook_messages::interval::Interval`.
+
+    Values are the canonical spellings the server round-trips; it also accepts the
+    suffixed forms (`5m`, `4h`, `1d`) on the wire. Only `1M` is case-sensitive: it is a
+    month, while `1m` is a minute.
+    """
+
+    SEC_1 = "1S"
+    SEC_5 = "5S"
+    SEC_15 = "15S"
+    SEC_30 = "30S"
+    MIN_1 = "1"
+    MIN_3 = "3"
+    MIN_5 = "5"
+    MIN_15 = "15"
+    MIN_30 = "30"
+    HOUR_1 = "60"
+    HOUR_2 = "120"
+    HOUR_4 = "240"
+    HOUR_6 = "360"
+    HOUR_8 = "480"
+    HOUR_12 = "720"
+    DAY_1 = "1D"
+    DAY_3 = "3D"
+    WEEK_1 = "1W"
+    MONTH_1 = "1M"
+
+    def __str__(self) -> str:
+        return self.value
+
+
+class Timebar(BaseModel):
+    """One candlestick, mirroring `orderbook_messages::market_data::Timebar`."""
 
     open: Decimal
-    high: Decimal
-    low: Decimal
     close: Decimal
+    low: Decimal
+    high: Decimal
     volume: Decimal
 
     open_timestamp_ns: int
@@ -35,7 +68,7 @@ class KlineUpdate(BaseModel):
 class KlinesPage(BaseModel):
     """One page of klines plus pagination metadata (the `Page<Timebar>` envelope)."""
 
-    items: list[KlineUpdate]
+    items: list[Timebar]
     page: int
     limit: int
     total_pages: int
@@ -44,11 +77,11 @@ class KlinesPage(BaseModel):
     next_page: int | None = None
 
 
-def parse_kline_update(data: list[dict[str, Any]]) -> list[KlineUpdate]:
-    """Parses  a list of kline dictionaries into a List of KlineUpdate object."""
+def parse_timebars(data: list[dict[str, Any]]) -> list[Timebar]:
+    """Parses a list of kline dictionaries into Timebar objects."""
     try:
         return [
-            KlineUpdate(
+            Timebar(
                 open=Decimal(item["open"]),
                 high=Decimal(item["high"]),
                 low=Decimal(item["low"]),
@@ -60,14 +93,14 @@ def parse_kline_update(data: list[dict[str, Any]]) -> list[KlineUpdate]:
             for item in data
         ]
     except (KeyError, ValueError, TypeError) as e:
-        print(f"Error parsing KlineUpdate: {e}. Data: {data}")
-        raise ValueError(f"Invalid KlineUpdate data received: {data}") from e
+        print(f"Error parsing Timebar: {e}. Data: {data}")
+        raise ValueError(f"Invalid Timebar data received: {data}") from e
 
 
 def parse_klines_page(data: dict[str, Any] | list[dict[str, Any]]) -> KlinesPage:
     """Parse the `/klines` page envelope, tolerating a bare list from older servers."""
     if isinstance(data, list):
-        items = parse_kline_update(data)
+        items = parse_timebars(data)
         count = len(items)
         return KlinesPage(
             items=items,
@@ -79,7 +112,7 @@ def parse_klines_page(data: dict[str, Any] | list[dict[str, Any]]) -> KlinesPage
         )
 
     return KlinesPage(
-        items=parse_kline_update(data.get("items", [])),
+        items=parse_timebars(data.get("items", [])),
         page=int(data.get("page", 0)),
         limit=int(data.get("limit", 0)),
         total_pages=int(data.get("total_pages", 0)),

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/model/replace_order.py

@@ -1,8 +1,9 @@
 from typing import Any
 
-from pydantic import BaseModel, model_serializer
+from pydantic import BaseModel, Field, model_serializer
 
 from tplus.model.asset_identifier import AssetIdentifier
+from tplus.model.multisig import AdditionalSigner
 from tplus.model.order_id import UserOrderId
 from tplus.model.order_trigger import TriggerAbove, TriggerBelow
 
@@ -44,6 +45,7 @@ class ReplaceOrderRequestPayload(BaseModel):
     user_id: str  # Added user_id field
     signature: list[int]  # Signature of the 'request' (ReplaceOrderDetails)
     post_sign_timestamp: int
+    additional_signers: list[AdditionalSigner] = Field(default_factory=list)
 
     @model_serializer
     def serialize_model(self) -> dict[str, Any]:
@@ -55,4 +57,5 @@ class ReplaceOrderRequestPayload(BaseModel):
             "signer": self.user_id,  # Added user_id to serialization
             "signature": self.signature,
             "post_sign_timestamp": self.post_sign_timestamp,
+            "additional_signers": self.additional_signers,
         }

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/utils/replace_order.py

@@ -56,15 +56,11 @@ def create_replace_order_ob_request_payload(
         sign_payload_json.replace(" ", "").replace("\r", "").replace("\n", "")
     )
     signature, additional_signers = signer.signing_parts(compact_sign_payload_json)
-    if additional_signers:
-        raise ValueError(
-            "Order replacement does not support additional signers until its wire format "
-            "can identify replacement co-signatures."
-        )
 
     return ReplaceOrderRequestPayload(
         request=replace_details,
         user_id=signer.public_key,
         signature=signature,
         post_sign_timestamp=time.time_ns(),
+        additional_signers=additional_signers,
     )

{tpluspy-0.3.0 → tpluspy-0.3.2}/tplus/utils/signing.py

@@ -22,12 +22,9 @@ def create_cancel_order_ob_request_payload(
     compact_sign_payload_json = (
         sign_payload_json.replace(" ", "").replace("\r", "").replace("\n", "")
     )
-    signature, additional_signers = signer.signing_parts(compact_sign_payload_json)
-    if additional_signers:
-        raise ValueError(
-            "Order cancellation does not support additional signers until its wire format "
-            "can identify cancellation co-signatures."
-        )
+    # Delegated cancels are authorized by the authenticated OMS session and account
+    # ownership. They do not reach the clearing engine, so no delegated signature is sent.
+    signature, _ = signer.signing_parts(compact_sign_payload_json)
 
     return CancelOrderRequest(
         cancel=cancel, signature=signature, post_sign_timestamp=time.time_ns()

{tpluspy-0.3.0 → tpluspy-0.3.2}/tpluspy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpluspy
-Version: 0.3.0
+Version: 0.3.2
 Summary: tpluspy: Client utilities for interacting with tplus
 Home-page: https://github.com/tpluslabs/tpluspy
 Author: TPlus Labs
@@ -264,7 +264,7 @@ async for trade in client.stream_finalized_trades():
 # Other available streams:
 # client.stream_orders() -> OrderEvent
 # client.stream_all_trades() -> TradeEvent
-# client.stream_klines(asset_id) -> KlineUpdate
+# client.stream_klines(asset_id) -> Timebar
 ```
 
 See `examples/websocket_usage.py` for a runnable demonstration using `asyncio.gather` to run multiple streams concurrently.