mcli-framework 7.3.1__py3-none-any.whl → 7.5.0__py3-none-any.whl

mcli/ml/trading/alpaca_client.py

@@ -1,6 +1,7 @@
 """Alpaca Trading API client for executing trades"""
 
 import logging
+import os
 from datetime import datetime, timedelta
 from decimal import Decimal
 from typing import Dict, List, Optional, Tuple, Union
@@ -18,6 +19,10 @@ from alpaca.data.historical import StockHistoricalDataClient
 from alpaca.data.requests import StockBarsRequest
 from alpaca.data.timeframe import TimeFrame
 from pydantic import BaseModel, Field
+from dotenv import load_dotenv
+
+# Load environment variables
+load_dotenv()
 
 logger = logging.getLogger(__name__)
 
@@ -81,32 +86,44 @@ class AlpacaTradingClient:
         self.trading_client = TradingClient(
             api_key=config.api_key,
             secret_key=config.secret_key,
-            paper=config.paper_trading,
-            base_url=config.base_url
+            paper=config.paper_trading
         )
         self.data_client = StockHistoricalDataClient(
             api_key=config.api_key,
-            secret_key=config.secret_key,
-            base_url=config.data_url
+            secret_key=config.secret_key
         )
     
     def get_account(self) -> Dict:
         """Get account information"""
         try:
             account = self.trading_client.get_account()
-            return {
+
+            # Build response with safe attribute access
+            response = {
                 "account_id": account.id,
-                "equity": float(account.equity),
-                "cash": float(account.cash),
-                "buying_power": float(account.buying_power),
-                "portfolio_value": float(account.portfolio_value),
-                "unrealized_pl": float(account.unrealized_pl),
-                "realized_pl": float(account.realized_pl),
-                "currency": account.currency,
-                "status": account.status,
-                "trading_blocked": account.trading_blocked,
-                "pattern_day_trader": account.pattern_day_trader,
+                "equity": float(account.equity) if hasattr(account, 'equity') else 0.0,
+                "cash": float(account.cash) if hasattr(account, 'cash') else 0.0,
+                "buying_power": float(account.buying_power) if hasattr(account, 'buying_power') else 0.0,
+                "currency": account.currency if hasattr(account, 'currency') else "USD",
+                "status": account.status.value if hasattr(account.status, 'value') else str(account.status),
+                "trading_blocked": account.trading_blocked if hasattr(account, 'trading_blocked') else False,
+                "pattern_day_trader": account.pattern_day_trader if hasattr(account, 'pattern_day_trader') else False,
             }
+
+            # Add optional fields that may not exist in all account types
+            if hasattr(account, 'portfolio_value'):
+                response["portfolio_value"] = float(account.portfolio_value)
+            else:
+                response["portfolio_value"] = response["equity"]
+
+            if hasattr(account, 'long_market_value'):
+                response["unrealized_pl"] = float(account.long_market_value) - float(account.cash)
+            else:
+                response["unrealized_pl"] = 0.0
+
+            response["realized_pl"] = 0.0  # Not always available in paper accounts
+
+            return response
         except Exception as e:
             logger.error(f"Failed to get account info: {e}")
             raise
@@ -343,11 +360,58 @@ class AlpacaTradingClient:
             raise
 
 
-def create_trading_client(api_key: str, secret_key: str, paper_trading: bool = True) -> AlpacaTradingClient:
-    """Create a trading client with the given credentials"""
+def create_trading_client(api_key: str = None, secret_key: str = None, paper_trading: bool = True) -> AlpacaTradingClient:
+    """
+    Create a trading client with the given credentials or from environment variables
+
+    Args:
+        api_key: Alpaca API key (if None, loads from ALPACA_API_KEY env var)
+        secret_key: Alpaca secret key (if None, loads from ALPACA_SECRET_KEY env var)
+        paper_trading: Whether to use paper trading (default: True)
+
+    Returns:
+        AlpacaTradingClient instance
+    """
+    # Load from environment if not provided
+    if api_key is None:
+        api_key = os.getenv("ALPACA_API_KEY")
+    if secret_key is None:
+        secret_key = os.getenv("ALPACA_SECRET_KEY")
+
+    if not api_key or not secret_key:
+        raise ValueError(
+            "Alpaca API credentials not found. "
+            "Please provide api_key and secret_key, or set ALPACA_API_KEY and ALPACA_SECRET_KEY environment variables."
+        )
+
+    base_url = os.getenv("ALPACA_BASE_URL", "https://paper-api.alpaca.markets")
+
     config = TradingConfig(
         api_key=api_key,
         secret_key=secret_key,
+        base_url=base_url,
         paper_trading=paper_trading
     )
-    return AlpacaTradingClient(config)
+    return AlpacaTradingClient(config)
+
+
+def get_alpaca_config_from_env() -> Optional[Dict[str, str]]:
+    """
+    Get Alpaca configuration from environment variables
+
+    Returns:
+        Dictionary with API configuration or None if not configured
+    """
+    api_key = os.getenv("ALPACA_API_KEY")
+    secret_key = os.getenv("ALPACA_SECRET_KEY")
+    base_url = os.getenv("ALPACA_BASE_URL", "https://paper-api.alpaca.markets")
+
+    if not api_key or not secret_key:
+        return None
+
+    return {
+        "api_key": api_key,
+        "secret_key": secret_key,
+        "base_url": base_url,
+        "is_paper": "paper" in base_url.lower()
+    }