quantplay 2.1.128__tar.gz → 2.1.129__tar.gz

{quantplay-2.1.128 → quantplay-2.1.129}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quantplay
-Version: 2.1.128
+Version: 2.1.129
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 

{quantplay-2.1.128 → quantplay-2.1.129}/quantplay/broker/jainam_xts.py

@@ -23,6 +23,34 @@ XTS_LOGIN_URL_MAP = {
 }
 
 
+# XTS Type B vs Type C differences
+# =================================
+#
+# TYPE B (smpb.jainam.in:4143)
+#   - dealer_login: isInvestorClient=False
+#   - self.ClientID is masked to "*****" after login
+#   - XTS accepts "*****" as clientID for place_order → orders go through
+#   - orders/positions use dealer endpoints (get_dealer_orderbook, etc.)
+#     with clientID=None, returning all sub-client orders
+#
+# TYPE C (smpc.jainam.in:14543)
+#   - dealer_login: isInvestorClient=False
+#   - self.ClientID is set to the DEALER ID from login (e.g. "JSR129A42")
+#   - XTS accepts clientID=dealer_id and returns "success" BUT the order
+#     is SILENTLY DROPPED — it never appears in any orderbook
+#   - get_order_book(clientID=dealer_id) returns "Supplied client not
+#     mapped under dealer"
+#   - place_order requires the SUB-CLIENT ID (e.g. "JSR129") which is
+#     the actual trading account mapped under the dealer
+#   - orders/positions work fine because they use dealer endpoints with
+#     clientID=None, which returns all sub-client orders
+#
+# FIX: For type C dealers, we discover the sub-client ID by fetching
+# the dealer orderbook after login and extracting the ClientID from
+# the most recent order. This is stored as self.dealer_client_id and
+# used for place_order, modify_order, cancel_order instead of
+# self.ClientID.
+#
 class Jainam(XTS):
     def __init__(
         self,
@@ -38,6 +66,8 @@ class Jainam(XTS):
         XTS_type: Literal["A", "B", "C"] = "A",
         proxies: dict[str, str] | None = None,
     ) -> None:
+        self.XTS_type = XTS_type
+
         # XTS type C dealers route through the broker's own infra; an
         # outbound proxy is unnecessary and just adds latency/failure modes.
         if XTS_type == "C":
@@ -57,11 +87,49 @@ class Jainam(XTS):
             proxies=proxies,
         )
 
+        # Type B: mask to "*****" — XTS accepts it for place_order.
+        # Type C: keep the dealer ID for read operations, but discover
+        # the sub-client ID for write operations (see _discover_client).
         if is_dealer and XTS_type != "C":
             self.ClientID = "*****"
 
+        self.dealer_client_id: str | None = None
+        if is_dealer and XTS_type == "C":
+            self._discover_sub_client()
+
         self.ORDER_POLLING_INTERVAL = 5
 
+    @property
+    def order_client_id(self) -> str:
+        """Type C: use sub-client ID. Type B: use ***** (from self.ClientID)."""
+        if self.XTS_type == "C" and self.dealer_client_id:
+            return self.dealer_client_id
+        return self.ClientID
+
+    def _discover_sub_client(self) -> None:
+        """For type C dealers, discover the sub-client ID from the orderbook.
+
+        XTS type C silently drops orders placed with clientID=<dealer_id>.
+        The actual trading client (e.g. "JSR129") is a sub-account mapped
+        under the dealer. We find it by fetching the dealer orderbook and
+        extracting the ClientID from the most recent order.
+        """
+        try:
+            resp = self.wrapper.get_dealer_orderbook()
+            if (
+                resp.get("type") == "success"
+                and resp.get("result")
+                and len(resp["result"]) > 0
+            ):
+                # Get the most recent order's ClientID
+                latest = max(
+                    resp["result"],
+                    key=lambda x: x.get("AppOrderID", 0),
+                )
+                self.dealer_client_id = latest.get("ClientID")
+        except Exception:
+            pass  # No orders yet or API error — fall back to dealer ID
+
     def login(
         self, api_key: str, api_secret: str, md_api_key: str, md_api_secret: str
     ) -> None:

{quantplay-2.1.128 → quantplay-2.1.129}/quantplay/broker/xts.py

@@ -178,6 +178,15 @@ class XTS(Broker):
 
         self.initialize_broker_symbol_map()
 
+    @property
+    def order_client_id(self) -> str:
+        """Client ID for write operations (place_order, modify_order).
+
+        For most brokers this is self.ClientID.  Jainam type C overrides
+        this to return the sub-client ID instead of the dealer ID.
+        """
+        return self.ClientID
+
     def login(self, api_key: str, api_secret: str, md_api_key: str, md_api_secret: str):
         try:
             self.wrapper = XTSConnect(
@@ -672,7 +681,7 @@ class XTS(Broker):
                 orderSide=transaction_type,
                 productType=product,
                 orderUniqueIdentifier=tag,
-                clientID=self.ClientID,
+                clientID=self.order_client_id,
             )
         Constants.logger.info(f"[XTS_PLACE_ORDER_RESPONSE] {api_response}")
 
@@ -759,7 +768,7 @@ class XTS(Broker):
                 modifiedProductType=product,
                 modifiedStopPrice=trigger_price,
                 orderUniqueIdentifier=tag,
-                clientID=self.ClientID,
+                clientID=self.order_client_id,
             )
 
         if api_response["type"] == "error":

{quantplay-2.1.128 → quantplay-2.1.129}/quantplay.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quantplay
-Version: 2.1.128
+Version: 2.1.129
 Summary: This python package will be stored in AWS CodeArtifact
 Home-page: 
 Author: 

{quantplay-2.1.128 → quantplay-2.1.129}/setup.py

@@ -21,7 +21,7 @@ requirements = [
 setup(
     name="quantplay",
     long_description=Path("README.md").read_text(),
-    version="2.1.128",
+    version="2.1.129",
     install_requires=requirements,
     tests_require=[],
     packages=find_packages(),