tradingapi 0.1.6__tar.gz → 0.2.0__tar.gz

{tradingapi-0.1.6/tradingapi.egg-info → tradingapi-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradingapi
-Version: 0.1.6
+Version: 0.2.0
 Summary: Trade integration with brokers
 Author-email: Pankaj Sharma <sharma.pankaj.kumar@gmail.com>
 License-Expression: MIT
@@ -14,6 +14,8 @@ Requires-Dist: redis==7.1.0
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: httpx<0.29.0,>=0.25.0
 Requires-Dist: bcrypt<4.0.0
+Requires-Dist: pandas-stubs>=2.0.0
+Requires-Dist: types-redis>=4.6.0
 
 # tradingapi
 
@@ -249,10 +251,46 @@ FLATTRADE:
 ICICIDIRECT:
   API_KEY: "your_api_key"
   API_SECRET: "your_api_secret"
-  API_SESSION_TOKEN: "your_session_token"
+  USER_ID: "your_user_id" # Optional: used by auto token script
+  PASSWORD: "your_password" # Optional: used by auto token script
+  TOTP_TOKEN: "your_totp_seed" # Optional: used by auto token script
+  API_SESSION_TOKEN: "your_session_token" # Optional if you provide one directly
+  USERTOKEN: "/path/to/icicidirect_token.txt" # Optional cache file
+  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"
 ```
 
+#### ICICIDirect fully automated session-token refresh (no copy/paste)
+
+When the package is installed, the `icicidirect-generate-session` CLI is available. Use it as your `AUTO_SESSION_TOKEN_CMD`; it automates login, captures the redirect token, and prints only the session token to stdout.
+
+```bash
+export ICICI_API_KEY="your_api_key"
+export ICICI_USER_ID="your_user_id"
+export ICICI_PASSWORD="your_password"
+export ICICI_TOTP_TOKEN="your_totp_seed"
+
+icicidirect-generate-session \
+  --api-key "$ICICI_API_KEY" \
+  --user-id "$ICICI_USER_ID" \
+  --password "$ICICI_PASSWORD" \
+  --totp-token "$ICICI_TOTP_TOKEN"
+```
+
+Then set:
+
+```yaml
+ICICIDIRECT:
+  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}\""
+  USERTOKEN: "/path/to/icicidirect_token.txt"
+```
+
+Notes:
+- `connect()` executes `AUTO_SESSION_TOKEN_CMD` automatically when no direct/cached token is available.
+- When the package is installed (e.g. `pip install .`), `icicidirect-generate-session` is on PATH. From a source checkout you can run `python -m tradingapi.icicidirect_generate_session`.
+- If `AUTO_SESSION_TOKEN_CMD` is empty and `ICICIDIRECT.AUTO_LOGIN: true`, `connect()` auto-builds a command using `API_KEY/USER_ID/PASSWORD/TOTP_TOKEN` plus optional selector/webdriver overrides.
+
 ### Commission Files
 
 Commission files define broker-specific commission structures. They are YAML files located in the same directory as your main config file. Example structure:

tradingapi-0.1.6/PKG-INFO → tradingapi-0.2.0/README.md

@@ -1,20 +1,3 @@
-Metadata-Version: 2.4
-Name: tradingapi
-Version: 0.1.6
-Summary: Trade integration with brokers
-Author-email: Pankaj Sharma <sharma.pankaj.kumar@gmail.com>
-License-Expression: MIT
-Project-URL: homepage, https://bitbucket.org/incurrency/tradingpapi2
-Project-URL: repository, https://bitbucket.org/incurrency/tradingapi2
-Description-Content-Type: text/markdown
-Requires-Dist: chameli
-Requires-Dist: NorenRestApi==0.0.32
-Requires-Dist: py5paisa==0.7.20
-Requires-Dist: redis==7.1.0
-Requires-Dist: pyotp==2.9.0
-Requires-Dist: httpx<0.29.0,>=0.25.0
-Requires-Dist: bcrypt<4.0.0
-
 # tradingapi
 
 Python package for broker integration with unified interfaces for multiple Indian brokers. Provides comprehensive trading functionality including order placement, historical data access, symbology handling, margin calculations, and commission management.
@@ -249,10 +232,46 @@ FLATTRADE:
 ICICIDIRECT:
   API_KEY: "your_api_key"
   API_SECRET: "your_api_secret"
-  API_SESSION_TOKEN: "your_session_token"
+  USER_ID: "your_user_id" # Optional: used by auto token script
+  PASSWORD: "your_password" # Optional: used by auto token script
+  TOTP_TOKEN: "your_totp_seed" # Optional: used by auto token script
+  API_SESSION_TOKEN: "your_session_token" # Optional if you provide one directly
+  USERTOKEN: "/path/to/icicidirect_token.txt" # Optional cache file
+  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"
 ```
 
+#### ICICIDirect fully automated session-token refresh (no copy/paste)
+
+When the package is installed, the `icicidirect-generate-session` CLI is available. Use it as your `AUTO_SESSION_TOKEN_CMD`; it automates login, captures the redirect token, and prints only the session token to stdout.
+
+```bash
+export ICICI_API_KEY="your_api_key"
+export ICICI_USER_ID="your_user_id"
+export ICICI_PASSWORD="your_password"
+export ICICI_TOTP_TOKEN="your_totp_seed"
+
+icicidirect-generate-session \
+  --api-key "$ICICI_API_KEY" \
+  --user-id "$ICICI_USER_ID" \
+  --password "$ICICI_PASSWORD" \
+  --totp-token "$ICICI_TOTP_TOKEN"
+```
+
+Then set:
+
+```yaml
+ICICIDIRECT:
+  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}\""
+  USERTOKEN: "/path/to/icicidirect_token.txt"
+```
+
+Notes:
+- `connect()` executes `AUTO_SESSION_TOKEN_CMD` automatically when no direct/cached token is available.
+- When the package is installed (e.g. `pip install .`), `icicidirect-generate-session` is on PATH. From a source checkout you can run `python -m tradingapi.icicidirect_generate_session`.
+- If `AUTO_SESSION_TOKEN_CMD` is empty and `ICICIDIRECT.AUTO_LOGIN: true`, `connect()` auto-builds a command using `API_KEY/USER_ID/PASSWORD/TOTP_TOKEN` plus optional selector/webdriver overrides.
+
 ### Commission Files
 
 Commission files define broker-specific commission structures. They are YAML files located in the same directory as your main config file. Example structure:

{tradingapi-0.1.6 → tradingapi-0.2.0}/pyproject.toml

@@ -12,7 +12,7 @@ module = ["yaml", "pytz","requests"]
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
-module = ["numpy", "pyreadr", "rpy2", "pandas", "scipy","redis"]
+module = ["numpy", "pyreadr", "rpy2", "scipy"]
 ignore_missing_imports = true
 
 [build-system]
@@ -21,13 +21,14 @@ build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
 include-package-data = true
+packages = ["tradingapi"]
 
 [tool.setuptools.package-data]
-"tradingapi2" = ["config/config_sample.yaml", "config/commissions_20241216.yaml"]
+"tradingapi" = ["config/config_sample.yaml", "config/commissions_20241216.yaml"]
 
 [project]
 name = "tradingapi"
-version = "0.1.6"
+version = "0.2.0"
 description = "Trade integration with brokers"
 readme = "README.md"
 license = "MIT"
@@ -41,9 +42,14 @@ dependencies = [
     "redis==7.1.0",
     "pyotp==2.9.0",
     "httpx>=0.25.0,<0.29.0",
-    "bcrypt<4.0.0"
+    "bcrypt<4.0.0",
+    "pandas-stubs>=2.0.0",
+    "types-redis>=4.6.0"
 ]
 
+[project.scripts]
+icicidirect-generate-session = "tradingapi.icicidirect_generate_session:main"
+
 [project.urls]
 homepage = "https://bitbucket.org/incurrency/tradingpapi2"
 repository = "https://bitbucket.org/incurrency/tradingapi2"

{tradingapi-0.1.6 → tradingapi-0.2.0}/tradingapi/__init__.py

@@ -157,7 +157,7 @@ class TradingAPILogger:
             },
         )
 
-    def get_logger(self, name: str = None) -> logging.Logger:
+    def get_logger(self, name: Optional[str] = None) -> logging.Logger:
         """Get a logger instance with the specified name."""
         if name:
             return logging.getLogger(f"tradingapi.{name}")
@@ -167,8 +167,9 @@ class TradingAPILogger:
         """Get information about the calling function."""
         try:
             # Get the caller frame (skip this method and the logging method)
-            caller_frame = inspect.currentframe().f_back.f_back
-            if caller_frame:
+            current_frame = inspect.currentframe()
+            if current_frame and current_frame.f_back and current_frame.f_back.f_back:
+                caller_frame = current_frame.f_back.f_back
                 info = inspect.getframeinfo(caller_frame)
                 return {
                     "caller_filename": info.filename,
@@ -179,22 +180,46 @@ class TradingAPILogger:
             pass
         return {}
 
-    def log_error(self, message: str, error: Exception = None, context: dict = None, exc_info: bool = True):
-        """Log an error with structured context."""
-        extra = context or {}
+    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 = self._sanitize_extra(context)
         if error:
             extra["error_type"] = type(error).__name__
-            extra["error_message"] = str(error)
+            # Keep error_message single-line so the log line matches parse_log_errors structured format
+            err_msg = str(error).replace("\n", " ").replace("\r", " ").strip()
+            extra["error_message"] = err_msg[:500] if len(err_msg) > 500 else err_msg
 
         # Add caller information
         caller_info = self._get_caller_info()
         extra.update(caller_info)
 
+        # Sanitize any other extra values that might contain newlines (e.g. from create_error_context)
+        for key, value in list(extra.items()):
+            if isinstance(value, str) and ("\n" in value or "\r" in value):
+                extra[key] = value.replace("\n", " ").replace("\r", " ").strip()[:500]
+
         self.logger.error(message, extra=extra, exc_info=exc_info)
 
-    def log_warning(self, message: str, context: dict = None):
+    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()
@@ -202,9 +227,9 @@ class TradingAPILogger:
 
         self.logger.warning(message, extra=extra)
 
-    def log_info(self, message: str, context: dict = None):
+    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()
@@ -212,9 +237,9 @@ class TradingAPILogger:
 
         self.logger.info(message, extra=extra)
 
-    def log_debug(self, message: str, context: dict = None):
+    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()
@@ -331,23 +356,24 @@ def initialize_config(config_file_path: str, force_reload: bool = True):
         raise
 
 
-initialize_config(get_default_config_path())
+initialize_config(str(get_default_config_path()))
 
 
 def enable_runtime_log_level_toggle(enable: bool = True):
     """
     Enable runtime log level toggling via SIGUSR1 signal.
-    
+
     When enabled, sending SIGUSR1 to the process will toggle between
     DEBUG and INFO logging levels.
-    
+
     This implementation supports handler chaining - if another package
     has already registered a SIGUSR1 handler, both handlers will execute
     (this handler runs first, then calls the previous handler).
-    
+
     Args:
         enable: If True, register the signal handler. If False, remove it.
     """
+
     def toggle_debug(signum, frame):
         current_level = trading_logger.logger.level
         if current_level == logging.DEBUG:
@@ -357,8 +383,7 @@ def enable_runtime_log_level_toggle(enable: bool = True):
             for handler in trading_logger.logger.handlers:
                 handler.setLevel(logging.INFO)
             trading_logger.log_info(
-                "Log level changed to INFO via signal",
-                {"signal": "SIGUSR1", "previous_level": "DEBUG"}
+                "Log level changed to INFO via signal", {"signal": "SIGUSR1", "previous_level": "DEBUG"}
             )
         else:
             # Change to DEBUG
@@ -368,16 +393,17 @@ def enable_runtime_log_level_toggle(enable: bool = True):
                 handler.setLevel(logging.DEBUG)
             trading_logger.log_info(
                 "Log level changed to DEBUG via signal",
-                {"signal": "SIGUSR1", "previous_level": logging.getLevelName(current_level)}
+                {"signal": "SIGUSR1", "previous_level": logging.getLevelName(current_level)},
             )
-    
+
     if enable:
         try:
             # Get the current handler (if any) before registering ours
             current_handler = signal.signal(signal.SIGUSR1, toggle_debug)
-            
+
             # If there was a previous handler, chain it
             if current_handler not in (signal.SIG_DFL, signal.SIG_IGN, None):
+
                 def chained_handler(signum, frame):
                     # Execute our handler first
                     toggle_debug(signum, frame)
@@ -388,10 +414,9 @@ def enable_runtime_log_level_toggle(enable: bool = True):
                         except Exception as e:
                             # Log but don't fail if previous handler has issues
                             trading_logger.log_warning(
-                                "Error in chained SIGUSR1 handler",
-                                {"error": str(e), "error_type": type(e).__name__}
+                                "Error in chained SIGUSR1 handler", {"error": str(e), "error_type": type(e).__name__}
                             )
-                
+
                 # Register the chained handler
                 signal.signal(signal.SIGUSR1, chained_handler)
                 trading_logger.log_info(
@@ -399,19 +424,18 @@ def enable_runtime_log_level_toggle(enable: bool = True):
                     {
                         "signal": "SIGUSR1",
                         "usage": "kill -SIGUSR1 <pid> to toggle DEBUG/INFO",
-                        "previous_handler": str(current_handler)
-                    }
+                        "previous_handler": str(current_handler),
+                    },
                 )
             else:
                 trading_logger.log_info(
                     "Runtime log level toggle enabled",
-                    {"signal": "SIGUSR1", "usage": "kill -SIGUSR1 <pid> to toggle DEBUG/INFO"}
+                    {"signal": "SIGUSR1", "usage": "kill -SIGUSR1 <pid> to toggle DEBUG/INFO"},
                 )
         except (ValueError, OSError) as e:
             # Signal might not be available on all platforms
             trading_logger.log_warning(
-                "Could not register signal handler for log level toggle",
-                {"error": str(e), "platform": sys.platform}
+                "Could not register signal handler for log level toggle", {"error": str(e), "platform": sys.platform}
             )
     else:
         # Restore default handler