tradingapi 0.3.4__tar.gz → 0.3.5__tar.gz

{tradingapi-0.3.4 → tradingapi-0.3.5}/PKG-INFO

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

{tradingapi-0.3.4 → tradingapi-0.3.5}/pyproject.toml

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

{tradingapi-0.3.4 → tradingapi-0.3.5}/tradingapi/allocation.py

@@ -21,13 +21,15 @@ _ALLOCATIONS_DIR = Path(os.path.expanduser("~/onedrive/.tradingapi/allocations")
 _TODAY_SYMLINK = _ALLOCATIONS_DIR / "master_allocation_today.yaml"
 
 
-def load_today_allocation(broker_name: str, strategy_name: str) -> float:
-    """Return the pct (0.0–1.0) allocated to strategy_name on broker_name today.
+def load_today_allocation_entry(broker_name: str, strategy_name: str) -> dict:
+    """Return the full allocation entry dict for strategy_name on broker_name today.
+
+    Example return value: {'pct': 0.275, 'redis_db': 8}
+    SCALPING strategies include a 'redis_db' key; others have only 'pct'.
 
     Reads master_allocation_today.yaml (a symlink to today's dated file).
     Raises FileNotFoundError if the symlink/file is missing.
     Raises ValueError if the date in the file does not match today.
-    Returns 0.0 if the strategy is listed with pct == 0 (inactive today).
     Raises KeyError if the broker/strategy is not found in the file at all.
     """
     if not _TODAY_SYMLINK.exists():
@@ -63,7 +65,19 @@ def load_today_allocation(broker_name: str, strategy_name: str) -> float:
             f"Available strategies: {list(strategies.keys())}"
         )
 
-    entry = strategies[strategy_key]
+    return dict(strategies[strategy_key])
+
+
+def load_today_allocation(broker_name: str, strategy_name: str) -> float:
+    """Return the pct (0.0–1.0) allocated to strategy_name on broker_name today.
+
+    Reads master_allocation_today.yaml (a symlink to today's dated file).
+    Raises FileNotFoundError if the symlink/file is missing.
+    Raises ValueError if the date in the file does not match today.
+    Returns 0.0 if the strategy is listed with pct == 0 (inactive today).
+    Raises KeyError if the broker/strategy is not found in the file at all.
+    """
+    entry = load_today_allocation_entry(broker_name, strategy_name)
     return float(entry.get("pct", 0.0))
 
 

{tradingapi-0.3.4 → tradingapi-0.3.5}/tradingapi/fivepaisa.py

@@ -3860,12 +3860,9 @@ class FivePaisa(BrokerBase):
 
                     # Start the connection and receiving data in a separate thread
                     if not has_live_stream():
-                        self.subscribe_thread = threading.Thread(
-                            target=connect_and_receive, args=(req_data,), name="MarketDataStreamer"
-                        )
-                        self.subscribe_thread.start()
-                        time.sleep(2)
-                        trading_logger.log_info("Streaming thread started", {"thread_name": "MarketDataStreamer"})
+                        # WS is dead — full reconnect restoring all subscribed_symbols (already updated above).
+                        # Connecting with just the current op's req_data would lose all prior subscriptions.
+                        reconnect_stream()
                     else:
                         trading_logger.log_info(
                             "Requesting streaming for existing connection", {"req_data": json.dumps(req_data)}

{tradingapi-0.3.4 → tradingapi-0.3.5}/tradingapi/utils.py

@@ -93,7 +93,7 @@ empty_trades = pd.DataFrame(
         "exit_time": pd.Series(dtype="string"),
         "exit_quantity": pd.Series(dtype="float64"),
         "exit_price": pd.Series(dtype="float64"),
-        "commission": pd.Series(dtype="int64"),
+        "commission": pd.Series(dtype="float64"),
         "int_order_id": pd.Series(dtype="object"),
         "entry_keys": pd.Series(dtype="object"),
         "exit_keys": pd.Series(dtype="object"),

{tradingapi-0.3.4 → tradingapi-0.3.5}/tradingapi.egg-info/PKG-INFO

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