Update main.py

main.py

@@ -28,7 +28,7 @@ CLOUD_KEY = os.getenv("CLOUD_KEY")
 
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY)
 
-# Security: Support both X-API-Key and Bearer Token (for Cursor)
+# Security: Support both X-API-Key and Bearer Token
 api_key_header = APIKeyHeader(name="X-API-Key", auto_error=False)
 bearer_scheme = HTTPBearer(auto_error=False)
 
@@ -36,19 +36,35 @@ async def verify_token(
     api_key: str = Depends(api_key_header),
     bearer: HTTPAuthorizationCredentials = Depends(bearer_scheme)
 ):
-    # Extract key from whichever header is present
-    token = api_key or (bearer.credentials if bearer else None)
+    """
+    Unified authentication: checks X-API-Key or Authorization: Bearer
+    """
+    token = None
     
+    # 1. Check for X-API-Key (Standard Web/Postman)
+    if api_key:
+        token = api_key
+    # 2. Check for Bearer Token (Cursor / Continue / OpenAI standard)
+    elif bearer:
+        token = bearer.credentials
+
     if not token:
-        raise HTTPException(status_code=401, detail="API Key missing.")
+        print("Auth Error: No token provided in headers")
+        raise HTTPException(status_code=401, detail="API Key missing. Use X-API-Key or Bearer token.")
 
     try:
+        # Query Supabase for the token
         result = supabase.table("api_tokens").select("user_id").eq("api", token).execute()
-        if not result.data:
+        
+        if not result.data or len(result.data) == 0:
+            print(f"Auth Error: Token {token[:5]}*** not found in database")
             raise HTTPException(status_code=403, detail="Invalid API Token.")
+            
         return result.data[0]
+    except HTTPException:
+        raise
     except Exception as e:
-        print(f"Database error: {e}")
+        print(f"Database error during auth: {e}")
         raise HTTPException(status_code=500, detail="Internal Server Error during authentication.")
 
 app.add_middleware(
@@ -117,14 +133,14 @@ async def chat(request: ChatRequest, token_data: dict = Depends(verify_token)):
         finally:
             driver.quit()
 
-# --- Cursor Compatibility Endpoint ---
+# --- Cursor / Continue Compatibility Endpoint ---
 @app.post("/v1/chat/completions")
 async def cursor_handler(request: Request, token_data: dict = Depends(verify_token)):
     try:
         body = await request.json()
         messages = body.get("messages", [])
         
-        # 1. Get the last user message
+        # Extract the last message from the conversation history
         last_user_message = ""
         for m in reversed(messages):
             if m.get("role") == "user":
@@ -134,13 +150,13 @@ async def cursor_handler(request: Request, token_data: dict = Depends(verify_tok
         if not last_user_message:
             return {"error": "No user message found"}
 
-        # 2. Forward to your scraper logic
+        # Call the existing scraper logic
         chat_req = ChatRequest(message=last_user_message)
         response = await chat(chat_req, token_data)
         
-        content = response.get("content") or response.get("raw") or "No response."
+        content = response.get("content") or response.get("raw") or "No response from scraper."
 
-        # 3. Return a standard OpenAI-style response
+        # Return standard OpenAI JSON structure
         return {
             "id": f"chatcmpl-{int(time.time())}",
             "object": "chat.completion",
@@ -154,7 +170,7 @@ async def cursor_handler(request: Request, token_data: dict = Depends(verify_tok
                 },
                 "finish_reason": "stop"
             }],
-            "usage": response.get("usage", {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0})
+            "usage": response.get("usage") if isinstance(response.get("usage"), dict) else {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0}
         }
     except Exception as e:
         print(f"Bridge Error: {str(e)}")