forked from 0xWheatyz/SPARC
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c317632edb |
+16
-21
@@ -5,13 +5,10 @@ to provide company performance estimation based on patent portfolios.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import logging
|
|
||||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|
||||||
from SPARC import config
|
from SPARC import config
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
from SPARC.database import DatabaseClient
|
from SPARC.database import DatabaseClient
|
||||||
from SPARC.llm import LLMAnalyzer
|
from SPARC.llm import LLMAnalyzer
|
||||||
from SPARC.serp_api import SERP
|
from SPARC.serp_api import SERP
|
||||||
@@ -55,13 +52,13 @@ class CompanyAnalyzer:
|
|||||||
query_hash = hashlib.sha256(company_name.lower().encode()).hexdigest()
|
query_hash = hashlib.sha256(company_name.lower().encode()).hexdigest()
|
||||||
cached_ids = self.db.get_cached_serp_query(query_hash)
|
cached_ids = self.db.get_cached_serp_query(query_hash)
|
||||||
if cached_ids is not None:
|
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=[
|
patents = Patents(patents=[
|
||||||
Patent(patent_id=pid, pdf_link="")
|
Patent(patent_id=pid, pdf_link="")
|
||||||
for pid in cached_ids
|
for pid in cached_ids
|
||||||
])
|
])
|
||||||
else:
|
else:
|
||||||
logger.info("Retrieving patents for %s...", company_name)
|
print(f"Retrieving patents for {company_name}...")
|
||||||
patents = SERP.query(company_name)
|
patents = SERP.query(company_name)
|
||||||
# Cache the SERP results
|
# Cache the SERP results
|
||||||
if patents.patents:
|
if patents.patents:
|
||||||
@@ -69,13 +66,12 @@ class CompanyAnalyzer:
|
|||||||
company_name=company_name,
|
company_name=company_name,
|
||||||
query_hash=query_hash,
|
query_hash=query_hash,
|
||||||
patent_ids=[p.patent_id for p in patents.patents],
|
patent_ids=[p.patent_id for p in patents.patents],
|
||||||
ttl_hours=config.serp_cache_ttl_hours,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if not patents.patents:
|
if not patents.patents:
|
||||||
return f"No patents found for {company_name}"
|
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
|
# Download, parse, and minimize patents in parallel
|
||||||
processed_patents = []
|
processed_patents = []
|
||||||
@@ -91,12 +87,12 @@ class CompanyAnalyzer:
|
|||||||
if result:
|
if result:
|
||||||
processed_patents.append(result)
|
processed_patents.append(result)
|
||||||
except Exception as e:
|
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:
|
if not processed_patents:
|
||||||
return f"Failed to process any patents for {company_name}"
|
return f"Failed to process any patents for {company_name}"
|
||||||
|
|
||||||
logger.info("Analyzing portfolio with LLM...")
|
print("Analyzing portfolio with LLM...")
|
||||||
|
|
||||||
# Analyze the full portfolio with LLM
|
# Analyze the full portfolio with LLM
|
||||||
analysis = self.llm_analyzer.analyze_patent_portfolio(
|
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.
|
FileNotFoundError: If the patent PDF is not found at the expected path.
|
||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
logger.info("Analyzing patent %s for %s...", patent_id, company_name)
|
|
||||||
|
|
||||||
patent_path = f"patents/{patent_id}.pdf"
|
patent_path = f"patents/{patent_id}.pdf"
|
||||||
|
|
||||||
@@ -188,7 +183,7 @@ class CompanyAnalyzer:
|
|||||||
|
|
||||||
return {"patent_id": patent.patent_id, "content": minimized_content}
|
return {"patent_id": patent.patent_id, "content": minimized_content}
|
||||||
except Exception as e:
|
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
|
return None
|
||||||
|
|
||||||
def _analyze_company_safe(self, company_name: str) -> CompanyAnalysisResult:
|
def _analyze_company_safe(self, company_name: str) -> CompanyAnalysisResult:
|
||||||
@@ -259,7 +254,7 @@ class CompanyAnalyzer:
|
|||||||
results: list[CompanyAnalysisResult] = []
|
results: list[CompanyAnalysisResult] = []
|
||||||
total = len(companies)
|
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:
|
with ThreadPoolExecutor(max_workers=max_workers) as executor:
|
||||||
future_to_company = {
|
future_to_company = {
|
||||||
@@ -276,8 +271,8 @@ class CompanyAnalyzer:
|
|||||||
result = future.result()
|
result = future.result()
|
||||||
results.append(result)
|
results.append(result)
|
||||||
|
|
||||||
status = "OK" if result.success else "FAIL"
|
status = "✓" if result.success else "✗"
|
||||||
logger.info("[%d/%d] %s %s", completed, total, status, company)
|
print(f"[{completed}/{total}] {status} {company}")
|
||||||
|
|
||||||
if progress_callback:
|
if progress_callback:
|
||||||
progress_callback(company, completed, total)
|
progress_callback(company, completed, total)
|
||||||
@@ -292,12 +287,12 @@ class CompanyAnalyzer:
|
|||||||
error=str(e),
|
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)
|
successful = sum(1 for r in results if r.success)
|
||||||
failed = total - successful
|
failed = total - successful
|
||||||
|
|
||||||
logger.info("Batch complete: %d succeeded, %d failed", successful, failed)
|
print(f"\nBatch complete: {successful} succeeded, {failed} failed")
|
||||||
|
|
||||||
return BatchAnalysisResult(
|
return BatchAnalysisResult(
|
||||||
results=results,
|
results=results,
|
||||||
@@ -323,20 +318,20 @@ class CompanyAnalyzer:
|
|||||||
results: list[CompanyAnalysisResult] = []
|
results: list[CompanyAnalysisResult] = []
|
||||||
total = len(companies)
|
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):
|
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)
|
result = self._analyze_company_safe(company)
|
||||||
results.append(result)
|
results.append(result)
|
||||||
|
|
||||||
status = "OK" if result.success else "FAIL"
|
status = "✓" if result.success else "✗"
|
||||||
logger.info("[%d/%d] %s %s", idx, total, status, company)
|
print(f"[{idx}/{total}] {status} {company}")
|
||||||
|
|
||||||
successful = sum(1 for r in results if r.success)
|
successful = sum(1 for r in results if r.success)
|
||||||
failed = total - successful
|
failed = total - successful
|
||||||
|
|
||||||
logger.info("Batch complete: %d succeeded, %d failed", successful, failed)
|
print(f"\nBatch complete: {successful} succeeded, {failed} failed")
|
||||||
|
|
||||||
return BatchAnalysisResult(
|
return BatchAnalysisResult(
|
||||||
results=results,
|
results=results,
|
||||||
|
|||||||
+1
-5
@@ -21,13 +21,11 @@ from SPARC.auth import (
|
|||||||
TokenResponse,
|
TokenResponse,
|
||||||
UserResponse,
|
UserResponse,
|
||||||
check_jwt_secret,
|
check_jwt_secret,
|
||||||
close_db_client,
|
|
||||||
create_tokens,
|
create_tokens,
|
||||||
decode_token,
|
decode_token,
|
||||||
get_current_admin,
|
get_current_admin,
|
||||||
get_current_user,
|
get_current_user,
|
||||||
get_db_client,
|
get_db_client,
|
||||||
init_db_client,
|
|
||||||
)
|
)
|
||||||
from SPARC.types import BatchAnalysisResult, CompanyAnalysisResult
|
from SPARC.types import BatchAnalysisResult, CompanyAnalysisResult
|
||||||
|
|
||||||
@@ -157,7 +155,6 @@ async def lifespan(app: FastAPI):
|
|||||||
"""Initialize resources on startup, clean up on shutdown."""
|
"""Initialize resources on startup, clean up on shutdown."""
|
||||||
global _analyzer
|
global _analyzer
|
||||||
check_jwt_secret()
|
check_jwt_secret()
|
||||||
init_db_client()
|
|
||||||
_analyzer = CompanyAnalyzer()
|
_analyzer = CompanyAnalyzer()
|
||||||
# Mark any jobs that were running/pending before the restart as failed
|
# Mark any jobs that were running/pending before the restart as failed
|
||||||
from SPARC.database import DatabaseClient
|
from SPARC.database import DatabaseClient
|
||||||
@@ -170,9 +167,8 @@ async def lifespan(app: FastAPI):
|
|||||||
logging.getLogger(__name__).warning("Marked %d stale jobs as failed on startup", stale)
|
logging.getLogger(__name__).warning("Marked %d stale jobs as failed on startup", stale)
|
||||||
_db.close()
|
_db.close()
|
||||||
yield
|
yield
|
||||||
# Cleanup
|
# Cleanup if needed
|
||||||
_analyzer = None
|
_analyzer = None
|
||||||
close_db_client()
|
|
||||||
|
|
||||||
|
|
||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
|
|||||||
+4
-29
@@ -146,36 +146,11 @@ def decode_token(token: str) -> Optional[TokenPayload]:
|
|||||||
return None
|
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:
|
def get_db_client() -> DatabaseClient:
|
||||||
"""Get the shared pooled database client for auth operations.
|
"""Get database client for auth operations."""
|
||||||
|
client = DatabaseClient(config.database_url)
|
||||||
Returns the module-level singleton DatabaseClient. If not yet initialized
|
client.connect()
|
||||||
(e.g., during tests), creates a new instance as a fallback.
|
return client
|
||||||
"""
|
|
||||||
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(
|
async def get_current_user(
|
||||||
|
|||||||
@@ -2,20 +2,12 @@
|
|||||||
|
|
||||||
Loads environment variables from .env file for API keys and other secrets.
|
Loads environment variables from .env file for API keys and other secrets.
|
||||||
"""
|
"""
|
||||||
import logging
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
|
|
||||||
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
|
# SerpAPI key for patent search
|
||||||
api_key = os.getenv("API_KEY")
|
api_key = os.getenv("API_KEY")
|
||||||
|
|
||||||
@@ -39,12 +31,6 @@ use_database = os.getenv("USE_DATABASE", "false").lower() in ("true", "1", "yes"
|
|||||||
patent_search_days = int(os.getenv("PATENT_SEARCH_DAYS", "90"))
|
patent_search_days = int(os.getenv("PATENT_SEARCH_DAYS", "90"))
|
||||||
patent_thread_workers = int(os.getenv("PATENT_THREAD_WORKERS", "5"))
|
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/)
|
# 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
|
# This ensures OpenAPI docs work correctly when accessed via the proxy
|
||||||
root_path = os.getenv("ROOT_PATH", "")
|
root_path = os.getenv("ROOT_PATH", "")
|
||||||
|
|||||||
+41
-28
@@ -222,6 +222,8 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Cached message dict if found, None otherwise
|
Cached message dict if found, None otherwise
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
prompt_hash = self.hash_prompt(prompt)
|
prompt_hash = self.hash_prompt(prompt)
|
||||||
|
|
||||||
query = """
|
query = """
|
||||||
@@ -244,8 +246,7 @@ class DatabaseClient:
|
|||||||
|
|
||||||
query += " ORDER BY timestamp DESC LIMIT 1"
|
query += " ORDER BY timestamp DESC LIMIT 1"
|
||||||
|
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(query, params)
|
cursor.execute(query, params)
|
||||||
result = cursor.fetchone()
|
result = cursor.fetchone()
|
||||||
return dict(result) if result else None
|
return dict(result) if result else None
|
||||||
@@ -276,10 +277,11 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
The ID of the inserted record
|
The ID of the inserted record
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
prompt_hash = self.hash_prompt(prompt)
|
prompt_hash = self.hash_prompt(prompt)
|
||||||
|
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor() as cursor:
|
||||||
with conn.cursor() as cursor:
|
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO llm_messages
|
INSERT INTO llm_messages
|
||||||
@@ -301,7 +303,7 @@ class DatabaseClient:
|
|||||||
)
|
)
|
||||||
|
|
||||||
message_id = cursor.fetchone()[0]
|
message_id = cursor.fetchone()[0]
|
||||||
conn.commit()
|
self.conn.commit()
|
||||||
|
|
||||||
return message_id
|
return message_id
|
||||||
|
|
||||||
@@ -323,6 +325,8 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
List of message dictionaries
|
List of message dictionaries
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
query = "SELECT * FROM llm_messages WHERE 1=1"
|
query = "SELECT * FROM llm_messages WHERE 1=1"
|
||||||
params = []
|
params = []
|
||||||
|
|
||||||
@@ -337,8 +341,7 @@ class DatabaseClient:
|
|||||||
query += " ORDER BY timestamp DESC LIMIT %s OFFSET %s"
|
query += " ORDER BY timestamp DESC LIMIT %s OFFSET %s"
|
||||||
params.extend([limit, offset])
|
params.extend([limit, offset])
|
||||||
|
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(query, params)
|
cursor.execute(query, params)
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
return [dict(row) for row in cursor.fetchall()]
|
||||||
|
|
||||||
@@ -351,8 +354,9 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Dictionary with analytics data
|
Dictionary with analytics data
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
# Total messages
|
# Total messages
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"""
|
"""
|
||||||
@@ -647,11 +651,12 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Created user dict or None if email exists
|
Created user dict or None if email exists
|
||||||
"""
|
"""
|
||||||
|
self.connect()
|
||||||
|
|
||||||
password_hash = self.hash_password(password)
|
password_hash = self.hash_password(password)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with self.get_conn() as conn:
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO users (email, password_hash, role)
|
INSERT INTO users (email, password_hash, role)
|
||||||
@@ -661,9 +666,10 @@ class DatabaseClient:
|
|||||||
(email, password_hash, role),
|
(email, password_hash, role),
|
||||||
)
|
)
|
||||||
user = cursor.fetchone()
|
user = cursor.fetchone()
|
||||||
conn.commit()
|
self.conn.commit()
|
||||||
return dict(user) if user else None
|
return dict(user) if user else None
|
||||||
except psycopg2.errors.UniqueViolation:
|
except psycopg2.errors.UniqueViolation:
|
||||||
|
self.conn.rollback()
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def authenticate_user(self, email: str, password: str) -> Optional[Dict]:
|
def authenticate_user(self, email: str, password: str) -> Optional[Dict]:
|
||||||
@@ -676,8 +682,9 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
User dict if authenticated, None otherwise
|
User dict if authenticated, None otherwise
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"SELECT * FROM users WHERE email = %s",
|
"SELECT * FROM users WHERE email = %s",
|
||||||
(email,),
|
(email,),
|
||||||
@@ -702,8 +709,9 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
User dict or None
|
User dict or None
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"SELECT id, email, role, created_at FROM users WHERE id = %s",
|
"SELECT id, email, role, created_at FROM users WHERE id = %s",
|
||||||
(user_id,),
|
(user_id,),
|
||||||
@@ -720,8 +728,9 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
User dict or None
|
User dict or None
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"SELECT id, email, role, created_at FROM users WHERE email = %s",
|
"SELECT id, email, role, created_at FROM users WHERE email = %s",
|
||||||
(email,),
|
(email,),
|
||||||
@@ -739,8 +748,9 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
List of user dicts
|
List of user dicts
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"""
|
"""
|
||||||
SELECT id, email, role, created_at
|
SELECT id, email, role, created_at
|
||||||
@@ -762,8 +772,9 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Updated user dict or None
|
Updated user dict or None
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
|
with self.conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
||||||
cursor.execute(
|
cursor.execute(
|
||||||
"""
|
"""
|
||||||
UPDATE users
|
UPDATE users
|
||||||
@@ -774,7 +785,7 @@ class DatabaseClient:
|
|||||||
(role, user_id),
|
(role, user_id),
|
||||||
)
|
)
|
||||||
user = cursor.fetchone()
|
user = cursor.fetchone()
|
||||||
conn.commit()
|
self.conn.commit()
|
||||||
return dict(user) if user else None
|
return dict(user) if user else None
|
||||||
|
|
||||||
def delete_user(self, user_id: int) -> bool:
|
def delete_user(self, user_id: int) -> bool:
|
||||||
@@ -786,11 +797,12 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
True if deleted
|
True if deleted
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor() as cursor:
|
|
||||||
|
with self.conn.cursor() as cursor:
|
||||||
cursor.execute("DELETE FROM users WHERE id = %s", (user_id,))
|
cursor.execute("DELETE FROM users WHERE id = %s", (user_id,))
|
||||||
deleted = cursor.rowcount > 0
|
deleted = cursor.rowcount > 0
|
||||||
conn.commit()
|
self.conn.commit()
|
||||||
return deleted
|
return deleted
|
||||||
|
|
||||||
def get_user_count(self) -> int:
|
def get_user_count(self) -> int:
|
||||||
@@ -799,7 +811,8 @@ class DatabaseClient:
|
|||||||
Returns:
|
Returns:
|
||||||
Number of users
|
Number of users
|
||||||
"""
|
"""
|
||||||
with self.get_conn() as conn:
|
self.connect()
|
||||||
with conn.cursor() as cursor:
|
|
||||||
|
with self.conn.cursor() as cursor:
|
||||||
cursor.execute("SELECT COUNT(*) FROM users")
|
cursor.execute("SELECT COUNT(*) FROM users")
|
||||||
return cursor.fetchone()[0]
|
return cursor.fetchone()[0]
|
||||||
|
|||||||
+7
-6
@@ -1,6 +1,5 @@
|
|||||||
"""LLM integration for patent analysis using OpenRouter."""
|
"""LLM integration for patent analysis using OpenRouter."""
|
||||||
|
|
||||||
import logging
|
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
|
|
||||||
from openai import OpenAI
|
from openai import OpenAI
|
||||||
@@ -8,8 +7,6 @@ from openai import OpenAI
|
|||||||
from SPARC import config
|
from SPARC import config
|
||||||
from SPARC.database import DatabaseClient
|
from SPARC.database import DatabaseClient
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class LLMAnalyzer:
|
class LLMAnalyzer:
|
||||||
"""Handles LLM-based analysis of patent content."""
|
"""Handles LLM-based analysis of patent content."""
|
||||||
@@ -25,7 +22,7 @@ class LLMAnalyzer:
|
|||||||
"""
|
"""
|
||||||
self.test_mode = test_mode
|
self.test_mode = test_mode
|
||||||
self.use_cache = use_cache if use_cache is not None else config.use_cache
|
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
|
# Always initialize database client for storage and caching
|
||||||
self.db_client = DatabaseClient(config.database_url)
|
self.db_client = DatabaseClient(config.database_url)
|
||||||
@@ -64,7 +61,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."""
|
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:
|
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]"
|
return "[TEST MODE - No API call made]"
|
||||||
|
|
||||||
# Check cache first
|
# Check cache first
|
||||||
@@ -166,7 +167,7 @@ Patent Portfolio:
|
|||||||
Provide a comprehensive analysis (4-5 paragraphs) with a final verdict on the company's innovation strength and performance outlook."""
|
Provide a comprehensive analysis (4-5 paragraphs) with a final verdict on the company's innovation strength and performance outlook."""
|
||||||
|
|
||||||
if self.test_mode:
|
if self.test_mode:
|
||||||
logger.debug("TEST MODE - Portfolio prompt:\n%s", prompt)
|
print(prompt)
|
||||||
return "[TEST MODE]"
|
return "[TEST MODE]"
|
||||||
|
|
||||||
metadata = {
|
metadata = {
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ from datetime import datetime
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Patent:
|
class Patent:
|
||||||
patent_id: str
|
patent_id: int
|
||||||
pdf_link: str
|
pdf_link: str
|
||||||
pdf_path: str | None = None
|
pdf_path: str | None = None
|
||||||
summary: dict | None = None
|
summary: dict | None = None
|
||||||
|
|||||||
@@ -7,15 +7,6 @@
|
|||||||
<title>SPARC Dashboard</title>
|
<title>SPARC Dashboard</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script>
|
|
||||||
// Prevent FOUC: apply saved theme before first render
|
|
||||||
(function() {
|
|
||||||
var theme = localStorage.getItem('theme');
|
|
||||||
if (theme === 'dark' || (!theme && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
|
|
||||||
document.documentElement.classList.add('dark');
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
</script>
|
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
|
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
|
||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||||
import { AuthProvider } from './context/AuthContext';
|
import { AuthProvider } from './context/AuthContext';
|
||||||
import { ThemeProvider } from './context/ThemeContext';
|
|
||||||
import { Layout } from './components/Layout';
|
import { Layout } from './components/Layout';
|
||||||
import { ProtectedRoute } from './components/ProtectedRoute';
|
import { ProtectedRoute } from './components/ProtectedRoute';
|
||||||
import { Login } from './pages/Login';
|
import { Login } from './pages/Login';
|
||||||
@@ -23,7 +22,6 @@ const queryClient = new QueryClient({
|
|||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
<ThemeProvider>
|
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
@@ -63,7 +61,6 @@ function App() {
|
|||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
</ThemeProvider>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
import { Outlet, NavLink, useNavigate } from 'react-router-dom';
|
import { Outlet, NavLink, useNavigate } from 'react-router-dom';
|
||||||
import { useAuth } from '../context/AuthContext';
|
import { useAuth } from '../context/AuthContext';
|
||||||
import { useTheme } from '../context/ThemeContext';
|
import { Search, Layers, BarChart3, Info, Users, LogOut } from 'lucide-react';
|
||||||
import { Search, Layers, BarChart3, Info, Users, LogOut, Sun, Moon } from 'lucide-react';
|
|
||||||
|
|
||||||
export function Layout() {
|
export function Layout() {
|
||||||
const { user, isAdmin, logout } = useAuth();
|
const { user, isAdmin, logout } = useAuth();
|
||||||
const { theme, toggleTheme } = useTheme();
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const handleLogout = () => {
|
const handleLogout = () => {
|
||||||
@@ -25,7 +23,7 @@ export function Layout() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-slate-100 dark:to-indigo-950">
|
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-indigo-950">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<header className="bg-bg-card/80 backdrop-blur-lg border-b border-primary/20">
|
<header className="bg-bg-card/80 backdrop-blur-lg border-b border-primary/20">
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||||
@@ -65,13 +63,6 @@ export function Layout() {
|
|||||||
|
|
||||||
{/* User menu */}
|
{/* User menu */}
|
||||||
<div className="flex items-center gap-4">
|
<div className="flex items-center gap-4">
|
||||||
<button
|
|
||||||
onClick={toggleTheme}
|
|
||||||
className="p-2 rounded-lg text-text-secondary hover:text-text-primary hover:bg-bg-card-hover transition-all"
|
|
||||||
aria-label={theme === 'dark' ? 'Switch to light mode' : 'Switch to dark mode'}
|
|
||||||
>
|
|
||||||
{theme === 'dark' ? <Sun size={18} /> : <Moon size={18} />}
|
|
||||||
</button>
|
|
||||||
<div className="text-right hidden sm:block">
|
<div className="text-right hidden sm:block">
|
||||||
<div className="text-sm font-medium text-text-primary">{user?.email}</div>
|
<div className="text-sm font-medium text-text-primary">{user?.email}</div>
|
||||||
<div className="text-xs text-text-secondary capitalize">{user?.role}</div>
|
<div className="text-xs text-text-secondary capitalize">{user?.role}</div>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export function ProtectedRoute({ children, requireAdmin = false }: ProtectedRout
|
|||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-slate-100 dark:to-indigo-950 flex items-center justify-center">
|
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-indigo-950 flex items-center justify-center">
|
||||||
<div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-primary"></div>
|
<div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-primary"></div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
import { createContext, useContext, useEffect, useState } from 'react';
|
|
||||||
|
|
||||||
type Theme = 'light' | 'dark';
|
|
||||||
|
|
||||||
interface ThemeContextType {
|
|
||||||
theme: Theme;
|
|
||||||
toggleTheme: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ThemeContext = createContext<ThemeContextType | undefined>(undefined);
|
|
||||||
|
|
||||||
function getInitialTheme(): Theme {
|
|
||||||
const stored = localStorage.getItem('theme');
|
|
||||||
if (stored === 'light' || stored === 'dark') return stored;
|
|
||||||
return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
|
|
||||||
}
|
|
||||||
|
|
||||||
export function ThemeProvider({ children }: { children: React.ReactNode }) {
|
|
||||||
const [theme, setTheme] = useState<Theme>(getInitialTheme);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const root = document.documentElement;
|
|
||||||
if (theme === 'dark') {
|
|
||||||
root.classList.add('dark');
|
|
||||||
} else {
|
|
||||||
root.classList.remove('dark');
|
|
||||||
}
|
|
||||||
localStorage.setItem('theme', theme);
|
|
||||||
}, [theme]);
|
|
||||||
|
|
||||||
const toggleTheme = () => {
|
|
||||||
setTheme((prev) => (prev === 'dark' ? 'light' : 'dark'));
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ThemeContext.Provider value={{ theme, toggleTheme }}>
|
|
||||||
{children}
|
|
||||||
</ThemeContext.Provider>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useTheme() {
|
|
||||||
const context = useContext(ThemeContext);
|
|
||||||
if (!context) {
|
|
||||||
throw new Error('useTheme must be used within a ThemeProvider');
|
|
||||||
}
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
+2
-22
@@ -2,26 +2,6 @@
|
|||||||
@tailwind components;
|
@tailwind components;
|
||||||
@tailwind utilities;
|
@tailwind utilities;
|
||||||
|
|
||||||
/* Light mode (default) */
|
|
||||||
:root {
|
|
||||||
--color-bg-dark: #f1f5f9;
|
|
||||||
--color-bg-card: #ffffff;
|
|
||||||
--color-bg-card-hover: #e2e8f0;
|
|
||||||
--color-text-primary: #0f172a;
|
|
||||||
--color-text-secondary: #475569;
|
|
||||||
--color-border: #cbd5e1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Dark mode */
|
|
||||||
.dark {
|
|
||||||
--color-bg-dark: #0f172a;
|
|
||||||
--color-bg-card: #1e293b;
|
|
||||||
--color-bg-card-hover: #334155;
|
|
||||||
--color-text-primary: #f8fafc;
|
|
||||||
--color-text-secondary: #94a3b8;
|
|
||||||
--color-border: #334155;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
@@ -35,7 +15,7 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-scrollbar-track {
|
::-webkit-scrollbar-track {
|
||||||
background: var(--color-bg-card);
|
background: #1e293b;
|
||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb {
|
::-webkit-scrollbar-thumb {
|
||||||
@@ -50,5 +30,5 @@ body {
|
|||||||
/* Selection */
|
/* Selection */
|
||||||
::selection {
|
::selection {
|
||||||
background: rgba(99, 102, 241, 0.3);
|
background: rgba(99, 102, 241, 0.3);
|
||||||
color: var(--color-text-primary);
|
color: #f8fafc;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export function Login() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-slate-100 dark:to-indigo-950 flex items-center justify-center px-4">
|
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-indigo-950 flex items-center justify-center px-4">
|
||||||
<div className="w-full max-w-md">
|
<div className="w-full max-w-md">
|
||||||
{/* Brand */}
|
{/* Brand */}
|
||||||
<div className="text-center mb-8">
|
<div className="text-center mb-8">
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ export function Register() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-slate-100 dark:to-indigo-950 flex items-center justify-center px-4">
|
<div className="min-h-screen bg-gradient-to-br from-bg-dark to-indigo-950 flex items-center justify-center px-4">
|
||||||
<div className="w-full max-w-md">
|
<div className="w-full max-w-md">
|
||||||
{/* Brand */}
|
{/* Brand */}
|
||||||
<div className="text-center mb-8">
|
<div className="text-center mb-8">
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ export default {
|
|||||||
"./index.html",
|
"./index.html",
|
||||||
"./src/**/*.{js,ts,jsx,tsx}",
|
"./src/**/*.{js,ts,jsx,tsx}",
|
||||||
],
|
],
|
||||||
darkMode: 'class',
|
|
||||||
theme: {
|
theme: {
|
||||||
extend: {
|
extend: {
|
||||||
colors: {
|
colors: {
|
||||||
@@ -17,15 +16,15 @@ export default {
|
|||||||
warning: '#f59e0b',
|
warning: '#f59e0b',
|
||||||
error: '#ef4444',
|
error: '#ef4444',
|
||||||
bg: {
|
bg: {
|
||||||
dark: 'var(--color-bg-dark)',
|
dark: '#0f172a',
|
||||||
card: 'var(--color-bg-card)',
|
card: '#1e293b',
|
||||||
'card-hover': 'var(--color-bg-card-hover)',
|
'card-hover': '#334155',
|
||||||
},
|
},
|
||||||
text: {
|
text: {
|
||||||
primary: 'var(--color-text-primary)',
|
primary: '#f8fafc',
|
||||||
secondary: 'var(--color-text-secondary)',
|
secondary: '#94a3b8',
|
||||||
},
|
},
|
||||||
border: 'var(--color-border)',
|
border: '#334155',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user