refactor(db): use shared pooled DatabaseClient singleton instead of per-call instances

- Replace get_db_client() creating new DatabaseClient on every call with a
  module-level singleton initialized once at startup via init_db_client()
- Add init_db_client() and close_db_client() lifecycle functions called
  from FastAPI lifespan handler
- Migrate all DatabaseClient methods from legacy self.connect()/self.conn
  to pooled self.get_conn() context manager for thread-safe connection reuse
- Pool is properly torn down on application shutdown

Closes leeworks-agents/SPARC#7

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

SPARC/analyzer.py

@@ -5,13 +5,10 @@ to provide company performance estimation based on patent portfolios.
 """
 
 import hashlib
-import logging
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import Callable
 
 from SPARC import config
-
-logger = logging.getLogger(__name__)
 from SPARC.database import DatabaseClient
 from SPARC.serp_api import SERP
 from SPARC.llm import LLMAnalyzer
@@ -55,13 +52,13 @@ class CompanyAnalyzer:
             query_hash = hashlib.sha256(company_name.lower().encode()).hexdigest()
             cached_ids = self.db.get_cached_serp_query(query_hash)
             if cached_ids is not None:
-                logger.info("Using cached SERP results for %s (%d patents)", company_name, len(cached_ids))
+                print(f"Using cached SERP results for {company_name} ({len(cached_ids)} patents)")
                 patents = Patents(patents=[
                     Patent(patent_id=pid, pdf_link="")
                     for pid in cached_ids
                 ])
             else:
-                logger.info("Retrieving patents for %s...", company_name)
+                print(f"Retrieving patents for {company_name}...")
                 patents = SERP.query(company_name)
                 # Cache the SERP results
                 if patents.patents:
@@ -69,13 +66,12 @@ class CompanyAnalyzer:
                         company_name=company_name,
                         query_hash=query_hash,
                         patent_ids=[p.patent_id for p in patents.patents],
-                        ttl_hours=config.serp_cache_ttl_hours,
                     )
 
         if not patents.patents:
             return f"No patents found for {company_name}"
 
-        logger.info("Found %d patents. Processing...", len(patents.patents))
+        print(f"Found {len(patents.patents)} patents. Processing...")
 
         # Download, parse, and minimize patents in parallel
         processed_patents = []
@@ -91,12 +87,12 @@ class CompanyAnalyzer:
                     if result:
                         processed_patents.append(result)
                 except Exception as e:
-                    logger.warning("Failed to process %s: %s", patent.patent_id, e)
+                    print(f"Warning: Failed to process {patent.patent_id}: {e}")
 
         if not processed_patents:
             return f"Failed to process any patents for {company_name}"
 
-        logger.info("Analyzing portfolio with LLM...")
+        print(f"Analyzing portfolio with LLM...")
 
         # Analyze the full portfolio with LLM
         analysis = self.llm_analyzer.analyze_patent_portfolio(
@@ -126,7 +122,6 @@ class CompanyAnalyzer:
           FileNotFoundError: If the patent PDF is not found at the expected path.
         """
         import os
-        logger.info("Analyzing patent %s for %s...", patent_id, company_name)
 
         patent_path = f"patents/{patent_id}.pdf"
 
@@ -188,7 +183,7 @@ class CompanyAnalyzer:
 
             return {"patent_id": patent.patent_id, "content": minimized_content}
         except Exception as e:
-            logger.warning("Failed to process %s: %s", patent.patent_id, e)
+            print(f"Warning: Failed to process {patent.patent_id}: {e}")
             return None
 
     def _analyze_company_safe(self, company_name: str) -> CompanyAnalysisResult:
@@ -259,7 +254,7 @@ class CompanyAnalyzer:
         results: list[CompanyAnalysisResult] = []
         total = len(companies)
 
-        logger.info("Starting batch analysis of %d companies...", total)
+        print(f"Starting batch analysis of {total} companies...")
 
         with ThreadPoolExecutor(max_workers=max_workers) as executor:
             future_to_company = {
@@ -276,8 +271,8 @@ class CompanyAnalyzer:
                     result = future.result()
                     results.append(result)
 
-                    status = "OK" if result.success else "FAIL"
-                    logger.info("[%d/%d] %s %s", completed, total, status, company)
+                    status = "✓" if result.success else "✗"
+                    print(f"[{completed}/{total}] {status} {company}")
 
                     if progress_callback:
                         progress_callback(company, completed, total)
@@ -292,12 +287,12 @@ class CompanyAnalyzer:
                             error=str(e),
                         )
                     )
-                    logger.error("[%d/%d] FAIL %s: %s", completed, total, company, e)
+                    print(f"[{completed}/{total}] ✗ {company}: {e}")
 
         successful = sum(1 for r in results if r.success)
         failed = total - successful
 
-        logger.info("Batch complete: %d succeeded, %d failed", successful, failed)
+        print(f"\nBatch complete: {successful} succeeded, {failed} failed")
 
         return BatchAnalysisResult(
             results=results,
@@ -323,20 +318,20 @@ class CompanyAnalyzer:
         results: list[CompanyAnalysisResult] = []
         total = len(companies)
 
-        logger.info("Starting sequential analysis of %d companies...", total)
+        print(f"Starting sequential analysis of {total} companies...")
 
         for idx, company in enumerate(companies, 1):
-            logger.info("[%d/%d] Analyzing %s...", idx, total, company)
+            print(f"\n[{idx}/{total}] Analyzing {company}...")
             result = self._analyze_company_safe(company)
             results.append(result)
 
-            status = "OK" if result.success else "FAIL"
-            logger.info("[%d/%d] %s %s", idx, total, status, company)
+            status = "✓" if result.success else "✗"
+            print(f"[{idx}/{total}] {status} {company}")
 
         successful = sum(1 for r in results if r.success)
         failed = total - successful
 
-        logger.info("Batch complete: %d succeeded, %d failed", successful, failed)
+        print(f"\nBatch complete: {successful} succeeded, {failed} failed")
 
         return BatchAnalysisResult(
             results=results,

SPARC/api.py

@@ -21,11 +21,13 @@ from SPARC.auth import (
     TokenResponse,
     UserResponse,
     check_jwt_secret,
+    close_db_client,
     create_tokens,
     decode_token,
     get_current_admin,
     get_current_user,
     get_db_client,
+    init_db_client,
 )
 from SPARC.types import BatchAnalysisResult, CompanyAnalysisResult
 
@@ -155,6 +157,7 @@ async def lifespan(app: FastAPI):
     """Initialize resources on startup, clean up on shutdown."""
     global _analyzer
     check_jwt_secret()
+    init_db_client()
     _analyzer = CompanyAnalyzer()
     # Mark any jobs that were running/pending before the restart as failed
     from SPARC.database import DatabaseClient
@@ -167,8 +170,9 @@ async def lifespan(app: FastAPI):
         logging.getLogger(__name__).warning("Marked %d stale jobs as failed on startup", stale)
     _db.close()
     yield
-    # Cleanup if needed
+    # Cleanup
     _analyzer = None
+    close_db_client()
 
 
 app = FastAPI(

SPARC/auth.py

@@ -146,11 +146,36 @@ def decode_token(token: str) -> Optional[TokenPayload]:
         return None
 
 
+# Shared database client singleton, initialized at startup via init_db_client()
+_db_client: DatabaseClient | None = None
+
+
+def init_db_client() -> None:
+    """Initialize the shared database client. Call once at app startup."""
+    global _db_client
+    _db_client = DatabaseClient(config.database_url)
+    _db_client.connect()
+
+
+def close_db_client() -> None:
+    """Close the shared database client. Call at app shutdown."""
+    global _db_client
+    if _db_client:
+        _db_client.close()
+        _db_client = None
+
+
 def get_db_client() -> DatabaseClient:
-    """Get database client for auth operations."""
-    client = DatabaseClient(config.database_url)
-    client.connect()
-    return client
+    """Get the shared pooled database client for auth operations.
+
+    Returns the module-level singleton DatabaseClient. If not yet initialized
+    (e.g., during tests), creates a new instance as a fallback.
+    """
+    global _db_client
+    if _db_client is None:
+        _db_client = DatabaseClient(config.database_url)
+        _db_client.connect()
+    return _db_client
 
 
 async def get_current_user(

SPARC/config.py

@@ -2,20 +2,11 @@
 
 Loads environment variables from .env file for API keys and other secrets.
 """
-import logging
+from dotenv import load_dotenv
 import os
 
-from dotenv import load_dotenv
-
 load_dotenv()
 
-# Logging configuration
-log_level = os.getenv("LOG_LEVEL", "INFO").upper()
-logging.basicConfig(
-    level=getattr(logging, log_level, logging.INFO),
-    format="%(asctime)s %(levelname)s %(name)s %(message)s",
-)
-
 # SerpAPI key for patent search
 api_key = os.getenv("API_KEY")
 
@@ -39,12 +30,6 @@ use_database = os.getenv("USE_DATABASE", "false").lower() in ("true", "1", "yes"
 patent_search_days = int(os.getenv("PATENT_SEARCH_DAYS", "90"))
 patent_thread_workers = int(os.getenv("PATENT_THREAD_WORKERS", "5"))
 
-# LLM model to use via OpenRouter (e.g. "anthropic/claude-3.5-sonnet", "openai/gpt-4o")
-model = os.getenv("MODEL", "anthropic/claude-3.5-sonnet")
-
-# SERP cache TTL in hours (how long cached search results are considered fresh)
-serp_cache_ttl_hours = int(os.getenv("SERP_CACHE_TTL_HOURS", "24"))
-
 # Root path for running behind a reverse proxy (e.g., "/api" when served at /api/)
 # This ensures OpenAPI docs work correctly when accessed via the proxy
 root_path = os.getenv("ROOT_PATH", "")

SPARC/database.py

@@ -221,8 +221,6 @@ class DatabaseClient:
         Returns:
             Cached message dict if found, None otherwise
         """
-        self.connect()
-
         prompt_hash = self.hash_prompt(prompt)
 
         query = """
@@ -245,10 +243,11 @@ class DatabaseClient:
 
         query += " ORDER BY timestamp DESC LIMIT 1"
 
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(query, params)
-            result = cursor.fetchone()
-            return dict(result) if result else None
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(query, params)
+                result = cursor.fetchone()
+                return dict(result) if result else None
 
     def store_message(
         self,
@@ -276,33 +275,32 @@ class DatabaseClient:
         Returns:
             The ID of the inserted record
         """
-        self.connect()
-
         prompt_hash = self.hash_prompt(prompt)
 
-        with self.conn.cursor() as cursor:
-            cursor.execute(
-                """
-                INSERT INTO llm_messages
-                (prompt, prompt_hash, response, company_name, analysis_type, model, metadata, token_usage, is_cached)
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
-                RETURNING id
-                """,
-                (
-                    prompt,
-                    prompt_hash,
-                    response,
-                    company_name,
-                    analysis_type,
-                    model,
-                    json.dumps(metadata) if metadata else None,
-                    json.dumps(token_usage) if token_usage else None,
-                    is_cached,
-                ),
-            )
+        with self.get_conn() as conn:
+            with conn.cursor() as cursor:
+                cursor.execute(
+                    """
+                    INSERT INTO llm_messages
+                    (prompt, prompt_hash, response, company_name, analysis_type, model, metadata, token_usage, is_cached)
+                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
+                    RETURNING id
+                    """,
+                    (
+                        prompt,
+                        prompt_hash,
+                        response,
+                        company_name,
+                        analysis_type,
+                        model,
+                        json.dumps(metadata) if metadata else None,
+                        json.dumps(token_usage) if token_usage else None,
+                        is_cached,
+                    ),
+                )
 
-            message_id = cursor.fetchone()[0]
-            self.conn.commit()
+                message_id = cursor.fetchone()[0]
+            conn.commit()
 
             return message_id
 
@@ -324,8 +322,6 @@ class DatabaseClient:
         Returns:
             List of message dictionaries
         """
-        self.connect()
-
         query = "SELECT * FROM llm_messages WHERE 1=1"
         params = []
 
@@ -340,9 +336,10 @@ class DatabaseClient:
         query += " ORDER BY timestamp DESC LIMIT %s OFFSET %s"
         params.extend([limit, offset])
 
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(query, params)
-            return [dict(row) for row in cursor.fetchall()]
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(query, params)
+                return [dict(row) for row in cursor.fetchall()]
 
     def get_analytics(self, days: int = 30) -> Dict:
         """Get analytics on message usage.
@@ -353,53 +350,52 @@ class DatabaseClient:
         Returns:
             Dictionary with analytics data
         """
-        self.connect()
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                # Total messages
+                cursor.execute(
+                    """
+                    SELECT COUNT(*) as total_messages
+                    FROM llm_messages
+                    WHERE timestamp >= NOW() - INTERVAL '%s days'
+                    """,
+                    (days,),
+                )
+                total = cursor.fetchone()["total_messages"]
 
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            # Total messages
-            cursor.execute(
-                """
-                SELECT COUNT(*) as total_messages
-                FROM llm_messages
-                WHERE timestamp >= NOW() - INTERVAL '%s days'
-                """,
-                (days,),
-            )
-            total = cursor.fetchone()["total_messages"]
+                # Messages by company
+                cursor.execute(
+                    """
+                    SELECT company_name, COUNT(*) as count
+                    FROM llm_messages
+                    WHERE timestamp >= NOW() - INTERVAL '%s days'
+                    GROUP BY company_name
+                    ORDER BY count DESC
+                    LIMIT 10
+                    """,
+                    (days,),
+                )
+                by_company = cursor.fetchall()
 
-            # Messages by company
-            cursor.execute(
-                """
-                SELECT company_name, COUNT(*) as count
-                FROM llm_messages
-                WHERE timestamp >= NOW() - INTERVAL '%s days'
-                GROUP BY company_name
-                ORDER BY count DESC
-                LIMIT 10
-                """,
-                (days,),
-            )
-            by_company = cursor.fetchall()
+                # Messages by type
+                cursor.execute(
+                    """
+                    SELECT analysis_type, COUNT(*) as count
+                    FROM llm_messages
+                    WHERE timestamp >= NOW() - INTERVAL '%s days'
+                    GROUP BY analysis_type
+                    ORDER BY count DESC
+                    """,
+                    (days,),
+                )
+                by_type = cursor.fetchall()
 
-            # Messages by type
-            cursor.execute(
-                """
-                SELECT analysis_type, COUNT(*) as count
-                FROM llm_messages
-                WHERE timestamp >= NOW() - INTERVAL '%s days'
-                GROUP BY analysis_type
-                ORDER BY count DESC
-                """,
-                (days,),
-            )
-            by_type = cursor.fetchall()
-
-            return {
-                "total_messages": total,
-                "by_company": [dict(row) for row in by_company],
-                "by_type": [dict(row) for row in by_type],
-                "period_days": days,
-            }
+                return {
+                    "total_messages": total,
+                    "by_company": [dict(row) for row in by_company],
+                    "by_type": [dict(row) for row in by_type],
+                    "period_days": days,
+                }
 
     # Patent Cache Methods
 
@@ -650,25 +646,23 @@ class DatabaseClient:
         Returns:
             Created user dict or None if email exists
         """
-        self.connect()
-
         password_hash = self.hash_password(password)
 
         try:
-            with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-                cursor.execute(
-                    """
-                    INSERT INTO users (email, password_hash, role)
-                    VALUES (%s, %s, %s)
-                    RETURNING id, email, role, created_at
-                    """,
-                    (email, password_hash, role),
-                )
-                user = cursor.fetchone()
-                self.conn.commit()
+            with self.get_conn() as conn:
+                with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                    cursor.execute(
+                        """
+                        INSERT INTO users (email, password_hash, role)
+                        VALUES (%s, %s, %s)
+                        RETURNING id, email, role, created_at
+                        """,
+                        (email, password_hash, role),
+                    )
+                    user = cursor.fetchone()
+                conn.commit()
                 return dict(user) if user else None
         except psycopg2.errors.UniqueViolation:
-            self.conn.rollback()
             return None
 
     def authenticate_user(self, email: str, password: str) -> Optional[Dict]:
@@ -681,23 +675,22 @@ class DatabaseClient:
         Returns:
             User dict if authenticated, None otherwise
         """
-        self.connect()
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(
+                    "SELECT * FROM users WHERE email = %s",
+                    (email,),
+                )
+                user = cursor.fetchone()
 
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(
-                "SELECT * FROM users WHERE email = %s",
-                (email,),
-            )
-            user = cursor.fetchone()
-
-            if user and self.verify_password(password, user["password_hash"]):
-                return {
-                    "id": user["id"],
-                    "email": user["email"],
-                    "role": user["role"],
-                    "created_at": user["created_at"],
-                }
-            return None
+                if user and self.verify_password(password, user["password_hash"]):
+                    return {
+                        "id": user["id"],
+                        "email": user["email"],
+                        "role": user["role"],
+                        "created_at": user["created_at"],
+                    }
+                return None
 
     def get_user_by_id(self, user_id: int) -> Optional[Dict]:
         """Get a user by ID.
@@ -708,15 +701,14 @@ class DatabaseClient:
         Returns:
             User dict or None
         """
-        self.connect()
-
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(
-                "SELECT id, email, role, created_at FROM users WHERE id = %s",
-                (user_id,),
-            )
-            user = cursor.fetchone()
-            return dict(user) if user else None
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(
+                    "SELECT id, email, role, created_at FROM users WHERE id = %s",
+                    (user_id,),
+                )
+                user = cursor.fetchone()
+                return dict(user) if user else None
 
     def get_user_by_email(self, email: str) -> Optional[Dict]:
         """Get a user by email.
@@ -727,15 +719,14 @@ class DatabaseClient:
         Returns:
             User dict or None
         """
-        self.connect()
-
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(
-                "SELECT id, email, role, created_at FROM users WHERE email = %s",
-                (email,),
-            )
-            user = cursor.fetchone()
-            return dict(user) if user else None
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(
+                    "SELECT id, email, role, created_at FROM users WHERE email = %s",
+                    (email,),
+                )
+                user = cursor.fetchone()
+                return dict(user) if user else None
 
     def get_all_users(self, limit: int = 100, offset: int = 0) -> List[Dict]:
         """Get all users (admin only).
@@ -747,19 +738,18 @@ class DatabaseClient:
         Returns:
             List of user dicts
         """
-        self.connect()
-
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(
-                """
-                SELECT id, email, role, created_at
-                FROM users
-                ORDER BY created_at DESC
-                LIMIT %s OFFSET %s
-                """,
-                (limit, offset),
-            )
-            return [dict(row) for row in cursor.fetchall()]
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(
+                    """
+                    SELECT id, email, role, created_at
+                    FROM users
+                    ORDER BY created_at DESC
+                    LIMIT %s OFFSET %s
+                    """,
+                    (limit, offset),
+                )
+                return [dict(row) for row in cursor.fetchall()]
 
     def update_user_role(self, user_id: int, role: str) -> Optional[Dict]:
         """Update a user's role (admin only).
@@ -771,20 +761,19 @@ class DatabaseClient:
         Returns:
             Updated user dict or None
         """
-        self.connect()
-
-        with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
-            cursor.execute(
-                """
-                UPDATE users
-                SET role = %s, updated_at = CURRENT_TIMESTAMP
-                WHERE id = %s
-                RETURNING id, email, role, created_at
-                """,
-                (role, user_id),
-            )
-            user = cursor.fetchone()
-            self.conn.commit()
+        with self.get_conn() as conn:
+            with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+                cursor.execute(
+                    """
+                    UPDATE users
+                    SET role = %s, updated_at = CURRENT_TIMESTAMP
+                    WHERE id = %s
+                    RETURNING id, email, role, created_at
+                    """,
+                    (role, user_id),
+                )
+                user = cursor.fetchone()
+            conn.commit()
             return dict(user) if user else None
 
     def delete_user(self, user_id: int) -> bool:
@@ -796,12 +785,11 @@ class DatabaseClient:
         Returns:
             True if deleted
         """
-        self.connect()
-
-        with self.conn.cursor() as cursor:
-            cursor.execute("DELETE FROM users WHERE id = %s", (user_id,))
-            deleted = cursor.rowcount > 0
-            self.conn.commit()
+        with self.get_conn() as conn:
+            with conn.cursor() as cursor:
+                cursor.execute("DELETE FROM users WHERE id = %s", (user_id,))
+                deleted = cursor.rowcount > 0
+            conn.commit()
             return deleted
 
     def get_user_count(self) -> int:
@@ -810,8 +798,7 @@ class DatabaseClient:
         Returns:
             Number of users
         """
-        self.connect()
-
-        with self.conn.cursor() as cursor:
-            cursor.execute("SELECT COUNT(*) FROM users")
-            return cursor.fetchone()[0]
+        with self.get_conn() as conn:
+            with conn.cursor() as cursor:
+                cursor.execute("SELECT COUNT(*) FROM users")
+                return cursor.fetchone()[0]

SPARC/llm.py

@@ -1,14 +1,9 @@
 """LLM integration for patent analysis using OpenRouter."""
 
-import logging
-from typing import Dict
-
 from openai import OpenAI
-
 from SPARC import config
 from SPARC.database import DatabaseClient
-
-logger = logging.getLogger(__name__)
+from typing import Dict
 
 
 class LLMAnalyzer:
@@ -25,7 +20,7 @@ class LLMAnalyzer:
         """
         self.test_mode = test_mode
         self.use_cache = use_cache if use_cache is not None else config.use_cache
-        self.model = config.model
+        self.model = "anthropic/claude-3.5-sonnet"
 
         # Always initialize database client for storage and caching
         self.db_client = DatabaseClient(config.database_url)
@@ -64,7 +59,11 @@ Patent Content:
 Provide a concise analysis (2-3 paragraphs) focusing on what this patent reveals about the company's technical direction and competitive advantage."""
 
         if self.test_mode:
-            logger.debug("TEST MODE - Prompt that would be sent to LLM:\n%s", prompt)
+            print("=" * 80)
+            print("TEST MODE - Prompt that would be sent to LLM:")
+            print("=" * 80)
+            print(prompt)
+            print("=" * 80)
             return "[TEST MODE - No API call made]"
 
         # Check cache first
@@ -166,7 +165,7 @@ Patent Portfolio:
 Provide a comprehensive analysis (4-5 paragraphs) with a final verdict on the company's innovation strength and performance outlook."""
 
         if self.test_mode:
-            logger.debug("TEST MODE - Portfolio prompt:\n%s", prompt)
+            print(prompt)
             return "[TEST MODE]"
 
         metadata = {

SPARC/types.py

@@ -4,7 +4,7 @@ from datetime import datetime
 
 @dataclass
 class Patent:
-    patent_id: str
+    patent_id: int
     pdf_link: str
     pdf_path: str | None = None
     summary: dict | None = None