avantis-trader-sdk 0.8.12__py3-none-any.whl → 0.8.14__py3-none-any.whl

avantis_trader_sdk/types.py

@@ -1,6 +1,7 @@
 from pydantic import (
     BaseModel,
     Field,
+    AliasChoices,
     conint,
     field_validator,
     ValidationError,
@@ -334,14 +335,16 @@ class TradeResponse(BaseModel):
     trader: str
     pair_index: int = Field(..., alias="pairIndex")
     trade_index: int = Field(0, alias="index")
-    open_collateral: float = Field(None, alias="initialPosToken")
-    collateral_in_trade: float = Field(None, alias="positionSizeUSDC")
+    open_collateral: float = Field(
+        None, validation_alias=AliasChoices("collateral", "initialPosToken")
+    )
+    collateral_in_trade: Optional[float] = Field(None, alias="positionSizeUSDC")
     open_price: float = Field(0, alias="openPrice")
     is_long: bool = Field(..., alias="buy")
     leverage: float
     tp: float
     sl: float
-    timestamp: int
+    timestamp: int = Field(..., validation_alias=AliasChoices("timestamp", "openedAt"))
 
     @field_validator("trader")
     def validate_eth_address(cls, v):
@@ -351,45 +354,81 @@ class TradeResponse(BaseModel):
 
     @field_validator("open_price", "tp", "sl", "leverage", mode="before")
     def convert_to_float_10(cls, v):
-        return v / 10**10
+        if v is None:
+            return 0
+        return int(v) / 10**10
 
     @field_validator("open_collateral", "collateral_in_trade", mode="before")
     def convert_to_float_6(cls, v):
-        return v / 10**6
+        if v is None:
+            return None
+        return int(v) / 10**6
+
+    @model_validator(mode="after")
+    def set_collateral_in_trade(self):
+        if self.collateral_in_trade is None:
+            self.collateral_in_trade = self.open_collateral
+        return self
 
     class Config:
         populate_by_name = True
 
 
 class TradeInfo(BaseModel):
-    open_interest_usdc: float = Field(..., alias="openInterestUSDC")
-    tp_last_updated: float = Field(..., alias="tpLastUpdated")
-    sl_last_updated: float = Field(..., alias="slLastUpdated")
-    being_market_closed: bool = Field(..., alias="beingMarketClosed")
     loss_protection_percentage: float = Field(..., alias="lossProtectionPercentage")
 
-    @field_validator("open_interest_usdc", mode="before")
-    def convert_to_float_6(cls, v):
-        return v / 10**6
-
     class Config:
         populate_by_name = True
 
 
 class TradeExtendedResponse(BaseModel):
-    trade: TradeResponse
-    additional_info: TradeInfo
-    margin_fee: float
-    liquidation_price: float
-    is_zfp: bool
+    trade: Optional[TradeResponse] = None
+    additional_info: Optional[TradeInfo] = None
+    margin_fee: float = Field(
+        0, validation_alias=AliasChoices("margin_fee", "rolloverFee")
+    )
+    liquidation_price: float = Field(
+        ..., validation_alias=AliasChoices("liquidation_price", "liquidationPrice")
+    )
+    is_zfp: bool = Field(False, validation_alias=AliasChoices("is_zfp", "isPnl"))
 
     @field_validator("margin_fee", mode="before")
     def convert_to_float_6(cls, v):
-        return v / 10**6
+        if v is None:
+            return 0
+        return int(v) / 10**6
 
     @field_validator("liquidation_price", mode="before")
     def convert_to_float_10(cls, v):
-        return v / 10**10
+        return int(v) / 10**10
+
+    @model_validator(mode="before")
+    def build_from_flat(cls, values):
+        if "trade" not in values and "trader" in values:
+            trade_fields = [
+                "trader",
+                "pairIndex",
+                "index",
+                "initialPosToken",
+                "collateral",
+                "positionSizeUSDC",
+                "openPrice",
+                "buy",
+                "leverage",
+                "tp",
+                "sl",
+                "timestamp",
+                "openedAt",
+            ]
+            trade_data = {k: values.get(k) for k in trade_fields if k in values}
+            values["trade"] = trade_data
+
+            info_data = {
+                "lossProtectionPercentage": values.get("lossProtectionPercentage", 0),
+            }
+            values["additional_info"] = info_data
+
+        return values
 
     class Config:
         populate_by_name = True
@@ -399,7 +438,9 @@ class PendingLimitOrderResponse(BaseModel):
     trader: str
     pair_index: int = Field(..., alias="pairIndex")
     trade_index: int = Field(0, alias="index")
-    open_collateral: float = Field(..., alias="positionSize")
+    open_collateral: float = Field(
+        ..., validation_alias=AliasChoices("collateral", "positionSize")
+    )
     buy: bool
     leverage: int
     tp: float
@@ -407,6 +448,7 @@ class PendingLimitOrderResponse(BaseModel):
     price: float
     slippage_percentage: float = Field(..., alias="slippageP")
     block: int
+    execution_fee: float = Field(0, alias="executionFee")
 
     @field_validator("trader")
     def validate_eth_address(cls, v):
@@ -418,22 +460,26 @@ class PendingLimitOrderResponse(BaseModel):
         "price", "tp", "sl", "leverage", "slippage_percentage", mode="before"
     )
     def convert_to_float_10(cls, v):
-        return v / 10**10
+        return int(v) / 10**10
 
-    @field_validator("open_collateral", mode="before")
+    @field_validator("open_collateral", "execution_fee", mode="before")
     def convert_to_float_6(cls, v):
-        return v / 10**6
+        if v is None:
+            return 0
+        return int(v) / 10**6
 
     class Config:
         populate_by_name = True
 
 
 class PendingLimitOrderExtendedResponse(PendingLimitOrderResponse):
-    liquidation_price: float
+    liquidation_price: float = Field(
+        ..., validation_alias=AliasChoices("liquidation_price", "liquidationPrice")
+    )
 
     @field_validator("liquidation_price", mode="before")
     def convert_liq_to_float_10(cls, v):
-        return v / 10**10
+        return int(v) / 10**10
 
 
 class MarginUpdateType(Enum):
@@ -441,6 +487,78 @@ class MarginUpdateType(Enum):
     WITHDRAW = 1
 
 
+class PriceSourcing(Enum):
+    """Price sourcing options for contract calls."""
+
+    HERMES = 0  # Pyth Hermes (legacy)
+    PRO = 1  # Pyth Pro / Lazer
+
+
+class LazerPriceFeed(BaseModel):
+    """Single price feed from Pyth Lazer SSE stream."""
+
+    price_feed_id: int = Field(..., alias="priceFeedId")
+    price: str
+    best_bid_price: str = Field(..., alias="bestBidPrice")
+    best_ask_price: str = Field(..., alias="bestAskPrice")
+    publisher_count: int = Field(..., alias="publisherCount")
+    exponent: int
+    confidence: int
+
+    @property
+    def converted_price(self) -> float:
+        return int(self.price) / 10 ** -self.exponent
+
+    class Config:
+        populate_by_name = True
+
+
+class LazerPriceFeedResponse(BaseModel):
+    """Response from Pyth Lazer SSE stream."""
+
+    timestamp_us: str = Field(..., alias="timestampUs")
+    price_feeds: List[LazerPriceFeed] = Field(..., alias="priceFeeds")
+
+    @property
+    def timestamp_ms(self) -> int:
+        return int(self.timestamp_us) // 1000
+
+    class Config:
+        populate_by_name = True
+
+
+class FeedV3CorePriceData(BaseModel):
+    """Core price data from feed-v3 API (Pyth Hermes)."""
+
+    price_update_data: str = Field(..., alias="priceUpdateData")
+    price: float
+    publish_timestamp_ms: int = Field(..., alias="publishTimestampMs")
+
+    class Config:
+        populate_by_name = True
+
+
+class FeedV3ProPriceData(BaseModel):
+    """Pro price data from feed-v3 API (Pyth Pro/Lazer)."""
+
+    price_update_data: str = Field(..., alias="priceUpdateData")
+    price: float
+    publish_timestamp_ms: int = Field(..., alias="publishTimestampMs")
+
+    class Config:
+        populate_by_name = True
+
+
+class FeedV3PriceResponse(BaseModel):
+    """Response from feed-v3 API containing both core and pro price data."""
+
+    core: FeedV3CorePriceData
+    pro: FeedV3ProPriceData
+
+    class Config:
+        populate_by_name = True
+
+
 class LossProtectionInfo(BaseModel):
     percentage: float
     amount: float

{avantis_trader_sdk-0.8.12.dist-info → avantis_trader_sdk-0.8.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avantis_trader_sdk
-Version: 0.8.12
+Version: 0.8.14
 Summary: SDK for interacting with Avantis trading contracts.
 Home-page: https://avantisfi.com/
 Author: Avantis Labs

{avantis_trader_sdk-0.8.12.dist-info → avantis_trader_sdk-0.8.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
-avantis_trader_sdk/__init__.py,sha256=L4axdHNq1qOLCsIA5cLkhAi7E-uzMUUTpx3Xg4L6ZvQ,135
+avantis_trader_sdk/__init__.py,sha256=piAMiNqSagDn1nQUlJ2y5v_egZfg11Aui8ly04gjbKQ,168
 avantis_trader_sdk/client.py,sha256=M01uwXIdxJjmPEcFr1MsDuoxU9YGddxcGMTPucOOssA,10903
-avantis_trader_sdk/config.py,sha256=anwq2ynMurYna24ABbhtAyfpDg4NtPI2lubFuzHkJ9A,653
-avantis_trader_sdk/types.py,sha256=dvKj2xRYLq2Wq0ugJlDewDNiM-KaKhTbDe6b6hZ-sK8,13834
+avantis_trader_sdk/config.py,sha256=sE9y9R1ql1UwpFSs-qTbNfvO5iffRRUdYtx_JVOaWyA,838
+avantis_trader_sdk/types.py,sha256=spp3n7UedgVM-w9JyCzQuqi8JiJmSjm24j4cxg0-gx8,17274
 avantis_trader_sdk/utils.py,sha256=gTYgNVVd5rLZEUf2eyJftjKYxn55wRm09xAXIF_xjXM,2831
 avantis_trader_sdk/abis/AggregatorV3Interface.json,sha256=qUeDGZ55Akgu8zOv_Wzf21sTREEyZXF47K_TdPcliBM,26244
 avantis_trader_sdk/abis/Sanctions.json,sha256=Fsn67jEGW4GdS15icrtxN_sur4e8-06SoijL7K79vAE,3857
@@ -128,7 +128,7 @@ avantis_trader_sdk/abis/Timelock.t.sol/Timelock.json,sha256=N58EBp-LRYuIUvs5s0ze
 avantis_trader_sdk/abis/TimelockBase.t.sol/TimelockBase.json,sha256=Bx-U5If_X5Dd49-GBDQTst3gDp8hG1YptPxoDyw3auw,1111293
 avantis_trader_sdk/abis/TimelockController.sol/TimelockController.json,sha256=k6uk3eErrOFWCIaSBno0aqziOi744NEdxnK8vG-ohrA,333379
 avantis_trader_sdk/abis/TradeBase.t.sol/TradeBase.json,sha256=w3sGtHzPkd45TLRhRxQzlUPmwYfjay7_4rU6CyuFu9M,1328584
-avantis_trader_sdk/abis/Trading.sol/Trading.json,sha256=Gkqzgl2aZUABJDGvMzqoRLApwResZAt7mzusO6SK3iI,228389
+avantis_trader_sdk/abis/Trading.sol/Trading.json,sha256=IM8Uv4SSXq23L8W-eJSzPtmz_h10WaRWao5ks0uiOLo,41789
 avantis_trader_sdk/abis/TradingCallbacks.sol/TradingCallbacks.json,sha256=m_tO-wHtc5hXMky0wbLj6lqFt12SgtjlBQZQnmShECU,199077
 avantis_trader_sdk/abis/TradingStorage.sol/TradingStorage.json,sha256=ImaFCa_a4htBOw99ITGzfuWlUeN3CvIROv0f4KH-hqw,313012
 avantis_trader_sdk/abis/Tranche.sol/Tranche.json,sha256=AZX5KxzyXI6ao93UrZsqQE9FpNZAArOqReJX0OzoT2E,392082
@@ -195,24 +195,24 @@ avantis_trader_sdk/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 avantis_trader_sdk/crypto/spki.py,sha256=CNy7A8TTwBHiNSzIj7uqiHKAeLcn1Q9MbszW_2mdXgI,3080
 avantis_trader_sdk/feed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 avantis_trader_sdk/feed/feedIds.json,sha256=T77nww3eRiQt8rqZBDpdxA49USGyfI0dQBPnzo-H1dE,6697
-avantis_trader_sdk/feed/feed_client.py,sha256=SsCX5CJfrXjN5rl8hMqED-kebHnM3AMRDkdCKeMV5DI,9283
+avantis_trader_sdk/feed/feed_client.py,sha256=sMlf6XaMoAiJ4DSxim-Bd81kPlM2laT0QmLbMfR6P9Q,12989
 avantis_trader_sdk/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 avantis_trader_sdk/rpc/asset_parameters.py,sha256=ESx4eg0K3W9EigsEmN0a7Pym2hL4iJgMWmzhHmmWXyY,19323
 avantis_trader_sdk/rpc/blended.py,sha256=tRWfO7XreY_YahL9ACpss7ylWz5fdk6G3bv4QpLpGms,2441
 avantis_trader_sdk/rpc/category_parameters.py,sha256=ofsKct23E8DThCKqP627ol-_YPIdN5HAn09eLqyf6WM,7965
 avantis_trader_sdk/rpc/fee_parameters.py,sha256=0UCf4FZQp26777o8aA75oOO-b3xFK88c-_glbqQ2-8M,9132
-avantis_trader_sdk/rpc/pairs_cache.py,sha256=tSDfPaBcqtVHj0yyUEHXfD5OAgFgq6_JneNjUxIsbzg,5580
+avantis_trader_sdk/rpc/pairs_cache.py,sha256=wtxkvaemVbJclCSiOcyelbBcQzwJbIOP0JF0rfyE56M,7234
 avantis_trader_sdk/rpc/rpc_helpers.py,sha256=Sywz6BIj4y2gkudkOhPEND2r2ILvtfq502A_pSEUDv8,284
 avantis_trader_sdk/rpc/snapshot.py,sha256=hfLRfCbOqnqcuZncaiTmm0BJ2pgLFOEHgsgQ-92Xlcs,5352
-avantis_trader_sdk/rpc/trade.py,sha256=D3OQGVRK0Bib2oc3ouyMU-jmEywlG3UqqwdDZm8k870,23565
-avantis_trader_sdk/rpc/trading_parameters.py,sha256=KMLR0RTU82Q9UzSmjnBhUrVn8AaRvG09MovPQs-yXaA,4588
+avantis_trader_sdk/rpc/trade.py,sha256=QZCc0wU_7tPzC_Bo32JlSxcDZZF7NK-udqNG54myizM,31940
+avantis_trader_sdk/rpc/trading_parameters.py,sha256=_tpzgyMO_I-XebVWtiWSlmedtbr66elUxCRgegd1aao,4626
 avantis_trader_sdk/signers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 avantis_trader_sdk/signers/base.py,sha256=QaOu0CxFq60oR4LegCp1XwONMQx8ZShXyiLZvfcbCPM,260
 avantis_trader_sdk/signers/kms_signer.py,sha256=lxK3f9KQsdCDAvOE1SHleKjI8zD_3PTvywDjDVQGDKg,4448
 avantis_trader_sdk/signers/local_signer.py,sha256=kUx5vExiBfvFGmoMCFR6b7_4cXx2mvYOJNqZQDIEcG8,505
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_client.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avantis_trader_sdk-0.8.12.dist-info/METADATA,sha256=zk7GPC15Wt1bIF1G4fQdnPkljUvrmJFc9fCiNSxMJuU,5032
-avantis_trader_sdk-0.8.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-avantis_trader_sdk-0.8.12.dist-info/top_level.txt,sha256=XffaQJ68SGT1KUz2HHXSGSEsmNy8-AGjgtO127xhzQA,25
-avantis_trader_sdk-0.8.12.dist-info/RECORD,,
+avantis_trader_sdk-0.8.14.dist-info/METADATA,sha256=l4vQYzfNXuKcECXL-Y1xHmDdrwvm5s_eok3AZmAJOwo,5032
+avantis_trader_sdk-0.8.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+avantis_trader_sdk-0.8.14.dist-info/top_level.txt,sha256=XffaQJ68SGT1KUz2HHXSGSEsmNy8-AGjgtO127xhzQA,25
+avantis_trader_sdk-0.8.14.dist-info/RECORD,,