Merge pull request #87 from spiceoogway/fix/quickfixes-57-62-70

fix: dead code removal, health check DB ping, UUID validation (#57, #62, #70)

Author: shirtlessfounder

api.py

@@ -109,6 +109,17 @@ def raise_rate_limited(detail: str, info: dict) -> None:
 STARTING_BALANCE = 1000.0   # New agent starting balance
 
 
+def _validate_uuid(value: str, param_name: str = "id") -> None:
+    """Validate that a string is a valid UUID. Raises 400 if not."""
+    try:
+        uuid.UUID(value)
+    except (ValueError, AttributeError):
+        raise HTTPException(
+            status_code=400,
+            detail=f"Invalid {param_name}: '{value}' is not a valid UUID",
+        )
+
+
 def generate_verification_code() -> str:
     """Generate a cryptographically secure verification code like 'crab-reef-A1B2C3D4'.
 
@@ -1766,6 +1777,7 @@ async def list_markets(status: Optional[str] = None):
 @app.get("/markets/{market_id}", response_model=MarketDetail)
 async def get_market(market_id: str):
     """Get market details including current probability."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -1897,6 +1909,7 @@ async def create_market(req: MarketCreate, user: dict = Depends(require_auth)):
 @app.post("/markets/{market_id}/resolve", response_model=MarketDetail)
 async def resolve_market(market_id: str, req: MarketResolve, user: dict = Depends(require_auth)):
     """Resolve a market. Only creator can resolve."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -1957,6 +1970,7 @@ async def place_bet(market_id: str, req: BetRequest, response: Response, user: d
     - `X-RateLimit-Reset`: Unix timestamp when window resets
     - `Retry-After` (on 429 only): Seconds to wait
     """
+    _validate_uuid(market_id, "market_id")
     # Require twitter verification before trading
     if user.get("status") != "claimed":
         raise HTTPException(
@@ -2085,6 +2099,7 @@ async def place_bet_plural_alias(market_id: str, req: BetRequest, user: dict = D
 @app.post("/markets/{market_id}/sell", response_model=SellResponse)
 async def sell_shares(market_id: str, req: SellRequest, user: dict = Depends(require_auth)):
     """Sell shares back to the market."""
+    _validate_uuid(market_id, "market_id")
     # Require twitter verification before trading
     if user.get("status") != "claimed":
         raise HTTPException(
@@ -2172,6 +2187,7 @@ async def sell_shares(market_id: str, req: SellRequest, user: dict = Depends(req
 @app.get("/markets/{market_id}/positions", response_model=MarketPositions)
 async def get_positions(market_id: str):
     """Get all positions for a market."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2200,6 +2216,7 @@ async def get_positions(market_id: str):
 @app.get("/markets/{market_id}/history", response_model=MarketHistory)
 async def get_market_history(market_id: str):
     """Get probability history for charts."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2235,6 +2252,7 @@ async def get_market_history(market_id: str):
 @app.get("/markets/{market_id}/bets", response_model=List[BetHistoryItem])
 async def get_market_bets(market_id: str):
     """Get all bets for a market."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2269,6 +2287,7 @@ async def get_market_bets(market_id: str):
 @app.get("/markets/{market_id}/comments", response_model=MarketComments)
 async def get_comments(market_id: str):
     """Get all comments for a market."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2311,6 +2330,7 @@ async def get_comments(market_id: str):
 @app.post("/markets/{market_id}/comments", response_model=Comment)
 async def create_comment(market_id: str, req: CommentCreate, user: dict = Depends(require_auth)):
     """Create a comment on a market."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2354,6 +2374,7 @@ async def request_resolution(market_id: str, user: dict = Depends(require_auth))
     Only the market creator can request resolution.
     The committee will research and vote, with majority (5+) deciding the outcome.
     """
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2435,6 +2456,7 @@ async def request_resolution(market_id: str, user: dict = Depends(require_auth))
 @app.get("/markets/{market_id}/resolution-votes", response_model=ResolutionResult)
 async def get_resolution_votes(market_id: str):
     """Get the resolution committee votes for a market."""
+    _validate_uuid(market_id, "market_id")
     market = db.get_market(market_id)
     if not market:
         raise HTTPException(status_code=404, detail="Market not found")
@@ -2603,6 +2625,7 @@ async def get_my_bets(
 @app.get("/users/{user_id}", response_model=UserProfile)
 async def get_user(user_id: str):
     """Get public user profile."""
+    _validate_uuid(user_id, "user_id")
     user = db.get_user(user_id)
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
@@ -2876,6 +2899,7 @@ async def get_claim_info(user_id: str):
     
     Returns the verification code and instructions for claiming.
     """
+    _validate_uuid(user_id, "user_id")
     user = db.get_user(user_id)
     if not user:
         raise HTTPException(status_code=404, detail="Agent not found")
@@ -3160,10 +3184,34 @@ async def get_chat_messages(limit: int = 50, since: Optional[str] = None, channe
 
 @app.get("/health")
 async def health():
+    from fastapi.responses import JSONResponse
+
+    # Verify database is reachable
+    db_status = "ok"
+    try:
+        conn = db._get_conn()
+        try:
+            with conn.cursor() as cur:
+                cur.execute("SELECT 1")
+        finally:
+            db._put_conn(conn)
+    except Exception:
+        db_status = "unreachable"
+
+    if db_status != "ok":
+        return JSONResponse(
+            status_code=503,
+            content={
+                "status": "degraded",
+                "db": db_status,
+            },
+        )
+
     market_count = len(db.list_markets())
     user_count = len(db.users)
     return {
         "status": "ok",
+        "db": "ok",
         "markets": market_count,
         "users": user_count,
         "currency": {