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

fin_infra/categorization/llm_layer.py

@@ -15,13 +15,13 @@ Expected performance:
 
 import hashlib
 import logging
-from typing import Optional, List, Tuple
+from typing import Any, cast
+
 from pydantic import BaseModel, Field
 
 # ai-infra imports
 try:
     from ai_infra.llm import LLM
-    from ai_infra.llm.providers import Providers
 except ImportError:
     raise ImportError("ai-infra not installed. Install with: pip install ai-infra")
 
@@ -41,7 +41,7 @@ class CategoryPrediction(BaseModel):
 
 
 # Few-shot examples (20 diverse merchants covering all major categories)
-FEW_SHOT_EXAMPLES: List[Tuple[str, str, str]] = [
+FEW_SHOT_EXAMPLES: list[tuple[str, str, str]] = [
     # Food & Dining (5 examples)
     ("STARBUCKS #1234", "Coffee Shops", "Popular coffee shop chain"),
     ("MCDONALD'S", "Fast Food", "Fast food restaurant"),
@@ -158,7 +158,7 @@ class LLMCategorizer:
     async def categorize(
         self,
         merchant_name: str,
-        user_id: Optional[str] = None,
+        user_id: str | None = None,
     ) -> CategoryPrediction:
         """
         Categorize merchant using LLM.
@@ -210,14 +210,14 @@ class LLMCategorizer:
     async def _call_llm(
         self,
         merchant_name: str,
-        user_id: Optional[str] = None,
+        user_id: str | None = None,
     ) -> CategoryPrediction:
         """Call LLM API with structured output."""
         # Build user message
         user_message = self._build_user_message(merchant_name, user_id)
 
         # Call LLM with retry logic
-        extra = {
+        extra: dict[str, Any] = {
             "retry": {
                 "max_tries": 3,
                 "base": 0.5,
@@ -245,7 +245,7 @@ class LLMCategorizer:
                 f"Must be one of {len(valid_categories)} valid categories."
             )
 
-        return response
+        return cast("CategoryPrediction", response)
 
     def _build_system_prompt(self) -> str:
         """Build system prompt with few-shot examples (reused across all requests)."""
@@ -270,7 +270,7 @@ class LLMCategorizer:
     def _build_user_message(
         self,
         merchant_name: str,
-        user_id: Optional[str] = None,
+        user_id: str | None = None,
     ) -> str:
         """Build user message with optional personalization."""
         if self.enable_personalization and user_id:
@@ -285,8 +285,8 @@ class LLMCategorizer:
 Merchant: "{merchant_name}"
 
 User context:
-- Frequently shops at: {context['top_merchants']}
-- Top spending categories: {context['top_categories']}
+- Frequently shops at: {context["top_merchants"]}
+- Top spending categories: {context["top_categories"]}
 
 Return JSON with category, confidence, and reasoning."""
         else:

fin_infra/categorization/models.py

@@ -44,7 +44,7 @@ class CategoryPrediction(BaseModel):
                 "category": "Coffee Shops",
                 "confidence": 0.98,
                 "method": "exact",
-                "alternatives": [("Restaurants", 0.15), ("Fast Food", 0.10)],
+                "alternatives": [["Restaurants", 0.15], ["Fast Food", 0.10]],
             }
         }
     )

fin_infra/categorization/rules.py

@@ -6,12 +6,10 @@ Organized by category for maintainability.
 """
 
 import re
-from typing import Optional
 
 from .models import CategoryRule
 from .taxonomy import Category
 
-
 # ===== HELPER FUNCTIONS (defined first) =====
 
 
@@ -306,7 +304,7 @@ COMPILED_REGEX_RULES = [
 # ===== PUBLIC FUNCTIONS =====
 
 
-def get_exact_match(merchant: str) -> Optional[Category]:
+def get_exact_match(merchant: str) -> Category | None:
     """
     Get category by exact match.
 
@@ -320,7 +318,7 @@ def get_exact_match(merchant: str) -> Optional[Category]:
     return EXACT_RULES_NORMALIZED.get(normalized)
 
 
-def get_regex_match(merchant: str) -> Optional[tuple[Category, int]]:
+def get_regex_match(merchant: str) -> tuple[Category, int] | None:
     """
     Get category by regex match.
 

fin_infra/categorization/taxonomy.py

@@ -12,7 +12,7 @@ Total: 56 leaf categories
 """
 
 from enum import Enum
-from typing import Optional
+
 from pydantic import BaseModel
 
 
@@ -315,7 +315,7 @@ def get_category_group(category: Category) -> CategoryGroup:
     return CATEGORY_GROUPS.get(category, CategoryGroup.UNCATEGORIZED)
 
 
-def get_category_metadata(category: Category) -> Optional[CategoryMetadata]:
+def get_category_metadata(category: Category) -> CategoryMetadata | None:
     """Get metadata for a category."""
     return CATEGORY_METADATA.get(category)
 

fin_infra/chat/__init__.py

@@ -28,15 +28,20 @@ Example:
     )
 """
 
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from fastapi import FastAPI
+
+from fin_infra.chat.ease import easy_financial_conversation
 from fin_infra.chat.planning import (
-    FinancialPlanningConversation,
-    ConversationResponse,
+    SENSITIVE_PATTERNS,
     ConversationContext,
+    ConversationResponse,
     Exchange,
+    FinancialPlanningConversation,
     is_sensitive_question,
-    SENSITIVE_PATTERNS,
 )
-from fin_infra.chat.ease import easy_financial_conversation
 
 __all__ = [
     "FinancialPlanningConversation",
@@ -51,7 +56,7 @@ __all__ = [
 
 
 def add_financial_conversation(
-    app: "FastAPI",  # type: ignore
+    app: "FastAPI",
     *,
     prefix: str = "/chat",
     conversation: FinancialPlanningConversation | None = None,
@@ -110,16 +115,11 @@ def add_financial_conversation(
         - Includes financial advice disclaimer in all responses
         - Logs all LLM calls for compliance (via svc-infra logging)
     """
-    from typing import TYPE_CHECKING, Any
-
-    if TYPE_CHECKING:
-        from fastapi import FastAPI
-
     from pydantic import BaseModel, Field
+    from svc_infra.api.fastapi.docs.scoped import add_prefixed_docs
 
     # Import svc-infra user router (requires auth)
     from svc_infra.api.fastapi.dual.protected import user_router
-    from svc_infra.api.fastapi.docs.scoped import add_prefixed_docs
 
     # Auto-create conversation if not provided
     if conversation is None:
@@ -149,15 +149,6 @@ def add_financial_conversation(
         # TODO: Get user_id from svc-infra auth context
         user_id = "demo_user"  # Placeholder
 
-        # Check for sensitive content
-        if is_sensitive_question(request.question):
-            return ConversationResponse(
-                answer="I cannot process requests containing sensitive information like SSNs, passwords, or account numbers. Please rephrase your question without this information.",
-                follow_up_questions=[],
-                conversation_id=f"{user_id}_denied",
-                disclaimer="This is an automated safety response.",
-            )
-
         # Ask conversation
         response = await conversation.ask(
             user_id=user_id,
@@ -173,7 +164,7 @@ def add_financial_conversation(
         # TODO: Get user_id from svc-infra auth context
         user_id = "demo_user"
         context = await conversation._get_context(user_id)
-        return context.exchanges if context else []
+        return context.previous_exchanges if context else []
 
     @router.delete("/history")
     async def clear_history():
@@ -198,6 +189,6 @@ def add_financial_conversation(
     # Store on app.state for programmatic access
     app.state.financial_conversation = conversation
 
-    print(f"✅ Financial chat enabled (AI-powered Q&A with {provider})")
+    print(f"Financial chat enabled (AI-powered Q&A with {provider})")
 
     return conversation

fin_infra/chat/planning.py

@@ -54,7 +54,6 @@ from typing import Any
 
 from pydantic import BaseModel, Field
 
-
 # ============================================================================
 # Pydantic Schemas (Structured Output)
 # ============================================================================
@@ -338,8 +337,65 @@ class FinancialPlanningConversation:
         # Save updated context (24h TTL)
         await self._save_context(context)
 
+        # Track latest session id for convenience endpoints (history/clear).
+        # Best-effort: failures here must not break the chat response.
+        try:
+            await self.cache.set(
+                self._latest_session_key(user_id),
+                context.session_id,
+                ttl=86400,
+            )
+        except Exception:
+            pass
+
         return response
 
+    # ---------------------------------------------------------------------
+    # Backward-compatible context helpers
+    # ---------------------------------------------------------------------
+
+    def _latest_session_key(self, user_id: str) -> str:
+        return f"fin_infra:conversation_latest_session:{user_id}"
+
+    async def _get_latest_session_id(self, user_id: str) -> str | None:
+        try:
+            value = await self.cache.get(self._latest_session_key(user_id))
+        except Exception:
+            return None
+
+        if value is None:
+            return None
+        if isinstance(value, bytes):
+            try:
+                return value.decode("utf-8")
+            except Exception:
+                return None
+        if isinstance(value, str):
+            return value
+        return str(value)
+
+    async def _get_context(
+        self, user_id: str, session_id: str | None = None
+    ) -> ConversationContext | None:
+        if session_id is None:
+            session_id = await self._get_latest_session_id(user_id)
+        if session_id is None:
+            return None
+
+        return await self._load_context(user_id=user_id, session_id=session_id)
+
+    async def _clear_context(self, user_id: str, session_id: str | None = None) -> None:
+        if session_id is None:
+            session_id = await self._get_latest_session_id(user_id)
+
+        if session_id is not None:
+            await self.clear_session(user_id=user_id, session_id=session_id)
+
+        try:
+            await self.cache.delete(self._latest_session_key(user_id))
+        except Exception:
+            pass
+
     async def _load_context(
         self,
         user_id: str,

fin_infra/cli/cmds/scaffold_cmds.py

@@ -12,7 +12,6 @@ Usage:
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional
 
 import click
 import typer
@@ -54,47 +53,47 @@ def cmd_scaffold(
         "--overwrite/--no-overwrite",
         help="Overwrite existing files",
     ),
-    models_filename: Optional[str] = typer.Option(
+    models_filename: str | None = typer.Option(
         None,
         "--models-filename",
         help="Custom filename for models (default: {domain}.py)",
     ),
-    schemas_filename: Optional[str] = typer.Option(
+    schemas_filename: str | None = typer.Option(
         None,
         "--schemas-filename",
         help="Custom filename for schemas (default: {domain}_schemas.py)",
     ),
-    repository_filename: Optional[str] = typer.Option(
+    repository_filename: str | None = typer.Option(
         None,
         "--repository-filename",
         help="Custom filename for repository (default: {domain}_repository.py)",
     ),
 ) -> None:
     """Generate SQLAlchemy models, Pydantic schemas, and repository code from templates.
-    
+
     The scaffold command generates production-ready persistence layer code that works
     seamlessly with svc-infra's add_sql_resources() for automatic CRUD APIs.
-    
+
     Examples:
         # Basic scaffold (models + schemas + repository)
         fin-infra scaffold budgets --dest-dir app/models/
-        
+
         # Financial goals tracking
         fin-infra scaffold goals --dest-dir app/models/goals/
-        
+
         # With multi-tenancy and soft deletes
         fin-infra scaffold budgets --dest-dir app/models/ \
             --include-tenant --include-soft-delete
-        
+
         # Without repository (use svc-infra SqlRepository directly)
         fin-infra scaffold goals --dest-dir app/models/ \\
             --no-with-repository
-        
+
         # Custom filenames
         fin-infra scaffold budgets --dest-dir app/models/ \\
             --models-filename custom_budget.py \\
             --schemas-filename custom_schemas.py
-    
+
     After scaffolding, integrate with svc-infra:
         1. Run migrations: svc-infra revision -m "add budgets" --autogenerate
         2. Apply: svc-infra upgrade head
@@ -108,7 +107,7 @@ def cmd_scaffold(
             err=True,
         )
         raise typer.Exit(1)
-    
+
     # Import scaffold function based on domain
     if domain == "budgets":
         from fin_infra.scaffold.budgets import scaffold_budgets_core

fin_infra/clients/__init__.py

@@ -1,3 +1,25 @@
-from .base import BankingClient, MarketDataClient, CreditClient
+"""DEPRECATED: Use fin_infra.providers instead.
+
+This module is deprecated and will be removed in a future version.
+All ABCs have been consolidated into fin_infra.providers.base.
+
+Migration:
+    # Old (deprecated)
+    from fin_infra.clients import BankingClient, MarketDataClient
+
+    # New
+    from fin_infra.providers.base import BankingProvider, MarketDataProvider
+"""
+
+import warnings
+
+from .base import BankingClient, CreditClient, MarketDataClient
+
+warnings.warn(
+    "fin_infra.clients is deprecated. Use fin_infra.providers instead. "
+    "This module will be removed in a future version.",
+    DeprecationWarning,
+    stacklevel=2,
+)
 
 __all__ = ["BankingClient", "MarketDataClient", "CreditClient"]

fin_infra/clients/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import abc
-from typing import Iterable, Sequence
+from collections.abc import Iterable, Sequence
 
 from ..models import Account, Quote, Transaction
 

fin_infra/clients/plaid.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
-from .base import BankingClient
 from ..models import Account
+from .base import BankingClient
 
 
 class PlaidClient(BankingClient):

fin_infra/compliance/__init__.py

@@ -20,8 +20,9 @@ Example:
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable
 from datetime import datetime
-from typing import Any, Callable, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, cast
 
 if TYPE_CHECKING:
     from fastapi import FastAPI, Request, Response
@@ -32,7 +33,7 @@ logger = logging.getLogger(__name__)
 
 
 def log_compliance_event(
-    app: "FastAPI",
+    app: FastAPI,
     event: str,
     context: dict[str, Any] | None = None,
 ) -> None:
@@ -62,7 +63,7 @@ def log_compliance_event(
 
 
 def add_compliance_tracking(
-    app: "FastAPI",
+    app: FastAPI,
     *,
     track_banking: bool = True,
     track_credit: bool = True,
@@ -111,14 +112,14 @@ def add_compliance_tracking(
     """
 
     @app.middleware("http")
-    async def compliance_tracking_middleware(request: "Request", call_next: Callable) -> "Response":
+    async def compliance_tracking_middleware(request: Request, call_next: Callable) -> Response:
         """Middleware to track compliance events for financial endpoints."""
         path = request.url.path
         method = request.method
 
         # Track only GET requests (data access)
         if method != "GET":
-            return await call_next(request)
+            return cast("Response", await call_next(request))
 
         # Determine if path is a compliance-tracked endpoint
         event = None
@@ -148,7 +149,7 @@ def add_compliance_tracking(
             if on_event:
                 on_event(event, context)
 
-        return response
+        return cast("Response", response)
 
     logger.info(
         "Compliance tracking enabled",

fin_infra/credit/add.py

@@ -23,16 +23,16 @@ Example:
 """
 
 import logging
+from typing import cast
 
-from fastapi import FastAPI, Depends, HTTPException, status
-
-from svc_infra.api.fastapi.dual.protected import user_router, RequireUser
+from fastapi import Depends, FastAPI, HTTPException, status
 from svc_infra.api.fastapi.docs.scoped import add_prefixed_docs
+from svc_infra.api.fastapi.dual.protected import RequireUser, user_router
 from svc_infra.cache import resource
 from svc_infra.webhooks import add_webhooks
 
+from fin_infra.models.credit import CreditReport, CreditScore
 from fin_infra.providers.base import CreditProvider
-from fin_infra.models.credit import CreditScore, CreditReport
 
 logger = logging.getLogger(__name__)
 
@@ -155,8 +155,8 @@ def add_credit(
         if enable_webhooks and hasattr(app.state, "webhooks_outbox"):
             try:
                 # Get webhook service from app state
-                from svc_infra.webhooks.service import WebhookService
                 from svc_infra.db.outbox import OutboxStore
+                from svc_infra.webhooks.service import WebhookService
 
                 outbox: OutboxStore = app.state.webhooks_outbox
                 subs = app.state.webhooks_subscriptions
@@ -175,7 +175,7 @@ def add_credit(
                 # Don't fail request if webhook publishing fails
                 logger.warning(f"Failed to publish credit.score_changed webhook: {e}")
 
-        return score
+        return cast("CreditScore", score)
 
     @router.post("/report", response_model=CreditReport)
     @credit_resource.cache_read(ttl=cache_ttl, suffix="report")
@@ -219,7 +219,7 @@ def add_credit(
                 detail="Credit bureau service unavailable",
             )
 
-        return report
+        return cast("CreditReport", report)
 
     # Mount router with dual routes (with/without trailing slash)
     app.include_router(router, include_in_schema=True)

fin_infra/credit/experian/auth.py

@@ -24,6 +24,7 @@ Example:
 """
 
 import base64
+from typing import cast
 
 import httpx
 from svc_infra.cache import cache_read
@@ -85,7 +86,7 @@ class ExperianAuthManager:
             >>> headers = {"Authorization": f"Bearer {token}"}
         """
         # Call the cached implementation with client_id for cache key
-        return await self._get_token_cached(client_id=self.client_id)
+        return cast("str", await self._get_token_cached(client_id=self.client_id))
 
     @cache_read(
         key="oauth_token:experian:{client_id}",  # Use client_id for uniqueness
@@ -140,7 +141,7 @@ class ExperianAuthManager:
 
         # Parse and return token
         data = response.json()
-        return data["access_token"]
+        return cast("str", data["access_token"])
 
     async def invalidate(self) -> None:
         """Invalidate cached token for THIS client (force refresh on next get_token call).

fin_infra/credit/experian/client.py

@@ -14,7 +14,7 @@ Example:
     >>> data = await client.get_credit_score("user123")
 """
 
-from typing import Any
+from typing import Any, cast
 
 import httpx
 from tenacity import (
@@ -155,7 +155,7 @@ class ExperianClient:
                 **kwargs,
             )
             response.raise_for_status()
-            return response.json()
+            return cast("dict[str, Any]", response.json())
 
         except httpx.HTTPStatusError as e:
             # Parse error response