primary-api-models 0.2.0__tar.gz → 0.3.0__tar.gz

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primary-api-models
-Version: 0.2.0
+Version: 0.3.0
 Summary: Primary API models
 Author-email: Chi Tudi <chitudi54@gmail.com>
 Requires-Python: >=3.8

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models/__init__.py

@@ -8,6 +8,7 @@ from primary_api_models.enhanced_models import EnhancedOrderReport
 from primary_api_models.instrument_details import InstrumentDetailsResponse, InstrumentDetails
 from primary_api_models.instruments import AllInstrumentsResponse, InstrumentsByResponse
 from primary_api_models.market_data import MarketDataResponse, MarketDataMessage, MarketData
+from primary_api_models.order import Order
 from primary_api_models.order_report import OrderReportMessage, OrderReport
 from primary_api_models.order_status import OrderConfirmationResponse, OrderStatusResponse
 from primary_api_models.positions import PositionsResponse, Position
@@ -51,6 +52,7 @@ __all__ = [
     "MarketDataMessage",
     "MarketData",
     "OrderReportMessage",
+    "Order",
     "OrderReport",
     "OrderStatusResponse",
     "OrderConfirmationResponse",

primary_api_models-0.3.0/primary_api_models/account_report.py

@@ -0,0 +1,59 @@
+from typing import Dict, Optional
+from decimal import Decimal
+from primary_api_models.commons import CommonResponse, PrimaryBaseModel
+from primary_api_models.enums import CurrencyIndex, SettlementIndex
+
+
+class CurrencyAmount(PrimaryBaseModel):
+    consumed: Decimal
+    available: Decimal
+
+
+class CurrencyBalance(PrimaryBaseModel):
+    detailed_currency_balance: Dict[CurrencyIndex, CurrencyAmount]
+
+
+class Cash(PrimaryBaseModel):
+    total_cash: Decimal
+    detailed_cash: Dict[CurrencyIndex, Decimal]
+
+
+class AvailableToOperate(PrimaryBaseModel):
+    cash: Cash
+    movements: Decimal
+    total: Decimal
+    pending_movements: Decimal
+    credit: Optional[Decimal] = None
+
+
+class DetailedAccountReport(PrimaryBaseModel):
+    currency_balance: CurrencyBalance
+    available_to_operate: AvailableToOperate
+    settlement_date: int
+
+
+class AccountData(PrimaryBaseModel):
+    account_name: str
+    collateral: Decimal
+    margin: Decimal
+    available_to_collateral: Decimal
+    detailed_account_reports: Dict[SettlementIndex, DetailedAccountReport]
+    has_error: bool
+    last_calculation: int
+    portfolio: Decimal
+    orders_margin: Decimal
+    current_cash: Decimal
+    daily_diff: Decimal
+    uncovered_margin: Decimal
+    market_member: Optional[str] = None
+    market_member_identity: Optional[str] = None
+    repurchase_margin: Optional[str] = None
+    error_detail: Optional[str] = None
+    detailed_collateral: Optional[dict] = None
+    detailed_portfolio: Optional[dict] = None
+    detailed_available_to_collateral: Optional[dict] = None
+    person_name: Optional[dict] = None
+
+
+class AccountReportResponse(CommonResponse):
+    account_data: Optional[AccountData] = None

primary_api_models-0.3.0/primary_api_models/commons.py

@@ -0,0 +1,68 @@
+from pydantic import BaseModel, ConfigDict
+from pydantic.alias_generators import to_camel
+from typing import Optional
+from decimal import Decimal
+from primary_api_models.enums import CFICode, MessageType, MarketId, MarketSegment, StatusResponse, SettlementIndex
+
+
+class PrimaryBaseModel(BaseModel):
+    """Base model for Primary API models with automatic camelCase to snake_case conversion"""
+    model_config = ConfigDict(
+        alias_generator=to_camel,
+        populate_by_name=True
+    )
+
+
+class MessageBase(PrimaryBaseModel):
+    type: MessageType
+    timestamp: Optional[int] = None
+
+
+class CommonResponse(PrimaryBaseModel):
+    status: StatusResponse
+    description: Optional[str] = None
+    message: Optional[str] = None
+
+
+class Segment(PrimaryBaseModel):
+    market_segment_id: MarketSegment
+    market_id: MarketId
+
+
+class AccountId(PrimaryBaseModel):
+    id: str
+
+
+class Instrument(PrimaryBaseModel):
+    symbol_reference: str
+    settl_type: SettlementIndex
+
+
+class InstrumentId(PrimaryBaseModel):
+    market_id: MarketId
+    symbol: str
+
+
+class ListedInstrument(PrimaryBaseModel):
+    instrument_id: InstrumentId
+    cficode: CFICode
+    
+    
+class PriceSize(PrimaryBaseModel):
+    price: Decimal
+    size: Decimal
+
+
+class PriceSizeDate(PrimaryBaseModel):
+    price: Decimal
+    size: Decimal
+    date: int
+
+
+class Trade(PriceSizeDate):
+    ...
+
+
+class OrderConfirmation(PrimaryBaseModel):
+    client_id: Optional[str] = None
+    proprietary: Optional[str] = None

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models/detailed_instruments.py

@@ -1,7 +1,5 @@
 from typing import Optional, List
-from pydantic import BaseModel
 from primary_api_models.commons import CommonResponse
-from primary_api_models.enums import StatusResponse
 from primary_api_models.instrument_details import InstrumentDetails
 
 

primary_api_models-0.3.0/primary_api_models/detailed_position.py

@@ -0,0 +1,54 @@
+from typing import List, Dict, Optional
+from decimal import Decimal
+from primary_api_models.commons import CommonResponse, PrimaryBaseModel
+from primary_api_models.enums import ContractType
+from primary_api_models.enums import SettlementIndex
+from primary_api_models.enums import CurrencyIndex
+
+
+class DetailedPosition(PrimaryBaseModel):
+    symbol_reference: str
+    contract_type: ContractType
+    price_conversion_factor: Decimal
+    contract_size: Decimal
+    currency: CurrencyIndex
+    exchange_rate: Decimal
+    contract_multiplier: Decimal
+    total_initial_size: Decimal
+    buy_initial_size: Decimal
+    sell_initial_size: Decimal
+    buy_initial_price: Decimal
+    sell_initial_price: Decimal
+    total_filled_size: Decimal
+    buy_filled_size: Decimal
+    sell_filled_size: Decimal
+    buy_filled_price: Decimal
+    sell_filled_price: Decimal
+    total_current_size: Decimal
+    buy_current_size: Decimal
+    sell_current_size: Decimal
+    market_value: Optional[Decimal] = None
+    market_price: Optional[Decimal] = None
+    trading_symbol: Optional[str] = None
+    settl_type: Optional[SettlementIndex] = None
+    settlement_date: Optional[int] = None
+
+
+class InstrumentGroup(PrimaryBaseModel):
+    detailed_positions: List[DetailedPosition]
+    instrument_initial_size: Decimal
+    instrument_filled_size: Decimal
+    instrument_current_size: Decimal
+    instrument_market_value: Optional[Decimal] = None
+
+
+class DetailedPositionData(PrimaryBaseModel):
+    account: str
+    last_calculation: int
+    total_market_value: Optional[Decimal] = None
+    total_daily_diff_plain: Optional[Decimal] = None
+    report: Optional[Dict[ContractType, Dict[str, InstrumentGroup]]] = None
+
+
+class DetailedPositionsResponse(CommonResponse):
+    detailed_position: Optional[DetailedPositionData] = None

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models/enhanced_models.py

@@ -16,12 +16,12 @@ class EnhancedOrderReport(OrderReport):
         return self.status in [OrderStatus.REJECTED]
     
     def is_none(self) -> bool:
-        return self.orderId in ["NONE", None]
+        return self.order_id in ["NONE", None]
     
     def __repr__(self) -> str:
-        symbol = self.instrumentId.symbol if self.instrumentId else "UNKNOWN"
+        symbol = self.instrument_id.symbol if self.instrument_id else "UNKNOWN"
         if self.status in [OrderStatus.FILLED, OrderStatus.PARTIALLY_FILLED]:
-            qty = self.lastQty
+            qty = self.last_qty
         else:
-            qty = self.orderQty
-        return f"{self.status.value} {symbol} {self.side.value} [{qty} @ ${self.price}] id=({self.clOrdId})"
+            qty = self.order_qty
+        return f"{self.status.value} {symbol} {self.side.value} [{qty} @ ${self.price}] id=({self.cl_ord_id})"

primary_api_models-0.3.0/primary_api_models/instrument_details.py

@@ -0,0 +1,44 @@
+from typing import Optional, List, Dict
+from decimal import Decimal
+from primary_api_models.commons import CommonResponse, Segment, InstrumentId, PrimaryBaseModel
+from primary_api_models.enums import Currency, OrderType, TimeInForce, CFICode
+
+
+class TickPriceRange(PrimaryBaseModel):
+    tick: Decimal
+    lower_limit: Decimal
+    upper_limit: Optional[Decimal]
+
+
+class InstrumentDetails(PrimaryBaseModel):
+    symbol: Optional[str]
+    segment: Segment
+    low_limit_price: Optional[Decimal]
+    high_limit_price: Optional[Decimal]
+    min_price_increment: Decimal
+    min_trade_vol: Decimal
+    max_trade_vol: Decimal
+    tick_size: Decimal
+    contract_multiplier: Decimal
+    round_lot: Decimal
+    price_convertion_factor: Decimal
+    maturity_date: Optional[str]
+    currency: Currency
+    order_types: List[OrderType]
+    times_in_force: List[TimeInForce]
+    security_type: Optional[str]
+    settl_type: Optional[str]
+    instrument_price_precision: int
+    instrument_size_precision: int
+    security_id: Optional[str]
+    security_id_source: Optional[str]
+    security_description: str
+    tick_price_ranges: Dict[str, TickPriceRange]
+    strike: Optional[Decimal]
+    underlying: Optional[str]
+    cficode: Optional[CFICode]
+    instrument_id: InstrumentId
+
+
+class InstrumentDetailsResponse(CommonResponse):
+    instrument: Optional[InstrumentDetails] = None

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models/instruments.py

@@ -1,5 +1,4 @@
 from typing import List, Optional
-from pydantic import BaseModel
 from primary_api_models.commons import CommonResponse, InstrumentId, ListedInstrument
 
 

primary_api_models-0.3.0/primary_api_models/market_data.py

@@ -0,0 +1,32 @@
+from typing import Any, List, Optional
+from decimal import Decimal
+from primary_api_models.commons import CommonResponse, MessageBase, PriceSize, PriceSizeDate, InstrumentId, PrimaryBaseModel
+
+
+class MarketData(PrimaryBaseModel):
+    bi: Optional[List[PriceSize]] = None
+    of: Optional[List[PriceSize]] = None
+    la: Optional[PriceSizeDate] = None
+    op: Optional[Decimal] = None
+    cl: Optional[PriceSizeDate] = None
+    hi: Optional[Decimal] = None
+    lo: Optional[Decimal] = None
+    se: Optional[PriceSizeDate] = None
+    tv: Optional[Any] = None
+    oi: Optional[Any] = None
+    iv: Optional[Any] = None
+    ev: Optional[Any] = None
+    nv: Optional[Any] = None
+    acp: Optional[Any] = None
+    tc: Optional[Any] = None
+
+
+class MarketDataResponse(CommonResponse):
+    """For REST API response"""
+    market_data: MarketData
+
+
+class MarketDataMessage(MessageBase):
+    """For Websocket messages"""
+    instrument_id: InstrumentId
+    market_data: MarketData

primary_api_models-0.3.0/primary_api_models/order.py

@@ -0,0 +1,22 @@
+
+from decimal import Decimal
+from typing import Any, Optional
+from primary_api_models.commons import PrimaryBaseModel
+
+
+class Order(PrimaryBaseModel):
+    """
+    order_type: Must be pyRofex.OrderType enum
+    side: Must be pyRofex.Side enum
+    time_in_force: Must be pyRofex.TimeInForce enum
+    """
+    ticker: str
+    order_type: Any
+    side: Any
+    size: int
+    price: Optional[Decimal] = None
+    time_in_force: Optional[Any] = None
+    cancel_previous: Optional[bool] = None
+    iceberg: Optional[bool] = None
+    expire_date: Optional[Any] = None
+    display_quantity: Optional[int] = None

primary_api_models-0.3.0/primary_api_models/order_report.py

@@ -0,0 +1,31 @@
+from typing import Optional
+from decimal import Decimal
+from primary_api_models.commons import PrimaryBaseModel, MessageBase, AccountId, InstrumentId
+from primary_api_models.enums import OrderType, OrderStatus, TimeInForce, Side
+
+
+class OrderReport(PrimaryBaseModel):
+    cl_ord_id: str
+    proprietary: str
+    account_id: AccountId
+    instrument_id: InstrumentId
+    price: Decimal
+    order_qty: Decimal
+    side: Side
+    transact_time: str
+    status: OrderStatus
+    text: str
+    order_id: Optional[str] = None
+    exec_id: Optional[str] = None
+    leaves_qty: Optional[Decimal] = None
+    cum_qty: Optional[Decimal] = None
+    avg_px: Optional[Decimal] = None
+    last_px: Optional[Decimal] = None
+    last_qty: Optional[Decimal] = None
+    ord_type: Optional[OrderType] = None
+    time_in_force: Optional[TimeInForce] = None
+    originating_username: Optional[str] = None
+
+
+class OrderReportMessage(MessageBase):
+    order_report: OrderReport

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models/order_status.py

@@ -1,11 +1,10 @@
 from typing import List, Optional
-from pydantic import BaseModel
-from primary_api_models.commons import CommonResponse, OrderConfirmation
+from primary_api_models.commons import CommonResponse
 from primary_api_models.order_report import OrderReport
 
 
 class OrderConfirmationResponse(CommonResponse):
-    order: Optional[OrderConfirmation] = None
+    order: Optional[OrderReport] = None
 
 
 class OrderStatusResponse(CommonResponse):

primary_api_models-0.3.0/primary_api_models/positions.py

@@ -0,0 +1,22 @@
+from decimal import Decimal
+from typing import List, Optional
+from primary_api_models.commons import CommonResponse, Instrument, PrimaryBaseModel
+
+class Position(PrimaryBaseModel):
+    instrument: Instrument
+    symbol: str
+    buy_size: Decimal
+    buy_price: Decimal
+    sell_size: Decimal
+    sell_price: Decimal
+    total_daily_diff: Decimal
+    total_diff: Decimal
+    trading_symbol: str
+    original_buy_price: Decimal
+    original_sell_price: Decimal
+    original_buy_size: Decimal
+    original_sell_size: Decimal
+
+
+class PositionsResponse(CommonResponse):
+    positions: Optional[List[Position]] = None

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models/segments.py

@@ -1,5 +1,4 @@
 from typing import List, Optional
-from pydantic import BaseModel
 from primary_api_models.commons import CommonResponse, Segment
 
 

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primary-api-models
-Version: 0.2.0
+Version: 0.3.0
 Summary: Primary API models
 Author-email: Chi Tudi <chitudi54@gmail.com>
 Requires-Python: >=3.8

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/primary_api_models.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ primary_api_models/enums.py
 primary_api_models/instrument_details.py
 primary_api_models/instruments.py
 primary_api_models/market_data.py
+primary_api_models/order.py
 primary_api_models/order_report.py
 primary_api_models/order_status.py
 primary_api_models/positions.py
@@ -19,6 +20,7 @@ primary_api_models.egg-info/SOURCES.txt
 primary_api_models.egg-info/dependency_links.txt
 primary_api_models.egg-info/top_level.txt
 tests/conftest.py
+tests/test_model_dump.py
 tests/test_models.py
 venv/Lib/site-packages/py.py
 venv/Lib/site-packages/typing_extensions.py

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "primary-api-models"
-version = "0.2.0"
+version = "0.3.0"
 description = "Primary API models"
 authors = [
     { name="Chi Tudi", email="chitudi54@gmail.com" }

primary_api_models-0.3.0/tests/test_model_dump.py

@@ -0,0 +1,12 @@
+from primary_api_models import Order
+
+
+def test_alias_generator():
+    order = Order(
+        ticker="FAFA",
+        order_type="LIMIT",
+        side="BUY",
+        size=100
+    )
+
+    print(order.model_dump(by_alias=True))

{primary_api_models-0.2.0 → primary_api_models-0.3.0}/tests/test_models.py

@@ -11,35 +11,35 @@ def test_account_data_response():
     json_data = '{"status":"OK","accountData":{"accountName":"10783","marketMember":"nasini","marketMemberIdentity":"nasini","collateral":0,"margin":0,"availableToCollateral":4881464.48,"detailedAccountReports":{"0":{"currencyBalance":{"detailedCurrencyBalance":{"USD MtR":{"consumed":0,"available":0},"ARS":{"consumed":0,"available":84142.15},"USD UY":{"consumed":0,"available":0},"USD DB":{"consumed":0,"available":0},"U$S":{"consumed":0,"available":0},"USD G":{"consumed":0,"available":0},"USD R":{"consumed":0,"available":0},"USD C":{"consumed":0,"available":0},"USD D":{"consumed":0,"available":3.42}}},"availableToOperate":{"cash":{"totalCash":88139.48,"detailedCash":{"USD MtR":0,"ARS":84142.15,"USD UY":0,"USD DB":0,"U$S":0,"USD G":0,"USD R":0,"USD C":0,"USD D":3.42}},"movements":0,"credit":null,"total":88139.48,"pendingMovements":0},"settlementDate":1745204400000}},"hasError":false,"errorDetail":null,"lastCalculation":1745266135887,"portfolio":4793325,"ordersMargin":0,"currentCash":88139.48,"dailyDiff":0,"uncoveredMargin":0,"repurchaseMarginARS":null,"repurchaseMarginUSD":null,"accountDescription":null,"detailedCollateral":null,"detailedPortfolio":null,"detailedAvailableToCollateral":null,"personName":null}}'
     response = AccountReportResponse.model_validate_json(json_data)
     assert response.status == "OK"
-    assert response.accountData.accountName == "10783"
-    assert response.accountData.marketMember == "nasini"
-    assert response.accountData.availableToCollateral == Decimal("4881464.48")
-    for key, value in response.accountData.detailedAccountReports.items():
+    assert response.account_data.account_name == "10783"
+    assert response.account_data.market_member == "nasini"
+    assert response.account_data.available_to_collateral == Decimal("4881464.48")
+    for key, value in response.account_data.detailed_account_reports.items():
         assert key == SettlementIndex.T0
-        assert value.currencyBalance.detailedCurrencyBalance[CurrencyIndex.ARS].available == Decimal("84142.15")
-        assert value.currencyBalance.detailedCurrencyBalance[CurrencyIndex.USD_D].available == Decimal("3.42")
-    assert response.accountData.hasError == False    
+        assert value.currency_balance.detailed_currency_balance[CurrencyIndex.ARS].available == Decimal("84142.15")
+        assert value.currency_balance.detailed_currency_balance[CurrencyIndex.USD_D].available == Decimal("3.42")
+    assert response.account_data.has_error == False
 
 
 def test_intrument_details_response():
     json_data = '{"status":"OK","instrument":{"symbol":null,"segment":{"marketSegmentId":"MERV","marketId":"ROFX"},"lowLimitPrice":0,"highLimitPrice":1000000,"minPriceIncrement":0.05,"minTradeVol":700,"maxTradeVol":1000000,"tickSize":1,"contractMultiplier":1,"roundLot":1,"priceConvertionFactor":1,"maturityDate":null,"currency":"ARS","orderTypes":["MARKET","LIMIT","STOP_LIMIT_MERVAL"],"timesInForce":["DAY","FOK"],"securityType":null,"settlType":null,"instrumentPricePrecision":2,"instrumentSizePrecision":0,"securityId":null,"securityIdSource":null,"securityDescription":"MERV - XMEV - GCDI - 24hs","tickPriceRanges":{"0":{"lowerLimit":0,"upperLimit":null,"tick":0.05}},"strike":null,"underlying":"GCDI S.A.","cficode":"ESXXXX","instrumentId":{"marketId":"ROFX","symbol":"MERV - XMEV - GCDI - 24hs"}}}'
     response = InstrumentDetailsResponse.model_validate_json(json_data)
     assert response.status == "OK"
-    assert response.instrument.segment == Segment(marketSegmentId=MarketSegment.MERV, marketId=MarketId.ROFX)
-    assert response.instrument.segment.marketSegmentId == MarketSegment.MERV
-    assert response.instrument.segment.marketId == MarketId.ROFX
-    assert response.instrument.priceConvertionFactor == Decimal("1")
-    assert response.instrument.instrumentId == InstrumentId(marketId=MarketId.ROFX, symbol="MERV - XMEV - GCDI - 24hs")
+    assert response.instrument.segment == Segment(market_segment_id=MarketSegment.MERV, market_id=MarketId.ROFX)
+    assert response.instrument.segment.market_segment_id == MarketSegment.MERV
+    assert response.instrument.segment.market_id == MarketId.ROFX
+    assert response.instrument.price_convertion_factor == Decimal("1")
+    assert response.instrument.instrument_id == InstrumentId(market_id=MarketId.ROFX, symbol="MERV - XMEV - GCDI - 24hs")
 
 
 def test_detailed_position_response():
     json_data = '{ "status": "OK", "detailedPosition": { "account": "10783", "totalMarketValue": 14725200.0, "report": { "CEDEAR": { "NFLX": { "detailedPositions": [ { "symbolReference": "NFLX", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 23300.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 30.0, "buyInitialSize": 30.0, "sellInitialSize": 0.0, "buyInitialPrice": 23575.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 30.0, "buyCurrentSize": 30.0, "sellCurrentSize": 0.0, "marketValue": 699000.0, "tradingSymbol": "MERV - XMEV - NFLX - CI" } ], "instrumentMarketValue": 699000.0, "instrumentInitialSize": 30.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 30.0 }, "GOOGL": { "detailedPositions": [ { "symbolReference": "GOOGL", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 2885.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 120.0, "buyInitialSize": 120.0, "sellInitialSize": 0.0, "buyInitialPrice": 3105.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 120.0, "buyCurrentSize": 120.0, "sellCurrentSize": 0.0, "marketValue": 346200.0, "tradingSymbol": "MERV - XMEV - GOOGL - CI" } ], "instrumentMarketValue": 346200.0, "instrumentInitialSize": 120.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 120.0 }, "META": { "detailedPositions": [ { "symbolReference": "META", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 22925.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 13.0, "buyInitialSize": 13.0, "sellInitialSize": 0.0, "buyInitialPrice": 24650.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 13.0, "buyCurrentSize": 13.0, "sellCurrentSize": 0.0, "marketValue": 298025.0, "tradingSymbol": "MERV - XMEV - META - CI" } ], "instrumentMarketValue": 298025.0, "instrumentInitialSize": 13.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 13.0 }, "NVDA": { "detailedPositions": [ { "symbolReference": "NVDA", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 4585.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 300.0, "buyInitialSize": 300.0, "sellInitialSize": 0.0, "buyInitialPrice": 5090.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 300.0, "buyCurrentSize": 300.0, "sellCurrentSize": 0.0, "marketValue": 1375500.0, "tradingSymbol": "MERV - XMEV - NVDA - CI" } ], "instrumentMarketValue": 1375500.0, "instrumentInitialSize": 300.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 300.0 }, "AAPL": { "detailedPositions": [ { "symbolReference": "AAPL", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 10875.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 80.0, "buyInitialSize": 80.0, "sellInitialSize": 0.0, "buyInitialPrice": 11450.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 80.0, "buyCurrentSize": 80.0, "sellCurrentSize": 0.0, "marketValue": 870000.0, "tradingSymbol": "MERV - XMEV - AAPL - CI" } ], "instrumentMarketValue": 870000.0, "instrumentInitialSize": 80.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 80.0 }, "IBIT": { "detailedPositions": [ { "symbolReference": "IBIT", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 5660.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 100.0, "buyInitialSize": 100.0, "sellInitialSize": 0.0, "buyInitialPrice": 5630.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 100.0, "buyCurrentSize": 100.0, "sellCurrentSize": 0.0, "marketValue": 566000.0, "tradingSymbol": "MERV - XMEV - IBIT - CI" } ], "instrumentMarketValue": 566000.0, "instrumentInitialSize": 100.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 100.0 }, "EWZ": { "detailedPositions": [ { "symbolReference": "EWZ", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 14200.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 70.0, "buyInitialSize": 70.0, "sellInitialSize": 0.0, "buyInitialPrice": 14600.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 70.0, "buyCurrentSize": 70.0, "sellCurrentSize": 0.0, "marketValue": 994000.0, "tradingSymbol": "MERV - XMEV - EWZ - CI" } ], "instrumentMarketValue": 994000.0, "instrumentInitialSize": 70.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 70.0 }, "XLRE": { "detailedPositions": [ { "symbolReference": "XLRE", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 5010.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 100.0, "buyInitialSize": 100.0, "sellInitialSize": 0.0, "buyInitialPrice": 6150.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 100.0, "buyCurrentSize": 100.0, "sellCurrentSize": 0.0, "marketValue": 501000.0, "tradingSymbol": "MERV - XMEV - XLRE - CI" } ], "instrumentMarketValue": 501000.0, "instrumentInitialSize": 100.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 100.0 }, "TSM": { "detailedPositions": [ { "symbolReference": "TSM", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 18650.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 40.0, "buyInitialSize": 40.0, "sellInitialSize": 0.0, "buyInitialPrice": 19850.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 40.0, "buyCurrentSize": 40.0, "sellCurrentSize": 0.0, "marketValue": 746000.0, "tradingSymbol": "MERV - XMEV - TSM - CI" } ], "instrumentMarketValue": 746000.0, "instrumentInitialSize": 40.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 40.0 }, "MSFT": { "detailedPositions": [ { "symbolReference": "MSFT", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 13600.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 46.0, "buyInitialSize": 46.0, "sellInitialSize": 0.0, "buyInitialPrice": 14550.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 46.0, "buyCurrentSize": 46.0, "sellCurrentSize": 0.0, "marketValue": 625600.0, "tradingSymbol": "MERV - XMEV - MSFT - CI" } ], "instrumentMarketValue": 625600.0, "instrumentInitialSize": 46.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 46.0 }, "QQQ": { "detailedPositions": [ { "symbolReference": "QQQ", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 24475.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 50.0, "buyInitialSize": 50.0, "sellInitialSize": 0.0, "buyInitialPrice": 26125.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 50.0, "buyCurrentSize": 50.0, "sellCurrentSize": 0.0, "marketValue": 1223750.0, "tradingSymbol": "MERV - XMEV - QQQ - CI" } ], "instrumentMarketValue": 1223750.0, "instrumentInitialSize": 50.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 50.0 }, "MELI": { "detailedPositions": [ { "symbolReference": "MELI", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 19375.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 32.0, "buyInitialSize": 32.0, "sellInitialSize": 0.0, "buyInitialPrice": 20175.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 32.0, "buyCurrentSize": 32.0, "sellCurrentSize": 0.0, "marketValue": 620000.0, "tradingSymbol": "MERV - XMEV - MELI - CI" } ], "instrumentMarketValue": 620000.0, "instrumentInitialSize": 32.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 32.0 }, "FXI": { "detailedPositions": [ { "symbolReference": "FXI", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 7320.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 40.0, "buyInitialSize": 40.0, "sellInitialSize": 0.0, "buyInitialPrice": 7630.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 40.0, "buyCurrentSize": 40.0, "sellCurrentSize": 0.0, "marketValue": 292800.0, "tradingSymbol": "MERV - XMEV - FXI - CI" } ], "instrumentMarketValue": 292800.0, "instrumentInitialSize": 40.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 40.0 }, "CAT": { "detailedPositions": [ { "symbolReference": "CAT", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 16125.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 20.0, "buyInitialSize": 20.0, "sellInitialSize": 0.0, "buyInitialPrice": 16891.8297, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 20.0, "buyCurrentSize": 20.0, "sellCurrentSize": 0.0, "marketValue": 322500.0, "tradingSymbol": "MERV - XMEV - CAT - CI" } ], "instrumentMarketValue": 322500.0, "instrumentInitialSize": 20.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 20.0 }, "IEUR": { "detailedPositions": [ { "symbolReference": "IEUR", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 6090.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 100.0, "buyInitialSize": 100.0, "sellInitialSize": 0.0, "buyInitialPrice": 6340.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 100.0, "buyCurrentSize": 100.0, "sellCurrentSize": 0.0, "marketValue": 609000.0, "tradingSymbol": "MERV - XMEV - IEUR - CI" } ], "instrumentMarketValue": 609000.0, "instrumentInitialSize": 100.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 100.0 }, "DIA": { "detailedPositions": [ { "symbolReference": "DIA", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 21500.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 50.0, "buyInitialSize": 50.0, "sellInitialSize": 0.0, "buyInitialPrice": 23400.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 50.0, "buyCurrentSize": 50.0, "sellCurrentSize": 0.0, "marketValue": 1075000.0, "tradingSymbol": "MERV - XMEV - DIA - CI" } ], "instrumentMarketValue": 1075000.0, "instrumentInitialSize": 50.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 50.0 }, "SPY": { "detailedPositions": [ { "symbolReference": "SPY", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 29100.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 60.0, "buyInitialSize": 60.0, "sellInitialSize": 0.0, "buyInitialPrice": 30950.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 60.0, "buyCurrentSize": 60.0, "sellCurrentSize": 0.0, "marketValue": 1746000.0, "tradingSymbol": "MERV - XMEV - SPY - CI" } ], "instrumentMarketValue": 1746000.0, "instrumentInitialSize": 60.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 60.0 }, "AMZN": { "detailedPositions": [ { "symbolReference": "AMZN", "settlType": 0, "settlementDate": 1745204400000, "contractType": "CEDEAR", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 1320.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 790.0, "buyInitialSize": 790.0, "sellInitialSize": 0.0, "buyInitialPrice": 1425.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 790.0, "buyCurrentSize": 790.0, "sellCurrentSize": 0.0, "marketValue": 1042800.0, "tradingSymbol": "MERV - XMEV - AMZN - CI" } ], "instrumentMarketValue": 1042800.0, "instrumentInitialSize": 790.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 790.0 } }, "STOCK": { "GCDI": { "detailedPositions": [ { "symbolReference": "GCDI", "settlType": 0, "settlementDate": 1745204400000, "contractType": "STOCK", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 19.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 800.0, "buyInitialSize": 800.0, "sellInitialSize": 0.0, "buyInitialPrice": 21.05, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 800.0, "buyCurrentSize": 800.0, "sellCurrentSize": 0.0, "marketValue": 15200.0, "tradingSymbol": "MERV - XMEV - GCDI - CI"}], "instrumentMarketValue": 15200.0, "instrumentInitialSize": 800.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 800.0}, "BYMA": {"detailedPositions": [{"symbolReference": "BYMA", "settlType": 0, "settlementDate": 1745204400000, "contractType": "STOCK", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 391.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 75.0, "buyInitialSize": 75.0, "sellInitialSize": 0.0, "buyInitialPrice": 409.5, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 75.0, "buyCurrentSize": 75.0, "sellCurrentSize": 0.0, "marketValue": 29325.0, "tradingSymbol": "MERV - XMEV - BYMA - CI"}], "instrumentMarketValue": 29325.0, "instrumentInitialSize": 75.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 75.0}, "YPFD": {"detailedPositions": [ { "symbolReference": "YPFD", "settlType": 0, "settlementDate": 1745204400000, "contractType": "STOCK", "priceConversionFactor": 1.0, "contractSize": 1.0, "marketPrice": 36375.0, "currency": "ARS", "exchangeRate": 1.0, "contractMultiplier": 1.0, "totalInitialSize": 20.0, "buyInitialSize": 20.0, "sellInitialSize": 0.0, "buyInitialPrice": 38825.0, "sellInitialPrice": 0, "totalFilledSize": 0, "buyFilledSize": 0, "sellFilledSize": 0, "buyFilledPrice": 0, "sellFilledPrice": 0, "totalCurrentSize": 20.0, "buyCurrentSize": 20.0, "sellCurrentSize": 0.0, "marketValue": 727500.0, "tradingSymbol": "MERV - XMEV - YPFD - CI" } ], "instrumentMarketValue": 727500.0, "instrumentInitialSize": 20.0, "instrumentFilledSize": 0, "instrumentCurrentSize": 20.0 } } }, "lastCalculation": 1745266135887 } }'
     response = DetailedPositionsResponse.model_validate_json(json_data)
     assert response.status == "OK"
-    assert response.detailedPosition.account == "10783"
-    assert response.detailedPosition.totalMarketValue == 14725200.0
-    assert "CEDEAR" in response.detailedPosition.report
-    assert "STOCK" in response.detailedPosition.report
+    assert response.detailed_position.account == "10783"
+    assert response.detailed_position.total_market_value == 14725200.0
+    assert "CEDEAR" in response.detailed_position.report
+    assert "STOCK" in response.detailed_position.report
 
 
 def test_positions_response():
@@ -47,15 +47,15 @@ def test_positions_response():
     response = PositionsResponse.model_validate_json(json_data)
     assert response.status == "OK"
     assert len(response.positions) == 21
-    assert response.positions[0].instrument.symbolReference == "GOOGL"
-    assert response.positions[0].buySize == 120
-    assert response.positions[0].buyPrice == 3105
-    assert response.positions[0].totalDailyDiff == -26400
-    assert response.positions[0].totalDiff == 346200
-    assert response.positions[0].tradingSymbol == "MERV - XMEV - GOOGL - CI"
-    assert response.positions[19].instrument.symbolReference == "AMZN"
-    assert response.positions[19].buySize == 790
-    assert response.positions[19].buyPrice == 1425
-    assert response.positions[19].totalDailyDiff == -82950
-    assert response.positions[19].totalDiff == 1042800
-    assert response.positions[19].tradingSymbol == "MERV - XMEV - AMZN - CI"
+    assert response.positions[0].instrument.symbol_reference == "GOOGL"
+    assert response.positions[0].buy_size == 120
+    assert response.positions[0].buy_price == 3105
+    assert response.positions[0].total_daily_diff == -26400
+    assert response.positions[0].total_diff == 346200
+    assert response.positions[0].trading_symbol == "MERV - XMEV - GOOGL - CI"
+    assert response.positions[19].instrument.symbol_reference == "AMZN"
+    assert response.positions[19].buy_size == 790
+    assert response.positions[19].buy_price == 1425
+    assert response.positions[19].total_daily_diff == -82950
+    assert response.positions[19].total_diff == 1042800
+    assert response.positions[19].trading_symbol == "MERV - XMEV - AMZN - CI"