tradingapi 0.3.1__tar.gz → 0.3.3__tar.gz

{tradingapi-0.3.1 → tradingapi-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradingapi
-Version: 0.3.1
+Version: 0.3.3
 Summary: Trade integration with brokers
 Author-email: Pankaj Sharma <sharma.pankaj.kumar@gmail.com>
 License-Expression: MIT

{tradingapi-0.3.1 → tradingapi-0.3.3}/pyproject.toml

@@ -28,7 +28,7 @@ packages = ["tradingapi"]
 
 [project]
 name = "tradingapi"
-version = "0.3.1"
+version = "0.3.3"
 description = "Trade integration with brokers"
 readme = "README.md"
 license = "MIT"

{tradingapi-0.3.1 → tradingapi-0.3.3}/tradingapi/fivepaisa.py

@@ -37,60 +37,51 @@ from py5paisa import FivePaisaClient
 
 
 def _patch_py5paisa_for_mom(api) -> None:
-    """Fix three upstream py5paisa bugs that break multi_order_Margin:
-
-      1. session is httpx.Client with 5s default timeout. Bump to 10s as a
-         safety margin (normal MOM responses are sub-second).
-      2. self.payload = GENERIC_PAYLOAD is a reference assignment, so each
-         call accumulates stale body keys across calls; the polluted body
-         makes the 5paisa server hang past 5s. Reset to a fresh deep copy
-         before each MOM call.
-      3. order_request() does res["body"]["Message"] for MOM, but the MOM
-         response has no "Message" key — KeyError is raised at the subscript,
-         swallowed by the bare except, and the function silently returns None.
-         Replace order_request for the MOM case to extract res["body"] directly
-         without touching "Message".
+    """Replace api.multi_order_Margin to bypass three upstream py5paisa bugs:
+
+      1. self.payload = GENERIC_PAYLOAD is a reference assignment shared across
+         every py5paisa method, so concurrent calls (status, balance, place_order)
+         clobber the MOM body between build and POST. Build payload locally.
+      2. order_request() does res["body"]["Message"] for MOM, but MOM responses
+         have no "Message" key — KeyError is swallowed by a bare except and the
+         function silently returns None. POST directly and read body.
+      3. Default 5s read timeout is too tight for SENSEX MOM under load.
+         Use a per-call 10s timeout (does not affect other API calls).
     """
     if getattr(api, "_tradingapi_patched", False):
         return
 
     import copy
-    from py5paisa.const import GENERIC_PAYLOAD
+    import httpx
+    from py5paisa.const import GENERIC_PAYLOAD, HEADERS
 
-    try:
-        api.session.timeout = 10
-    except Exception:
-        pass
+    # Dedicated session for MOM — never shares the pool with api.session,
+    # which other py5paisa calls (balance, order status, etc.) use concurrently.
+    mom_session = httpx.Client(verify=False, timeout=10)
 
-    original_order_request = api.order_request
+    def fixed_multi_order_Margin(**order):
+        payload = copy.deepcopy(GENERIC_PAYLOAD)
+        payload["body"]["ClientCode"] = api.client_code
+        payload["head"]["key"] = api.USER_KEY
+        for k, v in order.items():
+            payload["body"][k] = v
 
-    def safe_order_request(req_type):
-        if req_type != "MOM":
-            return original_order_request(req_type)
+        token = api.access_token or api.Jwt_token
+        headers = dict(HEADERS)
+        headers["Authorization"] = f"Bearer {token}"
+        headers["5Paisa-API-Uid"] = api.APIUID
         try:
-            api.payload["body"]["ClientCode"] = api.client_code
-            api.payload["head"]["key"] = api.USER_KEY
-            from py5paisa.const import HEADERS
-            token = api.access_token or api.Jwt_token
-            headers = dict(HEADERS)
-            headers["Authorization"] = f"Bearer {token}"
-            headers["5Paisa-API-Uid"] = api.APIUID
-            res = api.session.post(api.MULTIORDERMARGIN_ROUTE, json=api.payload, headers=headers).json()
-            api.payload = copy.deepcopy(GENERIC_PAYLOAD)
+            res = mom_session.post(
+                api.MULTIORDERMARGIN_ROUTE,
+                json=payload,
+                headers=headers,
+            ).json()
             return res.get("body")
         except Exception as e:
             from . import trading_logger
             trading_logger.log_warning("py5paisa MOM request failed", {"error": repr(e)})
-            api.payload = copy.deepcopy(GENERIC_PAYLOAD)
             return None
 
-    def fixed_multi_order_Margin(**order):
-        api.payload = copy.deepcopy(GENERIC_PAYLOAD)
-        for k, v in order.items():
-            api.payload["body"][k] = v
-        return safe_order_request("MOM")
-
-    api.order_request = safe_order_request
     api.multi_order_Margin = fixed_multi_order_Margin
     api._tradingapi_patched = True
 

{tradingapi-0.3.1 → tradingapi-0.3.3}/tradingapi/utils.py

@@ -3247,7 +3247,7 @@ def find_option_with_delta(
     valid_delta_count = 0
     nan_delta_count = 0
     nan_delta_strikes = []  # track strikes where delta could not be calculated
-    # Cache so seeding sweep + binary search + linear fallback never recompute the same strike.
+    # Cache so seeding sweep + binary search never recompute the same strike.
     delta_cache: dict[int, float] = {}
 
     def _delta_at(idx: int) -> float:
@@ -3296,15 +3296,9 @@ def find_option_with_delta(
             _consider(idx, ad)
 
     if len(seed_samples) < 2:
-        # Too few seeds; fall through to linear scan over the whole chain.
-        for idx in range(n):
-            d = _delta_at(idx)
-            if math.isnan(d):
-                continue
-            _consider(idx, abs(d))
         if best_index < 0:
             trading_logger.log_warning(
-                f"find_option_with_delta: no valid option strike found (linear fallback after seed failure). "
+                f"find_option_with_delta: no valid option strike found (seed failure). "
                 f"price_f={price_f} target_delta={target_delta} return_lower_delta={return_lower_delta} "
                 f"chain_len={n} strike_range=[{strike_lo}, {strike_hi}] "
                 f"valid_delta_count={valid_delta_count} nan_delta_count={nan_delta_count} "
@@ -3333,7 +3327,7 @@ def find_option_with_delta(
         if math.isnan(d):
             alt = _nearest_valid(mid, left, right)
             if alt < 0:
-                # Wide NaN band — bail to linear fallback below.
+                # Wide NaN band: stop here instead of expanding into a full-chain scan.
                 break
             eff_idx = alt
             d = delta_cache[alt]
@@ -3351,17 +3345,6 @@ def find_option_with_delta(
             else:
                 right = eff_idx - 1
 
-    # --- Change 3: linear-scan fallback if binary search failed to land a best ---
-    if best_index < 0:
-        for idx in range(n):
-            if idx in delta_cache:
-                d = delta_cache[idx]
-            else:
-                d = _delta_at(idx)
-            if math.isnan(d):
-                continue
-            _consider(idx, abs(d))
-
     if best_index < 0:
         trading_logger.log_warning(
             f"find_option_with_delta: no valid option strike found. "

{tradingapi-0.3.1 → tradingapi-0.3.3}/tradingapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradingapi
-Version: 0.3.1
+Version: 0.3.3
 Summary: Trade integration with brokers
 Author-email: Pankaj Sharma <sharma.pankaj.kumar@gmail.com>
 License-Expression: MIT