fin-infra 0.1.62__py3-none-any.whl → 0.1.82__py3-none-any.whl

fin_infra/investments/add.py

@@ -7,14 +7,13 @@ transactions, accounts, allocation, and securities data.
 from __future__ import annotations
 
 from datetime import date
-from typing import TYPE_CHECKING, Optional, Literal, Annotated
+from typing import TYPE_CHECKING
 
-from fastapi import HTTPException, Query, Depends
+from fastapi import HTTPException
 from pydantic import BaseModel, Field
 
 if TYPE_CHECKING:
     from fastapi import FastAPI
-    from svc_infra.api.fastapi.auth.security import Principal
 
 # Import Identity for dependency injection
 try:
@@ -25,10 +24,10 @@ except ImportError:
 
 from .ease import easy_investments
 from .models import (
+    AssetAllocation,
     Holding,
-    InvestmentTransaction,
     InvestmentAccount,
-    AssetAllocation,
+    InvestmentTransaction,
     Security,
 )
 from .providers.base import InvestmentProvider
@@ -38,71 +37,55 @@ from .providers.base import InvestmentProvider
 class HoldingsRequest(BaseModel):
     """Request model for holdings endpoint."""
 
-    access_token: Optional[str] = Field(None, description="Plaid access token (Plaid only)")
-    user_id: Optional[str] = Field(None, description="SnapTrade user ID (SnapTrade only)")
-    user_secret: Optional[str] = Field(
-        None, description="SnapTrade user secret (SnapTrade only)"
-    )
-    account_ids: Optional[list[str]] = Field(
-        None, description="Filter by specific account IDs"
-    )
+    access_token: str | None = Field(None, description="Plaid access token (Plaid only)")
+    user_id: str | None = Field(None, description="SnapTrade user ID (SnapTrade only)")
+    user_secret: str | None = Field(None, description="SnapTrade user secret (SnapTrade only)")
+    account_ids: list[str] | None = Field(None, description="Filter by specific account IDs")
 
 
 class TransactionsRequest(BaseModel):
     """Request model for transactions endpoint."""
 
-    access_token: Optional[str] = Field(None, description="Plaid access token (Plaid only)")
-    user_id: Optional[str] = Field(None, description="SnapTrade user ID (SnapTrade only)")
-    user_secret: Optional[str] = Field(
-        None, description="SnapTrade user secret (SnapTrade only)"
-    )
+    access_token: str | None = Field(None, description="Plaid access token (Plaid only)")
+    user_id: str | None = Field(None, description="SnapTrade user ID (SnapTrade only)")
+    user_secret: str | None = Field(None, description="SnapTrade user secret (SnapTrade only)")
     start_date: date = Field(..., description="Start date for transactions (YYYY-MM-DD)")
     end_date: date = Field(..., description="End date for transactions (YYYY-MM-DD)")
-    account_ids: Optional[list[str]] = Field(
-        None, description="Filter by specific account IDs"
-    )
+    account_ids: list[str] | None = Field(None, description="Filter by specific account IDs")
 
 
 class AccountsRequest(BaseModel):
     """Request model for investment accounts endpoint."""
 
-    access_token: Optional[str] = Field(None, description="Plaid access token (Plaid only)")
-    user_id: Optional[str] = Field(None, description="SnapTrade user ID (SnapTrade only)")
-    user_secret: Optional[str] = Field(
-        None, description="SnapTrade user secret (SnapTrade only)"
-    )
+    access_token: str | None = Field(None, description="Plaid access token (Plaid only)")
+    user_id: str | None = Field(None, description="SnapTrade user ID (SnapTrade only)")
+    user_secret: str | None = Field(None, description="SnapTrade user secret (SnapTrade only)")
 
 
 class AllocationRequest(BaseModel):
     """Request model for asset allocation endpoint."""
 
-    access_token: Optional[str] = Field(None, description="Plaid access token (Plaid only)")
-    user_id: Optional[str] = Field(None, description="SnapTrade user ID (SnapTrade only)")
-    user_secret: Optional[str] = Field(
-        None, description="SnapTrade user secret (SnapTrade only)"
-    )
-    account_ids: Optional[list[str]] = Field(
-        None, description="Filter by specific account IDs"
-    )
+    access_token: str | None = Field(None, description="Plaid access token (Plaid only)")
+    user_id: str | None = Field(None, description="SnapTrade user ID (SnapTrade only)")
+    user_secret: str | None = Field(None, description="SnapTrade user secret (SnapTrade only)")
+    account_ids: list[str] | None = Field(None, description="Filter by specific account IDs")
 
 
 class SecuritiesRequest(BaseModel):
     """Request model for securities endpoint."""
 
-    access_token: Optional[str] = Field(None, description="Plaid access token (Plaid only)")
-    user_id: Optional[str] = Field(None, description="SnapTrade user ID (SnapTrade only)")
-    user_secret: Optional[str] = Field(
-        None, description="SnapTrade user secret (SnapTrade only)"
-    )
+    access_token: str | None = Field(None, description="Plaid access token (Plaid only)")
+    user_id: str | None = Field(None, description="SnapTrade user ID (SnapTrade only)")
+    user_secret: str | None = Field(None, description="SnapTrade user secret (SnapTrade only)")
     security_ids: list[str] = Field(..., description="List of security IDs to retrieve")
 
 
 def add_investments(
     app: FastAPI,
     prefix: str = "/investments",
-    provider: Optional[InvestmentProvider] = None,
+    provider: InvestmentProvider | None = None,
     include_in_schema: bool = True,
-    tags: Optional[list[str]] = None,
+    tags: list[str] | None = None,
 ) -> InvestmentProvider:
     """Add investment endpoints to FastAPI application.
 
@@ -156,13 +139,13 @@ def add_investments(
            - Validates user's JWT/session cookie
            - Ensures user is logged into YOUR application
            - Provides identity.user with authenticated user
-        
+
         2. Provider Access (endpoint logic): Handled by these endpoints
            - Gets Plaid/SnapTrade access token for the provider
            - Auto-resolves from identity.user.banking_providers
            - Can be overridden with explicit token in request body
            - Used to call external provider APIs (Plaid, SnapTrade)
-        
+
         POST requests are used (not GET) because:
         1. Provider credentials should not be in URL query parameters
         2. Request bodies are more suitable for sensitive data
@@ -174,7 +157,7 @@ def add_investments(
 
     # 2. Store on app state
     app.state.investment_provider = provider
-    
+
     # 3. Capture provider in local variable for closure
     investment_provider = provider
 
@@ -205,20 +188,19 @@ def add_investments(
             access_token = f"{request.user_id}:{request.user_secret}"
         else:
             # Auto-resolve from authenticated user (user_router guarantees identity.user exists)
-            banking_providers = getattr(identity.user, 'banking_providers', {})
+            banking_providers = getattr(identity.user, "banking_providers", {})
             if not banking_providers or "plaid" not in banking_providers:
                 raise HTTPException(
                     status_code=400,
-                    detail="No Plaid connection found. Please connect your accounts first."
+                    detail="No Plaid connection found. Please connect your accounts first.",
                 )
-            
+
             access_token = banking_providers["plaid"].get("access_token")
             if not access_token:
                 raise HTTPException(
-                    status_code=400,
-                    detail="No access token found. Please reconnect your accounts."
+                    status_code=400, detail="No access token found. Please reconnect your accounts."
                 )
-        
+
         # Call provider with resolved token
         try:
             holdings = await investment_provider.get_holdings(
@@ -237,7 +219,9 @@ def add_investments(
         summary="List Transactions",
         description="Fetch investment transactions (buy, sell, dividend, etc.) within date range",
     )
-    async def get_transactions(request: TransactionsRequest, identity: Identity) -> list[InvestmentTransaction]:
+    async def get_transactions(
+        request: TransactionsRequest, identity: Identity
+    ) -> list[InvestmentTransaction]:
         """
         Retrieve investment transactions for authenticated user's accounts.
 
@@ -257,18 +241,17 @@ def add_investments(
         elif request.user_id and request.user_secret:
             access_token = f"{request.user_id}:{request.user_secret}"
         else:
-            banking_providers = getattr(identity.user, 'banking_providers', {})
+            banking_providers = getattr(identity.user, "banking_providers", {})
             if not banking_providers or "plaid" not in banking_providers:
                 raise HTTPException(
                     status_code=400,
-                    detail="No Plaid connection found. Please connect your accounts first."
+                    detail="No Plaid connection found. Please connect your accounts first.",
                 )
-            
+
             access_token = banking_providers["plaid"].get("access_token")
             if not access_token:
                 raise HTTPException(
-                    status_code=400,
-                    detail="No access token found. Please reconnect your accounts."
+                    status_code=400, detail="No access token found. Please reconnect your accounts."
                 )
 
         try:
@@ -302,18 +285,17 @@ def add_investments(
         elif request.user_id and request.user_secret:
             access_token = f"{request.user_id}:{request.user_secret}"
         else:
-            banking_providers = getattr(identity.user, 'banking_providers', {})
+            banking_providers = getattr(identity.user, "banking_providers", {})
             if not banking_providers or "plaid" not in banking_providers:
                 raise HTTPException(
                     status_code=400,
-                    detail="No Plaid connection found. Please connect your accounts first."
+                    detail="No Plaid connection found. Please connect your accounts first.",
                 )
-            
+
             access_token = banking_providers["plaid"].get("access_token")
             if not access_token:
                 raise HTTPException(
-                    status_code=400,
-                    detail="No access token found. Please reconnect your accounts."
+                    status_code=400, detail="No access token found. Please reconnect your accounts."
                 )
 
         try:
@@ -344,20 +326,19 @@ def add_investments(
         elif request.user_id and request.user_secret:
             access_token = f"{request.user_id}:{request.user_secret}"
         else:
-            banking_providers = getattr(identity.user, 'banking_providers', {})
+            banking_providers = getattr(identity.user, "banking_providers", {})
             if not banking_providers or "plaid" not in banking_providers:
                 raise HTTPException(
                     status_code=400,
-                    detail="No Plaid connection found. Please connect your accounts first."
+                    detail="No Plaid connection found. Please connect your accounts first.",
                 )
-            
+
             access_token = banking_providers["plaid"].get("access_token")
             if not access_token:
                 raise HTTPException(
-                    status_code=400,
-                    detail="No access token found. Please reconnect your accounts."
+                    status_code=400, detail="No access token found. Please reconnect your accounts."
                 )
-        
+
         # Fetch holdings
         try:
             holdings = await investment_provider.get_holdings(
@@ -368,7 +349,7 @@ def add_investments(
             raise HTTPException(status_code=401, detail=str(e))
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Failed to fetch allocation: {e}")
-        
+
         # Calculate allocation using base provider helper
         allocation = investment_provider.calculate_allocation(holdings)
         return allocation
@@ -391,18 +372,17 @@ def add_investments(
         elif request.user_id and request.user_secret:
             access_token = f"{request.user_id}:{request.user_secret}"
         else:
-            banking_providers = getattr(identity.user, 'banking_providers', {})
+            banking_providers = getattr(identity.user, "banking_providers", {})
             if not banking_providers or "plaid" not in banking_providers:
                 raise HTTPException(
                     status_code=400,
-                    detail="No Plaid connection found. Please connect your accounts first."
+                    detail="No Plaid connection found. Please connect your accounts first.",
                 )
-            
+
             access_token = banking_providers["plaid"].get("access_token")
             if not access_token:
                 raise HTTPException(
-                    status_code=400,
-                    detail="No access token found. Please reconnect your accounts."
+                    status_code=400, detail="No access token found. Please reconnect your accounts."
                 )
 
         try:

fin_infra/investments/ease.py

@@ -24,13 +24,13 @@ def easy_investments(
 
     Provider Selection Guide:
         **Most apps should use BOTH providers for complete coverage:**
-        
+
         - **Plaid**: Traditional investment accounts (401k, IRA, bank brokerage)
           - Coverage: 15,000+ institutions
           - Best for: Employer retirement accounts, bank-connected investments
           - Data freshness: Daily updates (usually overnight)
           - Authentication: access_token from Plaid Link
-          
+
         - **SnapTrade**: Retail brokerage accounts (E*TRADE, Wealthsimple, Robinhood)
           - Coverage: 125M+ accounts, 70+ brokerages
           - Best for: User's EXISTING retail brokerage accounts
@@ -112,19 +112,18 @@ def easy_investments(
         - Most other SnapTrade brokerages support trading operations
     """
     # Auto-detect provider from environment if not specified
-    if provider is None:
-        provider = _detect_provider()
+    detected_provider: str | None = provider
+    if detected_provider is None:
+        detected_provider = _detect_provider()
 
     # Validate provider
-    if provider not in ("plaid", "snaptrade"):
-        raise ValueError(
-            f"Invalid provider: {provider}. Must be 'plaid' or 'snaptrade'."
-        )
+    if detected_provider not in ("plaid", "snaptrade"):
+        raise ValueError(f"Invalid provider: {detected_provider}. Must be 'plaid' or 'snaptrade'.")
 
     # Instantiate provider
-    if provider == "plaid":
+    if detected_provider == "plaid":
         return _create_plaid_provider(**config)
-    elif provider == "snaptrade":
+    elif detected_provider == "snaptrade":
         return _create_snaptrade_provider(**config)
 
     # Should never reach here
@@ -192,8 +191,7 @@ def _create_plaid_provider(**config: Any) -> InvestmentProvider:
     valid_envs = ("sandbox", "development", "production")
     if environment not in valid_envs:
         raise ValueError(
-            f"Invalid Plaid environment: {environment}. "
-            f"Must be one of: {', '.join(valid_envs)}"
+            f"Invalid Plaid environment: {environment}. Must be one of: {', '.join(valid_envs)}"
         )
 
     return PlaidInvestmentProvider(
@@ -233,10 +231,15 @@ def _create_snaptrade_provider(**config: Any) -> InvestmentProvider:
             "Example: easy_investments(provider='snaptrade', client_id='...', consumer_key='...')"
         )
 
+    # Ensure base_url is a string (default is set in SnapTradeInvestmentProvider)
+    resolved_base_url: str = (
+        base_url if isinstance(base_url, str) else "https://api.snaptrade.com/api/v1"
+    )
+
     return SnapTradeInvestmentProvider(
         client_id=client_id,
         consumer_key=consumer_key,
-        base_url=base_url,
+        base_url=resolved_base_url,
     )