tradingapi 0.1.7__tar.gz → 0.2.1__tar.gz

{tradingapi-0.1.7 → tradingapi-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradingapi
-Version: 0.1.7
+Version: 0.2.1
 Summary: Trade integration with brokers
 Author-email: Pankaj Sharma <sharma.pankaj.kumar@gmail.com>
 License-Expression: MIT
@@ -259,6 +259,19 @@ ICICIDIRECT:
   USERTOKEN_MAX_AGE_HOURS: 20
   AUTO_SESSION_TOKEN_CMD: "icicidirect-generate-session --api-key \"${ICICI_API_KEY}\" --user-id \"${ICICI_USER_ID}\" --password \"${ICICI_PASSWORD}\" --totp-token \"${ICICI_TOTP_TOKEN}\"" # Optional non-interactive token command
   SYMBOLCODES: "/path/to/icicidirect/symbols"
+
+# Dhan Broker Configuration
+DHAN:
+  CLIENT_ID: "your_client_id"
+  ACCESS_TOKEN: "your_access_token" # Optional fallback if TOTP/PIN flow is not used
+  TOTP_TOKEN: "your_totp_token" # Optional: used for auto token refresh
+  PIN: "your_pin" # Optional: used for auto token refresh
+  USERTOKEN: "/path/to/dhan_token.txt" # Optional token cache file
+  SYMBOLCODES: "/path/to/dhan/symbols"
+  QUOTE_RATE_LIMIT_REDIS_DB: 4 # Optional: dedicated Redis DB for global quote limiter
+  QUOTE_RATE_LIMIT_RPS: 1 # Optional: quote API limit in requests/second
+  HISTORICAL_RATE_LIMIT_RPS: 10 # Optional: historical API limit in requests/second
+  REQUEST_STREAMING_DATA_RATE_LIMIT_RPS: 10 # Optional: streaming subscription request rate in requests/second
 ```
 
 #### ICICIDirect fully automated session-token refresh (no copy/paste)

{tradingapi-0.1.7 → tradingapi-0.2.1}/README.md

@@ -240,6 +240,19 @@ ICICIDIRECT:
   USERTOKEN_MAX_AGE_HOURS: 20
   AUTO_SESSION_TOKEN_CMD: "icicidirect-generate-session --api-key \"${ICICI_API_KEY}\" --user-id \"${ICICI_USER_ID}\" --password \"${ICICI_PASSWORD}\" --totp-token \"${ICICI_TOTP_TOKEN}\"" # Optional non-interactive token command
   SYMBOLCODES: "/path/to/icicidirect/symbols"
+
+# Dhan Broker Configuration
+DHAN:
+  CLIENT_ID: "your_client_id"
+  ACCESS_TOKEN: "your_access_token" # Optional fallback if TOTP/PIN flow is not used
+  TOTP_TOKEN: "your_totp_token" # Optional: used for auto token refresh
+  PIN: "your_pin" # Optional: used for auto token refresh
+  USERTOKEN: "/path/to/dhan_token.txt" # Optional token cache file
+  SYMBOLCODES: "/path/to/dhan/symbols"
+  QUOTE_RATE_LIMIT_REDIS_DB: 4 # Optional: dedicated Redis DB for global quote limiter
+  QUOTE_RATE_LIMIT_RPS: 1 # Optional: quote API limit in requests/second
+  HISTORICAL_RATE_LIMIT_RPS: 10 # Optional: historical API limit in requests/second
+  REQUEST_STREAMING_DATA_RATE_LIMIT_RPS: 10 # Optional: streaming subscription request rate in requests/second
 ```
 
 #### ICICIDirect fully automated session-token refresh (no copy/paste)

{tradingapi-0.1.7 → tradingapi-0.2.1}/pyproject.toml

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

{tradingapi-0.1.7 → tradingapi-0.2.1}/tradingapi/__init__.py

@@ -144,6 +144,13 @@ class TradingAPILogger:
         for handler in handlers:
             self.logger.addHandler(handler)
 
+        # Child loggers (e.g. tradingapi.utils) propagate here; without this, the same
+        # record also reaches root and duplicates when root has its own handlers.
+        if handlers:
+            self.logger.propagate = False
+        else:
+            self.logger.propagate = True
+
         self._configured = True
 
         # Log configuration
@@ -180,13 +187,26 @@ class TradingAPILogger:
             pass
         return {}
 
+    def _sanitize_extra(self, context: Optional[dict] = None) -> dict:
+        """Rename reserved LogRecord keys in extra context to avoid logging failures."""
+        extra = dict(context or {})
+        reserved_keys = set(logging.makeLogRecord({}).__dict__.keys()) | {
+            "message",
+            "asctime",
+        }
+        sanitized = {}
+        for key, value in extra.items():
+            new_key = f"context_{key}" if key in reserved_keys else key
+            sanitized[new_key] = value
+        return sanitized
+
     def log_error(
         self, message: str, error: Optional[Exception] = None, context: Optional[dict] = None, exc_info: bool = True
     ):
         """Log an error with structured context. Extra values are sanitized to single-line so
         parse_log_errors.py can reliably match the ERROR line (same format as other tradingapi logs).
         """
-        extra = context or {}
+        extra = self._sanitize_extra(context)
         if error:
             extra["error_type"] = type(error).__name__
             # Keep error_message single-line so the log line matches parse_log_errors structured format
@@ -206,7 +226,7 @@ class TradingAPILogger:
 
     def log_warning(self, message: str, context: Optional[dict] = None):
         """Log a warning with structured context."""
-        extra = context or {}
+        extra = self._sanitize_extra(context)
 
         # Add caller information
         caller_info = self._get_caller_info()
@@ -216,7 +236,7 @@ class TradingAPILogger:
 
     def log_info(self, message: str, context: Optional[dict] = None):
         """Log an info message with structured context."""
-        extra = context or {}
+        extra = self._sanitize_extra(context)
 
         # Add caller information
         caller_info = self._get_caller_info()
@@ -226,7 +246,7 @@ class TradingAPILogger:
 
     def log_debug(self, message: str, context: Optional[dict] = None):
         """Log a debug message with structured context."""
-        extra = context or {}
+        extra = self._sanitize_extra(context)
 
         # Add caller information
         caller_info = self._get_caller_info()
@@ -262,7 +282,9 @@ def configure_logging(
         backup_count: Number of log files to keep.
         format_string: Custom format string for log messages.
         enable_structured_logging: Enable structured logging with additional context.
-        configure_root_logger: Whether to configure the root logger (can cause duplicate logs if True).
+        configure_root_logger: If True, attach the same handlers to the root logger (for third-party
+            loggers). The ``tradingapi`` logger sets propagate=False when it has handlers, so package
+            messages are not written twice when root is also configured.
     """
     trading_logger.configure(
         level=level,

{tradingapi-0.1.7 → tradingapi-0.2.1}/tradingapi/broker_base.py

@@ -1,6 +1,5 @@
 import datetime as dt
 import json
-import logging
 import math
 from abc import ABC, abstractmethod
 from dataclasses import asdict, dataclass
@@ -11,10 +10,6 @@ import pandas as pd
 import pytz
 import redis
 
-from chameli.dateutils import parse_datetime
-
-logger = logging.getLogger(__name__)
-
 from .exceptions import (
     TradingAPIError,
     BrokerConnectionError,
@@ -26,8 +21,12 @@ from .exceptions import (
     create_error_context,
 )
 from .error_handling import retry_on_error, safe_execute, log_execution_time, handle_broker_errors, validate_inputs
+from chameli.dateutils import parse_datetime
 
-# Removed trading_logger import to avoid circular import issues
+
+def _get_trading_logger():
+    from tradingapi import trading_logger
+    return trading_logger
 
 NEXT_DAY_TIMESTAMP = int((get_tradingapi_now() + dt.timedelta(days=1)).timestamp())
 
@@ -292,9 +291,9 @@ class Order:
         try:
             # Handle None values
             if value is None:
-                logger.warning(
+                _get_trading_logger().log_warning(
                     "Received None value, returning 0",
-                    extra={"value": value, "default": 0, "method": "_convert_to_int", "argument_name": argument_name},
+                    context={"value": value, "default": 0, "method": "_convert_to_int", "argument_name": argument_name},
                 )
                 return 0
 
@@ -311,9 +310,9 @@ class Order:
                 # Strip whitespace and handle empty strings
                 value = value.strip()
                 if not value:
-                    logger.warning(
+                    _get_trading_logger().log_warning(
                         "Empty string value, returning 0",
-                        extra={
+                        context={
                             "value": repr(value),
                             "default": 0,
                             "method": "_convert_to_int",
@@ -326,9 +325,9 @@ class Order:
                     # Try to convert string to float first, then to int
                     return int(float(value))
                 except ValueError:
-                    logger.warning(
+                    _get_trading_logger().log_warning(
                         "Failed to convert string to int",
-                        extra={
+                        context={
                             "value": repr(value),
                             "default": 0,
                             "method": "_convert_to_int",
@@ -343,9 +342,9 @@ class Order:
                     # Convert object to string and then to number
                     str_value = str(value).strip()
                     if not str_value:
-                        logger.warning(
+                        _get_trading_logger().log_warning(
                             "Object converted to empty string, returning 0",
-                            extra={
+                            context={
                                 "value": repr(value),
                                 "value_type": type(value).__name__,
                                 "default": 0,
@@ -357,9 +356,9 @@ class Order:
 
                     return int(float(str_value))
                 except (ValueError, TypeError):
-                    logger.warning(
+                    _get_trading_logger().log_warning(
                         "Failed to convert object to int",
-                        extra={
+                        context={
                             "value": repr(value),
                             "value_type": type(value).__name__,
                             "default": 0,
@@ -370,10 +369,10 @@ class Order:
                     return 0
 
         except Exception as e:
-            logger.error(
+            _get_trading_logger().log_error(
                 "Error converting value to int",
-                exc_info=True,
-                extra={
+                e,
+                context={
                     "value": repr(value),
                     "value_type": type(value).__name__,
                     "method": "_convert_to_int",
@@ -390,9 +389,9 @@ class Order:
         try:
             # Handle None values
             if value is None:
-                logger.warning(
+                _get_trading_logger().log_warning(
                     "Received None value, returning NaN",
-                    extra={
+                    context={
                         "value": value,
                         "default": float("nan"),
                         "method": "_convert_to_float",
@@ -410,9 +409,9 @@ class Order:
                 # Strip whitespace and handle empty strings
                 value = value.strip()
                 if not value:
-                    logger.warning(
+                    _get_trading_logger().log_warning(
                         "Empty string value, returning NaN",
-                        extra={
+                        context={
                             "value": repr(value),
                             "default": float("nan"),
                             "method": "_convert_to_float",
@@ -424,9 +423,9 @@ class Order:
                 try:
                     return float(value)
                 except ValueError:
-                    logger.warning(
+                    _get_trading_logger().log_warning(
                         "Failed to convert string to float",
-                        extra={
+                        context={
                             "value": repr(value),
                             "default": float("nan"),
                             "method": "_convert_to_float",
@@ -441,9 +440,9 @@ class Order:
                     # Convert object to string and then to number
                     str_value = str(value).strip()
                     if not str_value:
-                        logger.warning(
+                        _get_trading_logger().log_warning(
                             "Object converted to empty string, returning NaN",
-                            extra={
+                            context={
                                 "value": repr(value),
                                 "value_type": type(value).__name__,
                                 "default": float("nan"),
@@ -455,9 +454,9 @@ class Order:
 
                     return float(str_value)
                 except (ValueError, TypeError):
-                    logger.warning(
+                    _get_trading_logger().log_warning(
                         "Failed to convert object to float",
-                        extra={
+                        context={
                             "value": repr(value),
                             "value_type": type(value).__name__,
                             "default": float("nan"),
@@ -468,10 +467,10 @@ class Order:
                     return float("nan")
 
         except Exception as e:
-            logger.error(
+            _get_trading_logger().log_error(
                 "Error converting value to float",
-                exc_info=True,
-                extra={
+                e,
+                context={
                     "value": repr(value),
                     "value_type": type(value).__name__,
                     "method": "_convert_to_float",
@@ -494,10 +493,10 @@ class Order:
             else:
                 return False
         except Exception as e:
-            logger.error(
+            _get_trading_logger().log_error(
                 "Error converting value to bool",
-                exc_info=True,
-                extra={
+                e,
+                context={
                     "value": value,
                     "value_type": type(value).__name__,
                     "method": "_convert_to_bool",
@@ -722,9 +721,9 @@ class BrokerBase(ABC):
         try:
             self._validate_config(kwargs)
             self._initialize_broker(kwargs)
-            logger.info(
+            _get_trading_logger().log_info(
                 "Broker initialized successfully",
-                extra={"broker_type": self.__class__.__name__, "config_keys": list(kwargs.keys())},
+                context={"broker_type": self.__class__.__name__, "config_keys": list(kwargs.keys())},
             )
         except Exception as e:
             context = create_error_context(
@@ -738,9 +737,9 @@ class BrokerBase(ABC):
             raise ValidationError("Configuration must be a dictionary")
 
         # Add specific validation logic for each broker type
-        logger.debug(
+        _get_trading_logger().log_debug(
             "Validating broker configuration",
-            extra={"broker_type": self.__class__.__name__, "config_keys": list(config.keys())},
+            context={"broker_type": self.__class__.__name__, "config_keys": list(config.keys())},
         )
 
     def _initialize_broker(self, config: dict):
@@ -835,7 +834,11 @@ class BrokerBase(ABC):
         Modify an existing order.
 
         Args:
-            **kwargs: Order modification parameters
+            **kwargs:
+                broker_order_id (str): Broker order ID to modify.
+                new_price (float): New limit price (0 for market).
+                new_quantity (int): New total quantity.
+                order (Order, optional): Order object to bootstrap Redis state if not cached.
 
         Returns:
             Order: Updated order object
@@ -1071,3 +1074,18 @@ class BrokerBase(ABC):
             MarketDataError: If balance retrieval fails
         """
         pass
+
+    def get_margin_requirement(
+        self, combo_symbol: str, order_size: int, exchange: str = "NSE", mds: Optional[str] = None
+    ) -> Optional[float]:
+        """Default broker margin hook. Brokers can override if supported."""
+        _get_trading_logger().log_warning(
+            "get_margin_requirement not implemented for broker",
+            context={
+                "broker_type": self.__class__.__name__,
+                "combo_symbol": combo_symbol,
+                "order_size": order_size,
+                "exchange": exchange,
+            },
+        )
+        return None

{tradingapi-0.1.7 → tradingapi-0.2.1}/tradingapi/config/config_sample.yaml

@@ -20,6 +20,7 @@ commissions:
     file: "commissions_20241216.yaml"
 
 FIVEPAISA:
+  EXCHANGES: [NSE, BSE, MCX]
   USE_PROXY: false
   APP_NAME:
   APP_SOURCE:
@@ -33,7 +34,12 @@ FIVEPAISA:
   SYMBOLCODES:
   USERTOKEN:
 
+# Additional FivePaisa accounts (optional). Pass as account= to FivePaisa().
+# FIVEPAISA_ACCOUNT2:
+#   ... (same keys as FIVEPAISA above)
+
 SHOONYA:
+  EXCHANGES: [NSE, BSE, MCX]
   USE_PROXY: false
   USER:
   PWD:
@@ -43,7 +49,12 @@ SHOONYA:
   SYMBOLCODES: "/home/psharma/onedrive/rfiles/data/static/shoonya_symbols"
   USERTOKEN:
 
+# Additional Shoonya accounts (optional). Pass as account= to Shoonya().
+# SHOONYA_ACCOUNT2:
+#   ... (same keys as SHOONYA above)
+
 ICICIDIRECT:
+  EXCHANGES: [NSE, BSE, MCX]
   USE_PROXY: false
   API_KEY:
   API_SECRET:
@@ -72,3 +83,37 @@ ICICIDIRECT:
   #   --totp-token "${ICICI_TOTP_TOKEN}"
   SYMBOL_MASTER_URL: # Optional: symbol master zip url
   SYMBOLCODES:
+
+# Additional ICICIDirect accounts (optional). Pass as account= to IciciDirect().
+# ICICIDIRECT_ACCOUNT2:
+#   ... (same keys as ICICIDIRECT above)
+
+DHAN:
+  EXCHANGES: [NSE, BSE]
+  USE_PROXY: false
+  CLIENT_ID:
+  ACCESS_TOKEN: # Optional fallback if TOTP/PIN flow is not used
+  TOTP_TOKEN: # Optional: used for auto token refresh
+  PIN: # Optional: used for auto token refresh
+  USERTOKEN: # Optional: token cache file path
+  SYMBOLCODES:
+  QUOTE_RATE_LIMIT_REDIS_DB: 4 # Optional: dedicated Redis DB for global quote limiter
+  QUOTE_RATE_LIMIT_RPS: 1 # Optional: quote API limit in requests/second
+  HISTORICAL_RATE_LIMIT_RPS: 10 # Optional: historical API limit in requests/second
+  REQUEST_STREAMING_DATA_RATE_LIMIT_RPS: 10 # Optional: streaming subscription request rate in requests/second
+
+# Additional DHAN accounts (optional). Name can be anything; pass as account= to Dhan().
+# Example: dh2 = Dhan(account="DHAN_ACCOUNT2"); dh2.connect(redis_db=5)
+DHAN_ACCOUNT2:
+  EXCHANGES: [NSE, BSE]
+  USE_PROXY: false
+  CLIENT_ID:
+  ACCESS_TOKEN:
+  TOTP_TOKEN:
+  PIN:
+  USERTOKEN:
+  SYMBOLCODES:
+  QUOTE_RATE_LIMIT_REDIS_DB: 5
+  QUOTE_RATE_LIMIT_RPS: 1
+  HISTORICAL_RATE_LIMIT_RPS: 10
+  REQUEST_STREAMING_DATA_RATE_LIMIT_RPS: 10