forked from 0xWheatyz/SPARC
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 153eb3b968 |
@@ -169,9 +169,6 @@ async def lifespan(app: FastAPI):
|
|||||||
import logging
|
import logging
|
||||||
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()
|
||||||
# Start scheduled analysis if tracked companies are configured
|
|
||||||
from SPARC.scheduler import start_scheduler
|
|
||||||
start_scheduler()
|
|
||||||
yield
|
yield
|
||||||
# Cleanup
|
# Cleanup
|
||||||
_analyzer = None
|
_analyzer = None
|
||||||
@@ -372,60 +369,6 @@ async def delete_user(
|
|||||||
return {"message": "User deleted"}
|
return {"message": "User deleted"}
|
||||||
|
|
||||||
|
|
||||||
# ============== Tracked Companies Endpoints ==============
|
|
||||||
|
|
||||||
|
|
||||||
class TrackCompanyRequest(BaseModel):
|
|
||||||
"""Request to add a company to tracking."""
|
|
||||||
|
|
||||||
company_name: str = Field(..., min_length=1, max_length=255)
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/admin/tracked", tags=["Admin"])
|
|
||||||
async def list_tracked_companies(
|
|
||||||
_: UserResponse = Depends(get_current_admin),
|
|
||||||
):
|
|
||||||
"""List all tracked companies (admin only)."""
|
|
||||||
db = get_db_client()
|
|
||||||
return db.list_tracked_companies()
|
|
||||||
|
|
||||||
|
|
||||||
@app.post("/admin/tracked", tags=["Admin"])
|
|
||||||
async def add_tracked_company(
|
|
||||||
request: TrackCompanyRequest,
|
|
||||||
_: UserResponse = Depends(get_current_admin),
|
|
||||||
):
|
|
||||||
"""Add a company to the tracked list (admin only)."""
|
|
||||||
db = get_db_client()
|
|
||||||
result = db.add_tracked_company(request.company_name)
|
|
||||||
if not result:
|
|
||||||
raise HTTPException(status_code=409, detail="Company already tracked")
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete("/admin/tracked/{company_name}", tags=["Admin"])
|
|
||||||
async def remove_tracked_company(
|
|
||||||
company_name: str,
|
|
||||||
_: UserResponse = Depends(get_current_admin),
|
|
||||||
):
|
|
||||||
"""Remove a company from the tracked list (admin only)."""
|
|
||||||
db = get_db_client()
|
|
||||||
removed = db.remove_tracked_company(company_name)
|
|
||||||
if not removed:
|
|
||||||
raise HTTPException(status_code=404, detail="Company not found in tracking list")
|
|
||||||
return {"message": f"Stopped tracking {company_name}"}
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/admin/alerts", tags=["Admin"])
|
|
||||||
async def list_alerts(
|
|
||||||
limit: int = Query(default=50, ge=1, le=200),
|
|
||||||
_: UserResponse = Depends(get_current_admin),
|
|
||||||
):
|
|
||||||
"""List recent alerts from scheduled analysis (admin only)."""
|
|
||||||
db = get_db_client()
|
|
||||||
return db.list_alerts(limit=limit)
|
|
||||||
|
|
||||||
|
|
||||||
# ============== Analytics Endpoint ==============
|
# ============== Analytics Endpoint ==============
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -192,35 +192,6 @@ class DatabaseClient:
|
|||||||
ON jobs(status)
|
ON jobs(status)
|
||||||
""")
|
""")
|
||||||
|
|
||||||
# Create tracked companies table for scheduled analysis
|
|
||||||
cursor.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS tracked_companies (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
company_name VARCHAR(255) UNIQUE NOT NULL,
|
|
||||||
last_patent_count INTEGER DEFAULT 0,
|
|
||||||
last_analysis_at TIMESTAMP,
|
|
||||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
|
|
||||||
# Create alerts table for significant changes
|
|
||||||
cursor.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS alerts (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
company_name VARCHAR(255) NOT NULL,
|
|
||||||
alert_type VARCHAR(50) NOT NULL,
|
|
||||||
message TEXT NOT NULL,
|
|
||||||
old_value NUMERIC,
|
|
||||||
new_value NUMERIC,
|
|
||||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
|
|
||||||
cursor.execute("""
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_alerts_company
|
|
||||||
ON alerts(company_name)
|
|
||||||
""")
|
|
||||||
|
|
||||||
self.conn.commit()
|
self.conn.commit()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -832,81 +803,3 @@ class DatabaseClient:
|
|||||||
with conn.cursor() as cursor:
|
with conn.cursor() as cursor:
|
||||||
cursor.execute("SELECT COUNT(*) FROM users")
|
cursor.execute("SELECT COUNT(*) FROM users")
|
||||||
return cursor.fetchone()[0]
|
return cursor.fetchone()[0]
|
||||||
|
|
||||||
# Tracked Companies Methods
|
|
||||||
|
|
||||||
def add_tracked_company(self, company_name: str) -> Optional[Dict]:
|
|
||||||
"""Add a company to the tracking list."""
|
|
||||||
with self.get_conn() as conn:
|
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
try:
|
|
||||||
cursor.execute(
|
|
||||||
"INSERT INTO tracked_companies (company_name) VALUES (%s) RETURNING *",
|
|
||||||
(company_name,),
|
|
||||||
)
|
|
||||||
row = cursor.fetchone()
|
|
||||||
conn.commit()
|
|
||||||
return dict(row) if row else None
|
|
||||||
except Exception:
|
|
||||||
conn.rollback()
|
|
||||||
return None
|
|
||||||
|
|
||||||
def remove_tracked_company(self, company_name: str) -> bool:
|
|
||||||
"""Remove a company from the tracking list."""
|
|
||||||
with self.get_conn() as conn:
|
|
||||||
with conn.cursor() as cursor:
|
|
||||||
cursor.execute(
|
|
||||||
"DELETE FROM tracked_companies WHERE LOWER(company_name) = LOWER(%s)",
|
|
||||||
(company_name,),
|
|
||||||
)
|
|
||||||
conn.commit()
|
|
||||||
return cursor.rowcount > 0
|
|
||||||
|
|
||||||
def list_tracked_companies(self) -> List[Dict]:
|
|
||||||
"""List all tracked companies."""
|
|
||||||
with self.get_conn() as conn:
|
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute("SELECT * FROM tracked_companies ORDER BY company_name")
|
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
|
||||||
|
|
||||||
def update_tracked_company(
|
|
||||||
self, company_name: str, patent_count: int
|
|
||||||
) -> None:
|
|
||||||
"""Update the last analysis stats for a tracked company."""
|
|
||||||
with self.get_conn() as conn:
|
|
||||||
with conn.cursor() as cursor:
|
|
||||||
cursor.execute(
|
|
||||||
"""UPDATE tracked_companies
|
|
||||||
SET last_patent_count = %s, last_analysis_at = CURRENT_TIMESTAMP
|
|
||||||
WHERE LOWER(company_name) = LOWER(%s)""",
|
|
||||||
(patent_count, company_name),
|
|
||||||
)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def store_alert(
|
|
||||||
self,
|
|
||||||
company_name: str,
|
|
||||||
alert_type: str,
|
|
||||||
message: str,
|
|
||||||
old_value: float | None = None,
|
|
||||||
new_value: float | None = None,
|
|
||||||
) -> None:
|
|
||||||
"""Record an alert for a significant change."""
|
|
||||||
with self.get_conn() as conn:
|
|
||||||
with conn.cursor() as cursor:
|
|
||||||
cursor.execute(
|
|
||||||
"""INSERT INTO alerts (company_name, alert_type, message, old_value, new_value)
|
|
||||||
VALUES (%s, %s, %s, %s, %s)""",
|
|
||||||
(company_name, alert_type, message, old_value, new_value),
|
|
||||||
)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
def list_alerts(self, limit: int = 50) -> List[Dict]:
|
|
||||||
"""List recent alerts."""
|
|
||||||
with self.get_conn() as conn:
|
|
||||||
with conn.cursor(cursor_factory=RealDictCursor) as cursor:
|
|
||||||
cursor.execute(
|
|
||||||
"SELECT * FROM alerts ORDER BY created_at DESC LIMIT %s",
|
|
||||||
(limit,),
|
|
||||||
)
|
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
|
||||||
|
|||||||
@@ -1,109 +0,0 @@
|
|||||||
"""Scheduled patent analysis for tracked companies.
|
|
||||||
|
|
||||||
Uses APScheduler to periodically re-analyze tracked companies and
|
|
||||||
detect significant changes in patent counts.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
|
|
||||||
from SPARC import config
|
|
||||||
from SPARC.analyzer import CompanyAnalyzer
|
|
||||||
from SPARC.database import DatabaseClient
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
# Configurable via environment variable (in hours, default 24)
|
|
||||||
SCHEDULE_INTERVAL_HOURS = int(os.getenv("SCHEDULE_INTERVAL_HOURS", "24"))
|
|
||||||
|
|
||||||
# Patent count change threshold (percentage) to trigger an alert
|
|
||||||
CHANGE_THRESHOLD_PERCENT = int(os.getenv("CHANGE_THRESHOLD_PERCENT", "20"))
|
|
||||||
|
|
||||||
|
|
||||||
def run_scheduled_analysis() -> None:
|
|
||||||
"""Re-analyze all tracked companies and check for significant changes."""
|
|
||||||
db = DatabaseClient(config.database_url)
|
|
||||||
db.connect()
|
|
||||||
db.initialize_schema()
|
|
||||||
|
|
||||||
tracked = db.list_tracked_companies()
|
|
||||||
if not tracked:
|
|
||||||
logger.info("No tracked companies configured; skipping scheduled analysis")
|
|
||||||
return
|
|
||||||
|
|
||||||
logger.info("Running scheduled analysis for %d tracked companies", len(tracked))
|
|
||||||
|
|
||||||
analyzer = CompanyAnalyzer(db_client=db)
|
|
||||||
|
|
||||||
for company_row in tracked:
|
|
||||||
name = company_row["company_name"]
|
|
||||||
old_count = company_row.get("last_patent_count", 0) or 0
|
|
||||||
|
|
||||||
try:
|
|
||||||
result = analyzer._analyze_company_safe(name)
|
|
||||||
|
|
||||||
if result.success:
|
|
||||||
new_count = result.patent_count
|
|
||||||
|
|
||||||
# Update tracking record
|
|
||||||
db.update_tracked_company(name, new_count)
|
|
||||||
|
|
||||||
# Check for significant change
|
|
||||||
if old_count > 0:
|
|
||||||
delta_pct = abs(new_count - old_count) / old_count * 100
|
|
||||||
if delta_pct >= CHANGE_THRESHOLD_PERCENT:
|
|
||||||
direction = "increased" if new_count > old_count else "decreased"
|
|
||||||
message = (
|
|
||||||
f"Patent count for {name} {direction} by {delta_pct:.0f}% "
|
|
||||||
f"({old_count} -> {new_count})"
|
|
||||||
)
|
|
||||||
logger.warning("ALERT: %s", message)
|
|
||||||
db.store_alert(
|
|
||||||
company_name=name,
|
|
||||||
alert_type="patent_count_change",
|
|
||||||
message=message,
|
|
||||||
old_value=old_count,
|
|
||||||
new_value=new_count,
|
|
||||||
)
|
|
||||||
elif new_count > 0:
|
|
||||||
# First analysis -- record baseline
|
|
||||||
logger.info("Baseline for %s: %d patents", name, new_count)
|
|
||||||
else:
|
|
||||||
logger.warning("Scheduled analysis failed for %s: %s", name, result.error)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.error("Error analyzing tracked company %s: %s", name, e)
|
|
||||||
|
|
||||||
db.close()
|
|
||||||
logger.info("Scheduled analysis complete")
|
|
||||||
|
|
||||||
|
|
||||||
def start_scheduler() -> None:
|
|
||||||
"""Start the APScheduler background scheduler.
|
|
||||||
|
|
||||||
Safe to call at application startup. If apscheduler is not installed,
|
|
||||||
the function logs a warning and returns without starting anything.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
from apscheduler.schedulers.background import BackgroundScheduler
|
|
||||||
except ImportError:
|
|
||||||
logger.warning(
|
|
||||||
"apscheduler not installed; scheduled analysis disabled. "
|
|
||||||
"Install with: pip install apscheduler"
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
scheduler = BackgroundScheduler()
|
|
||||||
scheduler.add_job(
|
|
||||||
run_scheduled_analysis,
|
|
||||||
"interval",
|
|
||||||
hours=SCHEDULE_INTERVAL_HOURS,
|
|
||||||
id="scheduled_patent_analysis",
|
|
||||||
replace_existing=True,
|
|
||||||
)
|
|
||||||
scheduler.start()
|
|
||||||
logger.info(
|
|
||||||
"Scheduled patent analysis started (every %d hours, threshold %d%%)",
|
|
||||||
SCHEDULE_INTERVAL_HOURS,
|
|
||||||
CHANGE_THRESHOLD_PERCENT,
|
|
||||||
)
|
|
||||||
@@ -9,15 +9,38 @@ const COLORS = ['#6366f1', '#0ea5e9', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6'
|
|||||||
export function AnalyticsPage() {
|
export function AnalyticsPage() {
|
||||||
const [days, setDays] = useState(30);
|
const [days, setDays] = useState(30);
|
||||||
|
|
||||||
const { data, isLoading, isError } = useQuery({
|
const { data, isLoading, isError, refetch } = useQuery({
|
||||||
queryKey: ['analytics', days],
|
queryKey: ['analytics', days],
|
||||||
queryFn: () => analyticsApi.getAnalytics(days),
|
queryFn: () => analyticsApi.getAnalytics(days),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center justify-center min-h-[400px]">
|
<div className="space-y-6">
|
||||||
<div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-primary"></div>
|
<div>
|
||||||
|
<h2 className="text-xl font-semibold text-text-primary border-b-2 border-primary/30 pb-2 mb-2">
|
||||||
|
Analytics Dashboard
|
||||||
|
</h2>
|
||||||
|
<p className="text-text-secondary">Loading analytics data...</p>
|
||||||
|
</div>
|
||||||
|
{/* Skeleton cards */}
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
|
||||||
|
{[1, 2, 3].map((i) => (
|
||||||
|
<div key={i} className="bg-gradient-to-br from-primary/10 to-secondary/10 border border-primary/20 rounded-xl p-5 text-center animate-pulse">
|
||||||
|
<div className="h-9 w-16 bg-primary/20 rounded mx-auto mb-2" />
|
||||||
|
<div className="h-4 w-24 bg-primary/10 rounded mx-auto" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{/* Skeleton charts */}
|
||||||
|
<div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||||
|
{[1, 2].map((i) => (
|
||||||
|
<div key={i} className="bg-bg-card/60 border border-primary/15 rounded-2xl p-6 animate-pulse">
|
||||||
|
<div className="h-5 w-40 bg-primary/20 rounded mb-4" />
|
||||||
|
<div className="h-[300px] bg-primary/5 rounded" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -33,15 +56,18 @@ export function AnalyticsPage() {
|
|||||||
<div className="bg-gradient-to-br from-primary/10 to-secondary/5 border border-primary/20 rounded-xl p-6">
|
<div className="bg-gradient-to-br from-primary/10 to-secondary/5 border border-primary/20 rounded-xl p-6">
|
||||||
<div className="flex items-center gap-3 text-warning mb-2">
|
<div className="flex items-center gap-3 text-warning mb-2">
|
||||||
<Database size={24} />
|
<Database size={24} />
|
||||||
<span className="font-semibold">Database Not Connected</span>
|
<span className="font-semibold">Unable to Load Analytics</span>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-text-secondary">
|
<p className="text-text-secondary">
|
||||||
Set <code className="bg-bg-card px-2 py-1 rounded">USE_DATABASE=true</code> in your .env file to enable analytics tracking.
|
Could not connect to the analytics database. Ensure PostgreSQL is running and
|
||||||
|
<code className="bg-bg-card px-2 py-1 rounded mx-1">DATABASE_URL</code> is configured correctly.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
<button
|
||||||
<div className="flex items-center gap-2 bg-secondary/10 border border-secondary/20 text-secondary rounded-xl px-4 py-3">
|
onClick={() => refetch()}
|
||||||
<AlertCircle size={18} />
|
className="mt-3 text-sm bg-primary/20 hover:bg-primary/30 text-primary font-medium px-4 py-2 rounded-lg transition-colors"
|
||||||
<span>Analytics features require storing analysis results in PostgreSQL for historical tracking.</span>
|
>
|
||||||
|
Retry
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -114,9 +114,21 @@ export function Batch() {
|
|||||||
|
|
||||||
{/* Error */}
|
{/* Error */}
|
||||||
{mutation.isError && (
|
{mutation.isError && (
|
||||||
<div className="flex items-center gap-2 bg-error/10 border border-error/20 text-error rounded-xl px-4 py-3">
|
<div className="bg-error/10 border border-error/20 rounded-xl px-4 py-3">
|
||||||
|
<div className="flex items-center gap-2 text-error">
|
||||||
<AlertCircle size={18} />
|
<AlertCircle size={18} />
|
||||||
<span>Batch analysis failed. Please try again.</span>
|
<span className="font-semibold">Batch analysis failed</span>
|
||||||
|
</div>
|
||||||
|
<p className="text-text-secondary text-sm mt-1 ml-7">
|
||||||
|
{mutation.error instanceof Error ? mutation.error.message : 'An unexpected error occurred.'}
|
||||||
|
{' '}Check your connection and try again.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
onClick={() => mutation.reset()}
|
||||||
|
className="ml-7 mt-2 text-sm text-primary hover:text-primary-dark underline"
|
||||||
|
>
|
||||||
|
Dismiss
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -15,4 +15,3 @@ pandas
|
|||||||
bcrypt
|
bcrypt
|
||||||
PyJWT
|
PyJWT
|
||||||
slowapi
|
slowapi
|
||||||
apscheduler
|
|
||||||
|
|||||||
Reference in New Issue
Block a user