Update app_routes.py

app_routes.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Request
 from fastapi.responses import StreamingResponse
 import aiosqlite, asyncio, random, json, logging
-from npc_core import GroqAIClient
+from npc_core import GroqAIClient, get_db, get_db_read
 from npc_trading import (
     ALL_TICKERS, TRADING_STRATEGIES, IDENTITY_STRATEGY_MAP,
     get_all_prices, get_ticker_positions, get_trading_leaderboard, get_trading_stats,
@@ -67,7 +67,7 @@ async def api_market_indices():
     return {"indices": indices}
 @router.get("/api/intelligence/screening/{ticker}")
 async def api_screening_data(ticker: str):
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         try:
             cursor = await db.execute("SELECT ticker, price, change_pct, volume, market_cap, rsi, pe_ratio, high_52w, low_52w, from_high, from_low FROM market_prices WHERE ticker=?", (ticker,))
@@ -77,7 +77,7 @@ async def api_screening_data(ticker: str):
     return {"ticker": ticker, "error": "no data"}
 @router.get("/api/intelligence/target/{ticker}")
 async def api_target_price(ticker: str):
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         try:
             cursor = await db.execute("SELECT price, rsi, pe_ratio, from_high, from_low FROM market_prices WHERE ticker=?", (ticker,))
@@ -94,7 +94,7 @@ async def api_target_price(ticker: str):
 async def api_news_feed(ticker: str = None, limit: int = 50):
     news = await load_news_from_db(_DB_PATH, ticker, limit)
     try:
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000")
             for n in news:
                 nid = n.get('id')
@@ -109,7 +109,7 @@ async def api_news_react(request: Request):
     body = await request.json(); email = body.get("email", ""); news_id = body.get("news_id"); emoji = body.get("emoji", "")
     if not email or not news_id or emoji not in ('👍','🔥','😱','💀','🚀','😂'): return {"error": "Invalid reaction"}
     try:
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000"); await db.execute("INSERT OR IGNORE INTO news_reactions (news_id, user_email, emoji) VALUES (?,?,?)", (news_id, email, emoji)); await db.commit()
             rc = await db.execute("SELECT emoji, COUNT(*) FROM news_reactions WHERE news_id=? GROUP BY emoji", (news_id,))
             return {"success": True, "reactions": {r[0]: r[1] for r in await rc.fetchall()}}
@@ -150,7 +150,7 @@ async def api_deep_analysis(ticker: str):
 @router.get("/api/analysis/all/summary")
 async def api_all_analyses():
     analyses = await load_all_analyses_from_db(_DB_PATH)
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000"); col_cursor = await db.execute("PRAGMA table_info(market_prices)")
         existing_cols = {r[1] for r in await col_cursor.fetchall()}
         has_rsi = 'rsi' in existing_cols; has_pe = 'pe_ratio' in existing_cols; has_52w = 'high_52w' in existing_cols; has_from = 'from_high' in existing_cols
@@ -219,13 +219,13 @@ async def api_all_analyses():
 @router.get("/api/npc/search")
 async def api_npc_search(q: str = ""):
     if len(q) < 1: return {"npcs": []}
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000"); cursor = await db.execute("SELECT agent_id, username, ai_identity FROM npc_agents WHERE username LIKE ? AND is_active=1 LIMIT 10", (f'%{q}%',))
         return {"npcs": [{"agent_id": r[0], "username": r[1], "identity": r[2]} for r in await cursor.fetchall()]}
 @router.get("/api/npc/profile/{agent_id}")
 async def api_npc_profile(agent_id: str):
     try:
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000")
             cursor = await db.execute("SELECT agent_id, username, ai_identity, mbti, gpu_dollars, created_at FROM npc_agents WHERE agent_id=?", (agent_id,))
             row = await cursor.fetchone()
@@ -302,7 +302,7 @@ async def api_sec_dashboard():
         return {"stats": {"total_violations": 0, "total_fines_gpu": 0, "active_suspensions": 0, "pending_reports": 0}, "announcements": [], "top_violators": [], "recent_reports": []}
 @router.get("/api/sec/violations/{agent_id}")
 async def api_sec_violations(agent_id: str):
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         cursor = await db.execute("SELECT id, violation_type, severity, description, penalty_type, gpu_fine, suspend_until, status, created_at FROM sec_violations WHERE agent_id=? ORDER BY created_at DESC LIMIT 20", (agent_id,))
         violations = [{'id': r[0], 'type': r[1], 'severity': r[2], 'description': r[3], 'penalty': r[4], 'fine': r[5], 'suspend_until': r[6], 'status': r[7], 'created_at': r[8]} for r in await cursor.fetchall()]
@@ -316,7 +316,7 @@ async def api_sec_report(request: Request):
     if not reporter or not target or not reason: return {"error": "reporter, target, reason required"}
     if reporter == target: return {"error": "Cannot report yourself"}
     reporter_id = f"user_{reporter}" if '@' in reporter else reporter
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         cursor = await db.execute("SELECT id FROM sec_reports WHERE reporter_agent_id=? AND target_agent_id=? AND created_at > datetime('now', '-12 hours')", (reporter_id, target))
         if await cursor.fetchone(): return {"error": "Already reported this NPC recently (12h cooldown)"}
@@ -334,7 +334,7 @@ async def api_sec_seed():
         ("Front-running detected — trading ahead of own analysis publications", "front_running", "medium", "fine", 300, 0),
         ("Coordinated short attack with fake news — colluding with other NPCs", "collusion", "critical", "suspension", 1500, 96)]
     try:
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000"); vc = await db.execute("SELECT COUNT(*) FROM sec_violations"); cnt = (await vc.fetchone())[0]
             if cnt > 0: return {"message": f"Already have {cnt} violations, skipping seed"}
             cursor = await db.execute("SELECT agent_id, username FROM npc_agents WHERE is_active=1 ORDER BY RANDOM() LIMIT 6"); npcs = await cursor.fetchall()
@@ -352,13 +352,13 @@ async def api_sec_seed():
     except Exception as e: return {"error": str(e)}
 @router.get("/api/sec/announcements")
 async def api_sec_announcements(limit: int = 30):
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         cursor = await db.execute("SELECT id, announcement_type, target_username, violation_type, penalty_type, gpu_fine, suspend_hours, title, content, created_at FROM sec_announcements ORDER BY created_at DESC LIMIT ?", (min(limit, 50),))
         return {"announcements": [{'id': r[0], 'type': r[1], 'target': r[2], 'violation': r[3], 'penalty': r[4], 'fine': r[5], 'hours': r[6], 'title': r[7], 'content': r[8], 'created_at': r[9]} for r in await cursor.fetchall()]}
 @router.get("/api/sec/suspended")
 async def api_sec_suspended():
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         cursor = await db.execute("SELECT s.agent_id, n.username, s.reason, s.suspended_until, s.created_at FROM sec_suspensions s JOIN npc_agents n ON s.agent_id = n.agent_id WHERE s.suspended_until > datetime('now') ORDER BY s.suspended_until DESC")
         suspended = [{'agent_id': r[0], 'username': r[1], 'reason': r[2], 'until': r[3], 'since': r[4]} for r in await cursor.fetchall()]
@@ -369,7 +369,7 @@ async def api_tip_npc(request: Request):
     user_email = body.get("email", ""); target_agent = body.get("target_agent_id", ""); amount = int(body.get("amount", 0)); message = body.get("message", "").strip()[:200]
     if not user_email or not target_agent or amount < 10: return {"error": "email, target_agent_id, amount(>=10) required"}
     if amount > 1000: return {"error": "Max tip: 1,000 GPU"}
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000"); cursor = await db.execute("SELECT gpu_dollars, username FROM user_profiles WHERE email=?", (user_email,))
         user = await cursor.fetchone()
         if not user or user[0] < amount: return {"error": "Insufficient GPU"}
@@ -392,7 +392,7 @@ async def api_influence_npc(request: Request):
     body = await request.json()
     user_email = body.get("email", ""); target_agent = body.get("target_agent_id", ""); ticker = body.get("ticker", "").upper(); stance = body.get("stance", "").lower()
     if not all([user_email, target_agent, ticker, stance]) or stance not in ('bullish', 'bearish'): return {"error": "email, target_agent_id, ticker, stance(bullish/bearish) required"}
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000"); cursor = await db.execute("SELECT username FROM user_profiles WHERE email=?", (user_email,))
         user = await cursor.fetchone(); cursor2 = await db.execute("SELECT username, ai_identity FROM npc_agents WHERE agent_id=?", (target_agent,))
         npc = await cursor2.fetchone()
@@ -415,7 +415,7 @@ async def api_influence_npc(request: Request):
     return {"status": "success", "influenced": influenced, "message": response_msg}
 @router.get("/api/swarm/trending")
 async def api_swarm_trending():
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         cursor = await db.execute("SELECT p.title || ' ' || p.content FROM posts p WHERE p.created_at > datetime('now', '-6 hours') ORDER BY p.likes_count DESC LIMIT 50")
         posts = [r[0] for r in await cursor.fetchall()]
@@ -430,7 +430,7 @@ async def api_swarm_trending():
 @router.get("/api/chat/messages")
 async def api_chat_messages(limit: int = 50, after_id: int = 0):
     try:
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000")
             if after_id > 0:
                 cursor = await db.execute("SELECT id, agent_id, username, identity, mbti, message, msg_type, ticker, reply_to, created_at FROM npc_live_chat WHERE id > ? ORDER BY id ASC LIMIT ?", (after_id, limit))
@@ -443,7 +443,7 @@ async def api_chat_messages(limit: int = 50, after_id: int = 0):
 @router.get("/api/chat/stats")
 async def api_chat_stats():
     try:
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000"); c1 = await db.execute("SELECT COUNT(*) FROM npc_live_chat"); total = (await c1.fetchone())[0]
             c2 = await db.execute("SELECT COUNT(*) FROM npc_live_chat WHERE created_at > datetime('now', '-1 hour')"); recent = (await c2.fetchone())[0]
             c3 = await db.execute("SELECT COUNT(DISTINCT agent_id) FROM npc_live_chat WHERE created_at > datetime('now', '-1 hour')"); active = (await c3.fetchone())[0]
@@ -455,7 +455,7 @@ async def api_chat_send(request: Request):
         body = await request.json(); email = body.get("email", ""); message = body.get("message", "").strip()
         if not email or not message: return {"success": False, "error": "Email and message required"}
         if len(message) > 500: message = message[:500]
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000"); cursor = await db.execute("SELECT username FROM user_profiles WHERE email=?", (email,))
             row = await cursor.fetchone()
             if not row: return {"success": False, "error": "User not found"}
@@ -471,7 +471,7 @@ async def api_chat_send(request: Request):
 async def _generate_npc_replies_to_user(user_message: str, user_username: str, user_msg_id: int, npcs: list):
     try:
         ai = GroqAIClient(_GROQ_KEY)
-        async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+        async with get_db(_DB_PATH) as db:
             await db.execute("PRAGMA busy_timeout=30000")
             for npc in npcs:
                 agent_id, npc_username, identity, mbti = npc
@@ -503,7 +503,7 @@ async def api_sse_stream():
     return StreamingResponse(event_generator(), media_type="text/event-stream", headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no"})
 @router.get("/api/events/recent")
 async def api_recent_events(limit: int = 20):
-    async with aiosqlite.connect(_DB_PATH, timeout=30.0) as db:
+    async with get_db(_DB_PATH) as db:
         await db.execute("PRAGMA busy_timeout=30000")
         cursor = await db.execute("SELECT p.agent_id, n.username, n.ai_identity, p.ticker, p.direction, p.gpu_bet, p.leverage, p.opened_at FROM npc_positions p JOIN npc_agents n ON p.agent_id = n.agent_id WHERE p.opened_at > datetime('now', '-1 hour') ORDER BY p.opened_at DESC LIMIT ?", (limit,))
         trades = [{'user': r[1], 'identity': r[2], 'ticker': r[3], 'dir': r[4], 'gpu': r[5], 'leverage': r[6], 'time': r[7]} for r in await cursor.fetchall()]