architect-py 3.2.1__py3-none-any.whl → 5.0.0__py3-none-any.whl

architect_py/{grpc_client → grpc/models}/Marketdata/SubscribeL1BookSnapshotsRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/SubscribeL1BookSnapshotsRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.L1BookSnapshot import L1BookSnapshot
+from architect_py.grpc.models.Marketdata.L1BookSnapshot import L1BookSnapshot
 
 from typing import Annotated, List, Optional
 
@@ -19,19 +19,22 @@ class SubscribeL1BookSnapshotsRequest(Struct, omit_defaults=True):
     """
     If None, subscribe from all symbols on the feed
     """
+    venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,
         symbols: Optional[List[str]] = None,
+        venue: Optional[str] = None,
     ):
         return cls(
             symbols,
+            venue,
         )
 
     def __str__(self) -> str:
-        return f"SubscribeL1BookSnapshotsRequest(symbols={self.symbols})"
+        return f"SubscribeL1BookSnapshotsRequest(symbols={self.symbols},venue={self.venue})"
 
     @staticmethod
     def get_response_type():

architect_py/{grpc_client → grpc/models}/Marketdata/SubscribeL2BookUpdatesRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/SubscribeL2BookUpdatesRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.L2BookUpdate import (
+from architect_py.grpc.models.Marketdata.L2BookUpdate import (
     L2BookUpdate,
     Snapshot,
     Diff,
@@ -17,7 +17,7 @@ class SubscribeL2BookUpdatesRequest(Struct, omit_defaults=True):
     symbol: str
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/SubscribeLiquidationsRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/SubscribeLiquidationsRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.Liquidation import Liquidation
+from architect_py.grpc.models.Marketdata.Liquidation import Liquidation
 
 from typing import List, Optional
 
@@ -12,7 +12,7 @@ from msgspec import Struct
 class SubscribeLiquidationsRequest(Struct, omit_defaults=True):
     symbols: Optional[List[str]] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/SubscribeManyCandlesRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/SubscribeManyCandlesRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.Candle import Candle
+from architect_py.grpc.models.Marketdata.Candle import Candle
 
 from typing import Annotated, List, Optional
 
@@ -24,7 +24,7 @@ class SubscribeManyCandlesRequest(Struct, omit_defaults=True):
     """
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/SubscribeTickersRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/SubscribeTickersRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.TickerUpdate import (
+from architect_py.grpc.models.Marketdata.TickerUpdate import (
     TickerUpdate,
     Snapshot,
     Diff,
@@ -28,7 +28,7 @@ class SubscribeTickersRequest(Struct, omit_defaults=True):
     If None, subscribe from all symbols on the feed
     """
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/SubscribeTradesRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/SubscribeTradesRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.Trade import Trade
+from architect_py.grpc.models.Marketdata.Trade import Trade
 
 from typing import Annotated, Optional
 
@@ -21,7 +21,7 @@ class SubscribeTradesRequest(Struct, omit_defaults=True):
     """
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/Ticker.py

@@ -4,7 +4,7 @@
 from __future__ import annotations
 from datetime import datetime, timezone
 
-from datetime import datetime
+from datetime import date, datetime
 from decimal import Decimal
 from typing import Annotated, Optional
 
@@ -37,6 +37,7 @@ class Ticker(Struct, omit_defaults=True):
     p: Optional[Annotated[Optional[Decimal], Meta(title="last_price")]] = None
     price_to_earnings: Optional[Decimal] = None
     q: Optional[Annotated[Optional[Decimal], Meta(title="last_size")]] = None
+    sd: Optional[Annotated[Optional[date], Meta(title="last_settlement_date")]] = None
     shares_outstanding_weighted_adj: Optional[Decimal] = None
     sp: Optional[Annotated[Optional[Decimal], Meta(title="last_settlement_price")]] = (
         None
@@ -48,7 +49,7 @@ class Ticker(Struct, omit_defaults=True):
     xo: Optional[Annotated[Optional[Decimal], Meta(title="session_open")]] = None
     xv: Optional[Annotated[Optional[Decimal], Meta(title="session_volume")]] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,
@@ -75,6 +76,7 @@ class Ticker(Struct, omit_defaults=True):
         last_price: Optional[Decimal] = None,
         price_to_earnings: Optional[Decimal] = None,
         last_size: Optional[Decimal] = None,
+        last_settlement_date: Optional[date] = None,
         shares_outstanding_weighted_adj: Optional[Decimal] = None,
         last_settlement_price: Optional[Decimal] = None,
         volume_24h: Optional[Decimal] = None,
@@ -108,6 +110,7 @@ class Ticker(Struct, omit_defaults=True):
             last_price,
             price_to_earnings,
             last_size,
+            last_settlement_date,
             shares_outstanding_weighted_adj,
             last_settlement_price,
             volume_24h,
@@ -119,7 +122,7 @@ class Ticker(Struct, omit_defaults=True):
         )
 
     def __str__(self) -> str:
-        return f"Ticker(symbol={self.s},timestamp_ns={self.tn},timestamp={self.ts},venue={self.ve},ask_price={self.ap},ask_size={self.as_},bid_price={self.bp},bid_size={self.bs},dividend={self.dividend},dividend_yield={self.dividend_yield},eps_adj={self.eps_adj},funding_rate={self.fr},next_funding_time={self.ft},high_24h={self.h},index_price={self.ip},low_24h={self.l},market_cap={self.market_cap},mark_price={self.mp},open_24h={self.o},open_interest={self.oi},last_price={self.p},price_to_earnings={self.price_to_earnings},last_size={self.q},shares_outstanding_weighted_adj={self.shares_outstanding_weighted_adj},last_settlement_price={self.sp},volume_24h={self.v},volume_30d={self.vm},session_high={self.xh},session_low={self.xl},session_open={self.xo},session_volume={self.xv})"
+        return f"Ticker(symbol={self.s},timestamp_ns={self.tn},timestamp={self.ts},venue={self.ve},ask_price={self.ap},ask_size={self.as_},bid_price={self.bp},bid_size={self.bs},dividend={self.dividend},dividend_yield={self.dividend_yield},eps_adj={self.eps_adj},funding_rate={self.fr},next_funding_time={self.ft},high_24h={self.h},index_price={self.ip},low_24h={self.l},market_cap={self.market_cap},mark_price={self.mp},open_24h={self.o},open_interest={self.oi},last_price={self.p},price_to_earnings={self.price_to_earnings},last_size={self.q},last_settlement_date={self.sd},shares_outstanding_weighted_adj={self.shares_outstanding_weighted_adj},last_settlement_price={self.sp},volume_24h={self.v},volume_30d={self.vm},session_high={self.xh},session_low={self.xl},session_open={self.xo},session_volume={self.xv})"
 
     @property
     def symbol(self) -> str:
@@ -273,6 +276,14 @@ class Ticker(Struct, omit_defaults=True):
     def last_size(self, value: Optional[Decimal]) -> None:
         self.q = value
 
+    @property
+    def last_settlement_date(self) -> Optional[date]:
+        return self.sd
+
+    @last_settlement_date.setter
+    def last_settlement_date(self, value: Optional[date]) -> None:
+        self.sd = value
+
     @property
     def last_settlement_price(self) -> Optional[Decimal]:
         return self.sp

architect_py/{grpc_client → grpc/models}/Marketdata/TickerRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/TickerRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.Ticker import Ticker
+from architect_py.grpc.models.Marketdata.Ticker import Ticker
 
 from typing import Optional
 
@@ -13,7 +13,7 @@ class TickerRequest(Struct, omit_defaults=True):
     symbol: str
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/TickersRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/TickersRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Marketdata.TickersResponse import TickersResponse
+from architect_py.grpc.models.Marketdata.TickersResponse import TickersResponse
 
 from typing import List, Optional
 
@@ -18,7 +18,7 @@ class TickersRequest(Struct, omit_defaults=True):
     symbols: Optional[List[str]] = None
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/TickersResponse.py

@@ -13,7 +13,7 @@ from .Ticker import Ticker
 class TickersResponse(Struct, omit_defaults=True):
     tickers: List[Ticker]
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Marketdata/Trade.py

@@ -2,7 +2,7 @@
 #   filename:  Marketdata/Trade.json
 
 from __future__ import annotations
-from architect_py.scalars import OrderDir
+from architect_py.common_types import OrderDir
 from datetime import datetime, timezone
 
 from decimal import Decimal
@@ -21,7 +21,7 @@ class Trade(Struct, omit_defaults=True):
     ts: Annotated[int, Meta(title="timestamp")]
     d: Optional[Annotated[Optional[OrderDir], Meta(title="direction")]] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/grpc/models/Marketdata/__init__.py

@@ -0,0 +1,2 @@
+# generated by datamodel-codegen:
+#   filename:  schemas

architect_py/grpc/models/Oms/Cancel.py

@@ -0,0 +1,90 @@
+# generated by datamodel-codegen:
+#   filename:  Oms/Cancel.json
+
+from __future__ import annotations
+
+from typing import Annotated, Optional
+
+from msgspec import Meta, Struct
+
+from .. import definitions
+
+
+class Cancel(Struct, omit_defaults=True):
+    id: Annotated[definitions.OrderId, Meta(title="order_id")]
+    o: Annotated[definitions.CancelStatus, Meta(title="status")]
+    tn: Annotated[int, Meta(ge=0, title="recv_time_ns")]
+    ts: Annotated[int, Meta(title="recv_time")]
+    xid: Annotated[str, Meta(title="cancel_id")]
+    r: Optional[Annotated[Optional[str], Meta(title="reject_reason")]] = None
+
+    # Constructor that takes all field titles as arguments for convenience
+    @classmethod
+    def new(
+        cls,
+        order_id: definitions.OrderId,
+        status: definitions.CancelStatus,
+        recv_time_ns: int,
+        recv_time: int,
+        cancel_id: str,
+        reject_reason: Optional[str] = None,
+    ):
+        return cls(
+            order_id,
+            status,
+            recv_time_ns,
+            recv_time,
+            cancel_id,
+            reject_reason,
+        )
+
+    def __str__(self) -> str:
+        return f"Cancel(order_id={self.id},status={self.o},recv_time_ns={self.tn},recv_time={self.ts},cancel_id={self.xid},reject_reason={self.r})"
+
+    @property
+    def order_id(self) -> definitions.OrderId:
+        return self.id
+
+    @order_id.setter
+    def order_id(self, value: definitions.OrderId) -> None:
+        self.id = value
+
+    @property
+    def status(self) -> definitions.CancelStatus:
+        return self.o
+
+    @status.setter
+    def status(self, value: definitions.CancelStatus) -> None:
+        self.o = value
+
+    @property
+    def recv_time_ns(self) -> int:
+        return self.tn
+
+    @recv_time_ns.setter
+    def recv_time_ns(self, value: int) -> None:
+        self.tn = value
+
+    @property
+    def recv_time(self) -> int:
+        return self.ts
+
+    @recv_time.setter
+    def recv_time(self, value: int) -> None:
+        self.ts = value
+
+    @property
+    def cancel_id(self) -> str:
+        return self.xid
+
+    @cancel_id.setter
+    def cancel_id(self, value: str) -> None:
+        self.xid = value
+
+    @property
+    def reject_reason(self) -> Optional[str]:
+        return self.r
+
+    @reject_reason.setter
+    def reject_reason(self, value: Optional[str]) -> None:
+        self.r = value

architect_py/{grpc_client → grpc/models}/Oms/CancelAllOrdersRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Oms/CancelAllOrdersRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Oms.CancelAllOrdersResponse import CancelAllOrdersResponse
+from architect_py.grpc.models.Oms.CancelAllOrdersResponse import CancelAllOrdersResponse
 
 from typing import Optional
 
@@ -17,7 +17,7 @@ class CancelAllOrdersRequest(Struct, omit_defaults=True):
     execution_venue: Optional[str] = None
     trader: Optional[definitions.TraderIdOrEmail] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/CancelAllOrdersResponse.py

@@ -9,7 +9,7 @@ from msgspec import Struct
 class CancelAllOrdersResponse(Struct, omit_defaults=True):
     pass
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/CancelOrderRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Oms/CancelOrderRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Oms.Cancel import Cancel
+from architect_py.grpc.models.Oms.Cancel import Cancel
 
 from typing import Annotated, Optional
 
@@ -26,7 +26,7 @@ class CancelOrderRequest(Struct, omit_defaults=True):
     If not specified, one will be generated for you; note, in that case, you won't know for sure if the specific request went through.
     """
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/OpenOrdersRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Oms/OpenOrdersRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Oms.OpenOrdersResponse import OpenOrdersResponse
+from architect_py.grpc.models.Oms.OpenOrdersResponse import OpenOrdersResponse
 
 from typing import List, Optional
 
@@ -19,7 +19,7 @@ class OpenOrdersRequest(Struct, omit_defaults=True):
     trader: Optional[definitions.TraderIdOrEmail] = None
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/OpenOrdersResponse.py

@@ -13,7 +13,7 @@ from .Order import Order
 class OpenOrdersResponse(Struct, omit_defaults=True):
     open_orders: List[Order]
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/Order.py

@@ -2,10 +2,9 @@
 #   filename:  Oms/Order.json
 
 from __future__ import annotations
-from architect_py.scalars import OrderDir
+from architect_py.common_types import OrderDir
 
 from decimal import Decimal
-from enum import Enum
 from typing import Annotated, Optional
 
 from msgspec import Meta, Struct
@@ -13,12 +12,6 @@ from msgspec import Meta, Struct
 from .. import definitions
 
 
-class OrderType(str, Enum):
-    LIMIT = "LIMIT"
-    STOP_LOSS_LIMIT = "STOP_LOSS_LIMIT"
-    TAKE_PROFIT_LIMIT = "TAKE_PROFIT_LIMIT"
-
-
 class Order(Struct, omit_defaults=True):
     a: Annotated[str, Meta(title="account")]
     d: Annotated[OrderDir, Meta(title="dir")]
@@ -34,7 +27,7 @@ class Order(Struct, omit_defaults=True):
     ve: Annotated[str, Meta(title="execution_venue")]
     xq: Annotated[Decimal, Meta(title="filled_quantity")]
     p: Annotated[Decimal, Meta(title="limit_price")]
-    k: Annotated[OrderType, Meta(title="order_type")]
+    k: Annotated[definitions.OrderType, Meta(title="order_type")]
     eid: Optional[Annotated[Optional[str], Meta(title="exchange_order_id")]] = None
     pid: Optional[Annotated[Optional[definitions.OrderId], Meta(title="parent_id")]] = (
         None
@@ -48,7 +41,7 @@ class Order(Struct, omit_defaults=True):
     po: Optional[Annotated[bool, Meta(title="post_only")]] = None
     tp: Optional[Annotated[Decimal, Meta(title="trigger_price")]] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,
@@ -66,7 +59,7 @@ class Order(Struct, omit_defaults=True):
         execution_venue: str,
         filled_quantity: Decimal,
         limit_price: Decimal,
-        order_type: OrderType,
+        order_type: definitions.OrderType,
         exchange_order_id: Optional[str] = None,
         parent_id: Optional[definitions.OrderId] = None,
         reject_reason: Optional[definitions.OrderRejectReason] = None,
@@ -210,11 +203,11 @@ class Order(Struct, omit_defaults=True):
         self.p = value
 
     @property
-    def order_type(self) -> OrderType:
+    def order_type(self) -> definitions.OrderType:
         return self.k
 
     @order_type.setter
-    def order_type(self, value: OrderType) -> None:
+    def order_type(self, value: definitions.OrderType) -> None:
         self.k = value
 
     @property

architect_py/{grpc_client → grpc/models}/Oms/PendingCancelsRequest.py

@@ -2,7 +2,7 @@
 #   filename:  Oms/PendingCancelsRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Oms.PendingCancelsResponse import PendingCancelsResponse
+from architect_py.grpc.models.Oms.PendingCancelsResponse import PendingCancelsResponse
 
 from typing import List, Optional
 
@@ -18,7 +18,7 @@ class PendingCancelsRequest(Struct, omit_defaults=True):
     trader: Optional[definitions.TraderIdOrEmail] = None
     venue: Optional[str] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/PendingCancelsResponse.py

@@ -13,7 +13,7 @@ from .Cancel import Cancel
 class PendingCancelsResponse(Struct, omit_defaults=True):
     pending_cancels: List[Cancel]
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,

architect_py/{grpc_client → grpc/models}/Oms/PlaceOrderRequest.py

@@ -2,11 +2,10 @@
 #   filename:  Oms/PlaceOrderRequest.json
 
 from __future__ import annotations
-from architect_py.grpc_client.Oms.Order import Order
-from architect_py.scalars import OrderDir
+from architect_py.grpc.models.Oms.Order import Order
+from architect_py.common_types import OrderDir
 
 from decimal import Decimal
-from enum import Enum
 from typing import Annotated, Optional
 
 from msgspec import Meta, Struct
@@ -14,19 +13,13 @@ from msgspec import Meta, Struct
 from .. import definitions
 
 
-class PlaceOrderRequestType(str, Enum):
-    LIMIT = "LIMIT"
-    STOP_LOSS_LIMIT = "STOP_LOSS_LIMIT"
-    TAKE_PROFIT_LIMIT = "TAKE_PROFIT_LIMIT"
-
-
 class PlaceOrderRequest(Struct, omit_defaults=True):
     d: Annotated[OrderDir, Meta(title="dir")]
     q: Annotated[Decimal, Meta(title="quantity")]
     s: Annotated[str, Meta(title="symbol")]
     tif: Annotated[definitions.TimeInForce, Meta(title="time_in_force")]
     p: Annotated[Decimal, Meta(title="limit_price")]
-    k: Annotated[PlaceOrderRequestType, Meta(title="place_order_request_type")]
+    k: Annotated[definitions.OrderType, Meta(title="order_type")]
     a: Optional[
         Annotated[Optional[definitions.AccountIdOrName], Meta(title="account")]
     ] = None
@@ -54,7 +47,7 @@ class PlaceOrderRequest(Struct, omit_defaults=True):
     po: Optional[Annotated[bool, Meta(title="post_only")]] = None
     tp: Optional[Annotated[Decimal, Meta(title="trigger_price")]] = None
 
-    # below is a constructor that takes all field titles as arguments for convenience
+    # Constructor that takes all field titles as arguments for convenience
     @classmethod
     def new(
         cls,
@@ -63,7 +56,7 @@ class PlaceOrderRequest(Struct, omit_defaults=True):
         symbol: str,
         time_in_force: definitions.TimeInForce,
         limit_price: Decimal,
-        place_order_request_type: PlaceOrderRequestType,
+        order_type: definitions.OrderType,
         account: Optional[definitions.AccountIdOrName] = None,
         id: Optional[definitions.OrderId] = None,
         parent_id: Optional[definitions.OrderId] = None,
@@ -79,7 +72,7 @@ class PlaceOrderRequest(Struct, omit_defaults=True):
             symbol,
             time_in_force,
             limit_price,
-            place_order_request_type,
+            order_type,
             account,
             id,
             parent_id,
@@ -91,7 +84,7 @@ class PlaceOrderRequest(Struct, omit_defaults=True):
         )
 
     def __str__(self) -> str:
-        return f"PlaceOrderRequest(dir={self.d},quantity={self.q},symbol={self.s},time_in_force={self.tif},limit_price={self.p},place_order_request_type={self.k},account={self.a},id={self.id},parent_id={self.pid},source={self.src},trader={self.u},execution_venue={self.x},post_only={self.po},trigger_price={self.tp})"
+        return f"PlaceOrderRequest(dir={self.d},quantity={self.q},symbol={self.s},time_in_force={self.tif},limit_price={self.p},order_type={self.k},account={self.a},id={self.id},parent_id={self.pid},source={self.src},trader={self.u},execution_venue={self.x},post_only={self.po},trigger_price={self.tp})"
 
     @property
     def dir(self) -> OrderDir:
@@ -134,11 +127,11 @@ class PlaceOrderRequest(Struct, omit_defaults=True):
         self.p = value
 
     @property
-    def place_order_request_type(self) -> PlaceOrderRequestType:
+    def order_type(self) -> definitions.OrderType:
         return self.k
 
-    @place_order_request_type.setter
-    def place_order_request_type(self, value: PlaceOrderRequestType) -> None:
+    @order_type.setter
+    def order_type(self, value: definitions.OrderType) -> None:
         self.k = value
 
     @property
@@ -217,27 +210,27 @@ class PlaceOrderRequest(Struct, omit_defaults=True):
         if self.k == "LIMIT":
             if not all(getattr(self, key) is not None for key in ["po"]):
                 raise ValueError(
-                    f"When field k (place_order_request_type) is of value LIMIT, class PlaceOrderRequest requires fields ['po']"
+                    f"When field k (order_type) is of value LIMIT, class PlaceOrderRequest requires fields ['po']"
                 )
             elif any(getattr(self, key) is not None for key in ["tp"]):
                 raise ValueError(
-                    f"When field k (place_order_request_type) is of value LIMIT, class PlaceOrderRequest should not have fields ['tp']"
+                    f"When field k (order_type) is of value LIMIT, class PlaceOrderRequest should not have fields ['tp']"
                 )
         elif self.k == "STOP_LOSS_LIMIT":
             if not all(getattr(self, key) is not None for key in ["tp"]):
                 raise ValueError(
-                    f"When field k (place_order_request_type) is of value STOP_LOSS_LIMIT, class PlaceOrderRequest requires fields ['tp']"
+                    f"When field k (order_type) is of value STOP_LOSS_LIMIT, class PlaceOrderRequest requires fields ['tp']"
                 )
             elif any(getattr(self, key) is not None for key in ["po"]):
                 raise ValueError(
-                    f"When field k (place_order_request_type) is of value STOP_LOSS_LIMIT, class PlaceOrderRequest should not have fields ['po']"
+                    f"When field k (order_type) is of value STOP_LOSS_LIMIT, class PlaceOrderRequest should not have fields ['po']"
                 )
         elif self.k == "TAKE_PROFIT_LIMIT":
             if not all(getattr(self, key) is not None for key in ["tp"]):
                 raise ValueError(
-                    f"When field k (place_order_request_type) is of value TAKE_PROFIT_LIMIT, class PlaceOrderRequest requires fields ['tp']"
+                    f"When field k (order_type) is of value TAKE_PROFIT_LIMIT, class PlaceOrderRequest requires fields ['tp']"
                 )
             elif any(getattr(self, key) is not None for key in ["po"]):
                 raise ValueError(
-                    f"When field k (place_order_request_type) is of value TAKE_PROFIT_LIMIT, class PlaceOrderRequest should not have fields ['po']"
+                    f"When field k (order_type) is of value TAKE_PROFIT_LIMIT, class PlaceOrderRequest should not have fields ['po']"
                 )

architect_py/grpc/models/Oms/__init__.py

@@ -0,0 +1,2 @@
+# generated by datamodel-codegen:
+#   filename:  schemas