wiz-trader 0.35.0__py3-none-any.whl → 0.36.0__py3-none-any.whl

wiz_trader/__init__.py

@@ -3,6 +3,6 @@
 from .quotes import QuotesClient
 from .apis import WizzerClient
 
-__version__ = "0.35.0"
+__version__ = "0.36.0"
 
 __all__ = ["QuotesClient", "WizzerClient"]

wiz_trader/quotes/client.py

@@ -28,15 +28,38 @@ class QuotesClient:
       log_level (str): Logging level. Options: "error", "info", "debug".
       on_tick (Callable): Callback for tick messages (type='ticks' or no type field).
       on_stats (Callable): Callback for stats/greeks messages (type='greeks').
+      on_order (Callable): Callback for order events (type='order').
+      on_trade (Callable): Callback for trade events (type='trade').
+      on_position (Callable): Callback for position events (type='position').
+      on_holding (Callable): Callback for holding events (type='holding').
       on_connect (Callable): Callback when connection is established.
       on_close (Callable): Callback when connection is closed.
       on_error (Callable): Callback for errors.
     
     Message Routing:
-      - Messages with type='ticks' are routed to on_tick callback
-      - Messages with type='greeks' are routed to on_stats callback
+      - Legacy messages with type='ticks' are routed to on_tick callback
+      - Legacy messages with type='greeks' are routed to on_stats callback
+      - Event messages with type='order' are routed to on_order callback
+      - Event messages with type='trade' are routed to on_trade callback
+      - Event messages with type='position' are routed to on_position callback
+      - Event messages with type='holding' are routed to on_holding callback
       - Messages without type field are routed to on_tick for backward compatibility
       - Messages are silently dropped if the appropriate handler is not registered
+    
+    Message Structure Support:
+      - Legacy Format: {type: "ticks", ...data} or {...data} (no type)
+      - New Event Format: {type: "position", data: {...actualData}} - automatically normalized
+      - All handlers receive flattened message structure with type preserved at root level
+    
+    Event Handler Signature:
+      All event handlers follow the same signature: handler(ws: QuotesClient, event_data: dict)
+      
+    Example:
+      def on_order_event(ws, order):
+          print(f"Order {order['id']}: {order['status']}")
+      
+      client.on_order = on_order_event
+      client.connect()
     """
 
     ACTION_SUBSCRIBE = "subscribe"
@@ -89,6 +112,12 @@ class QuotesClient:
         self.on_connect: Optional[Callable[[Any], None]] = None
         self.on_close: Optional[Callable[[Any, Optional[int], Optional[str]], None]] = None
         self.on_error: Optional[Callable[[Any, Exception], None]] = None
+        
+        # Event callbacks for account events
+        self.on_order: Optional[Callable[[Any, dict], None]] = None
+        self.on_trade: Optional[Callable[[Any, dict], None]] = None
+        self.on_position: Optional[Callable[[Any, dict], None]] = None
+        self.on_holding: Optional[Callable[[Any, dict], None]] = None
 
         logger.debug("Initialized QuotesClient with URL: %s", self.url)
 
@@ -96,6 +125,40 @@ class QuotesClient:
         for i in range(0, len(data), chunk_size):
             yield data[i:i + chunk_size]
 
+    def _normalize_message(self, raw_message: dict) -> dict:
+        """
+        Normalize message structure to handle both legacy and new formats.
+        
+        Legacy Format (Ticks/Greeks): {type: "ticks", ...data} or {...data} (no type)
+        New Format (Events): {type: "position", data: {...actualData}}
+        
+        Returns: Flattened message with type preserved at root level
+        """
+        try:
+            # Check if message has both 'type' and 'data' fields (new format)
+            if 'type' in raw_message and 'data' in raw_message:
+                # New format: Extract type, merge data into root level
+                message_type = raw_message['type']
+                data = raw_message['data']
+                if isinstance(data, dict):
+                    # Create flattened message with type preserved
+                    normalized = {'type': message_type}
+                    normalized.update(data)
+                    logger.debug("Normalized new format message: type=%s", message_type)
+                    return normalized
+                else:
+                    # Data is not a dict, keep original structure
+                    logger.debug("Data field is not a dict, keeping original structure")
+                    return raw_message
+            else:
+                # Legacy format: Use as-is (either has type only or no type)
+                logger.debug("Legacy format message detected")
+                return raw_message
+                
+        except Exception as e:
+            logger.debug("Error normalizing message: %s, using original", e)
+            return raw_message
+
     async def _connect_with_backoff(self) -> None:
         backoff = self._backoff_base
 
@@ -174,24 +237,67 @@ class QuotesClient:
                         if not chunk:
                             continue
                         try:
-                            data = json.loads(chunk)
+                            raw_data = json.loads(chunk)
+                            # Normalize message structure
+                            data = self._normalize_message(raw_data)
                             # Route based on message type
                             message_type = data.get('type')
                             
                             if message_type == 'greeks':
                                 if self.on_stats:
-                                    self.on_stats(self, data)
+                                    try:
+                                        self.on_stats(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_stats handler: %s", e)
                                 else:
                                     logger.debug("Received greeks message but no on_stats handler registered")
                             elif message_type == 'ticks':
                                 if self.on_tick:
-                                    self.on_tick(self, data)
+                                    try:
+                                        self.on_tick(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_tick handler: %s", e)
                                 else:
                                     logger.debug("Received ticks message but no on_tick handler registered")
+                            elif message_type == 'order':
+                                if self.on_order:
+                                    try:
+                                        self.on_order(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_order handler: %s", e)
+                                else:
+                                    logger.debug("Received order event but no on_order handler registered")
+                            elif message_type == 'trade':
+                                if self.on_trade:
+                                    try:
+                                        self.on_trade(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_trade handler: %s", e)
+                                else:
+                                    logger.debug("Received trade event but no on_trade handler registered")
+                            elif message_type == 'position':
+                                if self.on_position:
+                                    try:
+                                        self.on_position(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_position handler: %s", e)
+                                else:
+                                    logger.debug("Received position event but no on_position handler registered")
+                            elif message_type == 'holding':
+                                if self.on_holding:
+                                    try:
+                                        self.on_holding(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_holding handler: %s", e)
+                                else:
+                                    logger.debug("Received holding event but no on_holding handler registered")
                             else:
                                 # No type field - send to on_tick for backward compatibility
                                 if self.on_tick:
-                                    self.on_tick(self, data)
+                                    try:
+                                        self.on_tick(self, data)
+                                    except Exception as e:
+                                        logger.debug("Error in on_tick handler: %s", e)
                                 else:
                                     logger.debug("Received message without type field and no on_tick handler registered")
                         except json.JSONDecodeError as e:

{wiz_trader-0.35.0.dist-info → wiz_trader-0.36.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wiz_trader
-Version: 0.35.0
+Version: 0.36.0
 Summary: A Python SDK for connecting to the Wizzer.
 Home-page: https://bitbucket.org/wizzer-tech/quotes_sdk.git
 Author: Pawan Wagh
@@ -38,6 +38,7 @@ Dynamic: requires-python
     - [Callbacks](#callbacks)
     - [Subscribing to Instruments](#subscribing-to-instruments)
     - [Unsubscribing from Instruments](#unsubscribing-from-instruments)
+    - [Account Events](#account-events)
     - [Handling WebSocket Connection](#handling-websocket-connection)
     - [Complete Examples](#quotes-client-examples)
 5. [Wizzer Client](#wizzer-client)
@@ -253,6 +254,347 @@ ws.unsubscribe(["NSE:RELIANCE:2885"])
 - Can be called multiple times for different instrument sets
 - No callback fired for unsubscribed instruments
 
+### Account Events
+
+The QuotesClient now supports automatic reception of account-related events (orders, trades, positions, holdings) from the quotes server. These events are automatically pushed to SDK users via dedicated callback handlers based on the event type.
+
+#### Event Handlers
+
+Register event handlers to receive real-time updates for your account activity:
+
+```python
+def on_order(ws, order):
+    print(f"Order event: {order}")
+
+def on_trade(ws, trade):
+    print(f"Trade event: {trade}")
+
+def on_position(ws, position):
+    print(f"Position event: {position}")
+
+def on_holding(ws, holding):
+    print(f"Holding event: {holding}")
+
+# Register event handlers
+client.on_order = on_order
+client.on_trade = on_trade
+client.on_position = on_position
+client.on_holding = on_holding
+```
+
+#### Key Features
+
+- **Automatic Event Reception**: No explicit subscription needed - events are automatically sent based on your JWT token's account ID and strategy ID
+- **Optional Handlers**: Events are silently dropped if no handler is registered - you only receive what you need
+- **Message Normalization**: The SDK automatically handles different message formats and delivers clean, flattened event data to your handlers
+- **Error Resilience**: Handler exceptions are caught and logged without breaking the event flow
+- **Backward Compatible**: Existing tick and Greeks functionality remains unchanged
+
+#### Event Data Structure
+
+All event handlers receive flattened event data with the event type preserved:
+
+```python
+# Example order event data
+{
+    "_id": "order_01k10np7weemkv812nx55bppw5",
+    "accountEntityType": "client",
+    "accountId": "user_01j9brznsffphvzqn9gzyj1frw",
+    "avgPrice": 72.65,
+    "broker": "wizzer",
+    "brokerOrderId": "dssorder_175344314711184",
+    "brokerTimestamp": "2025-07-25T11:32:28.147Z",
+    "cancelledQty": 0,
+    "completedAt": "2025-07-25T11:32:28.147Z",
+    "createdAt": "2025-07-25T11:32:27.722Z",
+    "disclosedQty": 0,
+    "exchange": "NSE",
+    "exchangeOrderId": "dssx_1753443147",
+    "exchangeToken": 11184,
+    "exchangeUpdateTimestamp": "2025-07-25T11:32:28.147Z",
+    "executionType": "regular",
+    "filledQty": 1,
+    "guid": "t0lVueivgBgcEh2k_BP",
+    "instrumentType": "EQLC",
+    "isDealer": false,
+    "isOrderModified": false,
+    "legs": [],
+    "marginUsed": 0,
+    "meta": {
+        "dss": {"orderId": "order_01k10np7weemkv812nx55bppw5"},
+        "source": "wizzer.dss",
+        "wizzer": {"mode": "paper_trading"}
+    },
+    "orderType": "MARKET",
+    "parentOrderId": "",
+    "pendingQty": 1,
+    "placedBy": "user_01j9brznsffphvzqn9gzyj1frw",
+    "price": 0,
+    "product": "CNC",
+    "qty": 1,
+    "remarks": "",
+    "segment": "NSECM",
+    "slPrice": 0,
+    "slTriggerPrice": 0,
+    "sqOffHoldingId": "",
+    "sqOffPositionId": "",
+    "status": "COMPLETED",
+    "stoploss": 0,
+    "stoplossOrderId": "",
+    "strategy": {
+        "id": "stgy_01jtn7t3erf8ss78spqy40k8en",
+        "identifier": "S-608377",
+        "name": "Test 1122"
+    },
+    "target": 0,
+    "targetOrderId": "",
+    "tradingSymbol": "IDFCFIRSTB",
+    "transactionType": "BUY",
+    "triggerId": "",
+    "triggerPrice": 0,
+    "updatedAt": "2025-07-25T11:32:28.254Z",
+    "userId": "user_01j9brznsffphvzqn9gzyj1frw",
+    "validity": "DAY",
+    "variety": "REGULAR"
+}
+
+# Example trade event data
+{
+    "_id": "trade_01k10np8rqef793zr93ctqj0wt",
+    "accountId": "user_01j9brznsffphvzqn9gzyj1frw",
+    "avgPrice": 72.65,
+    "broker": "wizzer",
+    "brokerOrderId": "dssorder_175344314711184",
+    "createdAt": "2025-07-25T11:32:28.567Z",
+    "exchange": "NSE",
+    "exchangeOrderId": "dssx_1753443147",
+    "exchangeTimestamp": "2025-07-25T11:32:28.147Z",
+    "exchangeToken": 11184,
+    "isDividend": false,
+    "meta": {
+        "dss": {"orderId": "order_01k10np7weemkv812nx55bppw5"},
+        "source": "wizzer.dss",
+        "wizzer": {"mode": "paper_trading"}
+    },
+    "orderId": "order_01k10np7weemkv812nx55bppw5",
+    "orderType": "MARKET",
+    "parentOrderId": "",
+    "parentTradeId": "",
+    "product": "CNC",
+    "qty": 1,
+    "segment": "NSECM",
+    "strategy": {
+        "id": "stgy_01jtn7t3erf8ss78spqy40k8en",
+        "identifier": "S-608377",
+        "name": "Test 1122"
+    },
+    "tradeId": "dsstrade_50PccSfWvsCg-Cr5dQE",
+    "tradingSymbol": "IDFCFIRSTB",
+    "transactionType": "BUY",
+    "updatedAt": "2025-07-25T11:32:28.567Z",
+    "userId": "user_01j9brznsffphvzqn9gzyj1frw"
+}
+
+# Example position event data
+{
+    "_id": "pos_01k10np8t7e0fs63q52hacbx8m",
+    "accountEntityType": "client",
+    "accountId": "user_01j9brznsffphvzqn9gzyj1frw",
+    "bep": 0,
+    "broker": "wizzer",
+    "buyAvgPrice": 72.65,
+    "buyOrders": ["order_01k10np7weemkv812nx55bppw5"],
+    "buyQty": 1,
+    "buyTrades": ["trade_01k10np8rqef793zr93ctqj0wt"],
+    "buyValue": 72.65,
+    "closePrice": 0,
+    "createdAt": "2025-07-25T11:32:28.614Z",
+    "exchange": "NSE",
+    "exchangeToken": 11184,
+    "instrumentType": "EQLC",
+    "lotSize": 1,
+    "meta": {
+        "source": "wizzer.dss",
+        "wizzer": {"mode": "paper_trading"}
+    },
+    "netQty": 1,
+    "pnlPercentage": 0,
+    "product": "CNC",
+    "realisedPnlToday": 0,
+    "segment": "NSECM",
+    "sellAvgPrice": 0,
+    "sellOrders": [],
+    "sellQty": 0,
+    "sellTrades": [],
+    "sellValue": 0,
+    "slPrice": null,
+    "slTriggerPrice": null,
+    "status": "open",
+    "stoploss": 0,
+    "strategy": {
+        "id": "stgy_01jtn7t3erf8ss78spqy40k8en",
+        "identifier": "S-608377",
+        "name": "Test 1122"
+    },
+    "target": 0,
+    "tradingSymbol": "IDFCFIRSTB",
+    "unrealisedPnlToday": 0,
+    "updatedAt": "2025-07-25T11:32:28.614Z",
+    "userId": "user_01j9brznsffphvzqn9gzyj1frw"
+}
+
+# Example holding event data
+{
+    "_id": "holding_01k10np8t7e0fs63q52hacbx8m",
+    "accountEntityType": "client",
+    "accountId": "user_01j9brznsffphvzqn9gzyj1frw",
+    "bep": 0,
+    "broker": "wizzer",
+    "buyAvgPrice": 72.65,
+    "buyOrders": ["order_01k10np7weemkv812nx55bppw5"],
+    "buyQty": 1,
+    "buyTrades": ["trade_01k10np8rqef793zr93ctqj0wt"],
+    "buyValue": 72.65,
+    "closePrice": 0,
+    "createdAt": "2025-07-25T11:32:28.614Z",
+    "exchange": "NSE",
+    "exchangeToken": 11184,
+    "instrumentType": "EQLC",
+    "lotSize": 1,
+    "meta": {
+        "source": "wizzer.dss",
+        "wizzer": {"mode": "paper_trading"}
+    },
+    "netQty": 1,
+    "pnlPercentage": 0,
+    "product": "CNC",
+    "realisedPnlToday": 0,
+    "segment": "NSECM",
+    "sellAvgPrice": 0,
+    "sellOrders": [],
+    "sellQty": 0,
+    "sellTrades": [],
+    "sellValue": 0,
+    "slPrice": null,
+    "slTriggerPrice": null,
+    "status": "open",
+    "stoploss": 0,
+    "strategy": {
+        "id": "stgy_01jtn7t3erf8ss78spqy40k8en",
+        "identifier": "S-608377",
+        "name": "Test 1122"
+    },
+    "target": 0,
+    "tradingSymbol": "IDFCFIRSTB",
+    "unrealisedPnlToday": 0,
+    "updatedAt": "2025-07-25T11:32:28.614Z",
+    "userId": "user_01j9brznsffphvzqn9gzyj1frw"
+}
+```
+
+#### Complete Event Handling Example
+
+```python
+from wiz_trader import QuotesClient
+
+# Initialize client
+client = QuotesClient(
+    base_url="wss://websocket-url/quotes",
+    token="your-jwt-token",
+    log_level="info"
+)
+
+def on_order(ws, order):    
+    # React to order status changes
+    if order['status'] == ORDER_STATUS_COMPLETED:
+        print(f"Order {order['_id']} completed!")
+    elif order['status'] == ORDER_STATUS_REJECTED:
+        print(f"Order {order['_id']} rejected: {order.get('remarks', 'Unknown')}")
+
+def on_trade(ws, trade):
+    print(f"Trade executed: {trade['qty']} x {trade['tradingSymbol']} @ {trade['avgPrice']}")
+
+def on_position(ws, position):
+    print(f"Position update: {position['tradingSymbol']} = {position['netQty']} (PnL: {position.get('unrealisedPnlToday', 0)})")
+
+def on_holding(ws, holding):
+    print(f"Holding update: {holding['tradingSymbol']} = {holding['netQty']}")
+
+def on_connect(ws):
+    print("Connected! Ready to receive events.")
+    # Also subscribe to some ticks if needed
+    ws.subscribe(["NSE:SBIN:3045"], mode="ticks")
+
+# Register all handlers
+client.on_order = on_order
+client.on_trade = on_trade
+client.on_position = on_position
+client.on_holding = on_holding
+client.on_connect = on_connect
+
+# Connect and receive events
+client.connect()
+```
+
+#### Event-Driven Trading Strategy Example
+
+```python
+class EventDrivenStrategy:
+    def __init__(self):
+        self.orders = {}
+        self.positions = {}
+        self.pending_orders = set()
+    
+    def on_order_event(self, ws, order):
+        order_id = order['_id']
+        self.orders[order_id] = order
+        
+        # Track pending orders
+        if order['status'] == ORDER_STATUS_OPEN:
+            self.pending_orders.add(order_id)
+        elif order_id in self.pending_orders:
+            self.pending_orders.remove(order_id)
+        
+        # Log order lifecycle
+        print(f"Order {order_id}: {order['status']}")
+        
+        # React to rejections
+        if order['status'] == ORDER_STATUS_REJECTED:
+            print(f"Order rejected! Reason: {order.get('remarks', 'Unknown')}")
+            # Implement retry logic or alternative strategy
+    
+    def on_position_event(self, ws, position):
+        symbol = position['tradingSymbol']
+        self.positions[symbol] = position
+        
+        # Monitor position changes
+        print(f"Position {symbol}: Qty={position['netQty']}, PnL={position.get('unrealisedPnlToday', 0)}")
+        
+        # Implement stop-loss or take-profit logic
+        pnl = position.get('unrealisedPnlToday', 0)
+        if pnl < -100:  # Stop loss at -100
+            print(f"Stop loss triggered for {symbol}")
+            # Place exit order
+        elif pnl > 200:  # Take profit at 200
+            print(f"Take profit triggered for {symbol}")
+            # Place exit order
+    
+    def on_trade_event(self, ws, trade):
+        print(f"Trade executed: {trade['qty']} @ {trade['avgPrice']}")
+        # Update internal trade log, calculate VWAP, etc.
+
+# Initialize strategy
+strategy = EventDrivenStrategy()
+
+# Set up client with strategy handlers
+client = QuotesClient(base_url="wss://...", token="...")
+client.on_order = strategy.on_order_event
+client.on_position = strategy.on_position_event
+client.on_trade = strategy.on_trade_event
+
+client.connect()
+```
+
 ### Complete Examples
 
 #### Blocking Example
@@ -425,6 +767,7 @@ Available constants:
 - Transaction types: `TRANSACTION_TYPE_BUY`, `TRANSACTION_TYPE_SELL`
 - Product types: `PRODUCT_CNC`, `PRODUCT_MIS`, `PRODUCT_NRML`
 - Order types: `ORDER_TYPE_MARKET`, `ORDER_TYPE_LIMIT`, `ORDER_TYPE_SL`, `ORDER_TYPE_SLM`
+- Order status: `ORDER_STATUS_OPEN`, `ORDER_STATUS_CANCELLED`, `ORDER_STATUS_REJECTED`, `ORDER_STATUS_PENDING`, `ORDER_STATUS_COMPLETED`
 - Validity types: `VALIDITY_DAY`, `VALIDITY_IOC`, `VALIDITY_GTT`
 - Variety types: `VARIETY_REGULAR`, `VARIETY_AMO`, `VARIETY_BO`, `VARIETY_CO`
 - Exchanges: `EXCHANGE_NSE`, `EXCHANGE_BSE`, `EXCHANGE_WZR`

wiz_trader-0.36.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+wiz_trader/__init__.py,sha256=hOpsoebZsI_XebFP-JQ-CenvIShBGtVDsJhl72ARJxU,183
+wiz_trader/apis/__init__.py,sha256=6sUr1nzmplNdld0zryMrQSt0jHT2GhOiFYgKKVHzk8U,133
+wiz_trader/apis/client.py,sha256=znwlyDIHbaiQuDqxp7pn1NPiiYB99oA74JWt4AiLkBg,80088
+wiz_trader/quotes/__init__.py,sha256=RF9g9CNP6bVWlmCh_ad8krm3-EWOIuVfLp0-H9fAeEM,108
+wiz_trader/quotes/client.py,sha256=cAGaysLCljZilYgX8Sf3V88F6dWlcewJf6TMOpSKb7I,20862
+wiz_trader-0.36.0.dist-info/METADATA,sha256=AYUF296FcogkDFjLk5WDhVeAaGvH1PhO8Gyl1g4aH3Q,155156
+wiz_trader-0.36.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wiz_trader-0.36.0.dist-info/top_level.txt,sha256=lnYS_g8LlA6ryKYnvY8xIQ6K2K-xzOsd-99AWgnW6VY,11
+wiz_trader-0.36.0.dist-info/RECORD,,

wiz_trader-0.35.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-wiz_trader/__init__.py,sha256=mvDJsObXpYGcnLwfpMITtZeAouMb_YHNW0Tqse0V0bg,183
-wiz_trader/apis/__init__.py,sha256=6sUr1nzmplNdld0zryMrQSt0jHT2GhOiFYgKKVHzk8U,133
-wiz_trader/apis/client.py,sha256=znwlyDIHbaiQuDqxp7pn1NPiiYB99oA74JWt4AiLkBg,80088
-wiz_trader/quotes/__init__.py,sha256=RF9g9CNP6bVWlmCh_ad8krm3-EWOIuVfLp0-H9fAeEM,108
-wiz_trader/quotes/client.py,sha256=aZ5LVlrj0mKfgHgFxERmk2HDZraB6RMaormTOMlqWZc,14915
-wiz_trader-0.35.0.dist-info/METADATA,sha256=0aBskcZN4xpphpCtQMO9oAYIjwgboe9nmcpcywuKrXg,144695
-wiz_trader-0.35.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wiz_trader-0.35.0.dist-info/top_level.txt,sha256=lnYS_g8LlA6ryKYnvY8xIQ6K2K-xzOsd-99AWgnW6VY,11
-wiz_trader-0.35.0.dist-info/RECORD,,