Update app.py

app.py

@@ -1,12 +1,7 @@
 import os
-import requests
 import gradio as gr
 from google import genai
-from fastapi import FastAPI, HTTPException, Depends
-from fastapi.security import OAuth2PasswordBearer
-from pydantic import BaseModel
 from typing import List, Dict, Any
-import uvicorn
 from supabase import create_client, Client
 import jwt
 from datetime import datetime, timedelta
@@ -14,11 +9,11 @@ from datetime import datetime, timedelta
 # --- Configuration ---
 GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
 SUPABASE_URL = os.getenv("SUPABASE_URL")
-SUPABASE_KEY = os.getenv("SUPABASE_KEY")
+SUPABASE_KEY = os.getenv("SUPABASE_KEY") # This is the public 'anon' key
 SUPABASE_SERVICE_KEY = os.getenv("SUPABASE_SERVICE_KEY")
 JWT_SECRET = os.getenv("JWT_SECRET", "a-strong-secret-key-for-local-testing")
 
-# --- Initialize Supabase Admin Client ---
+# --- Initialize Supabase Admin Client (for user authentication) ---
 try:
     supabase_admin: Client = create_client(SUPABASE_URL, SUPABASE_SERVICE_KEY)
     print("Successfully created Supabase admin client.")
@@ -46,17 +41,26 @@ def save_chat_turn(supabase_user_client: Client, user_id: str, session_id: str,
     except Exception as e:
         return {"error": f"Database insert failed: {str(e)}"}
 
-# --- Core Agent Logic (Refactored) ---
-async def _run_agent_logic(prompt: str, user_id: str, session_id: str, token: str):
+# --- Core Agent & Auth Logic (No FastAPI dependencies) ---
+def perform_login(user_id: str):
+    """Generates a secure JWT for a given user ID."""
+    if not supabase_admin:
+        raise Exception("Authentication service is not configured.")
+    payload = { "sub": user_id, "aud": "authenticated", "exp": datetime.utcnow() + timedelta(hours=1), "role": "authenticated" }
+    access_token = jwt.encode(payload, JWT_SECRET, algorithm="HS256")
+    return access_token
+
+def run_agent_logic(prompt: str, user_id: str, session_id: str, token: str):
+    """The main logic for the agent, now a simple callable function."""
     try:
         decoded_token = jwt.decode(token, JWT_SECRET, algorithms=["HS256"], audience="authenticated")
         if not decoded_token.get("sub") or decoded_token.get("sub") != user_id:
-            raise HTTPException(status_code=401, detail="Invalid token or user mismatch.")
+            raise Exception("Invalid token or user mismatch.")
         
         supabase_user_client = create_client(SUPABASE_URL, SUPABASE_KEY)
         supabase_user_client.auth.set_session(access_token=token, refresh_token=token)
     except jwt.PyJWTError as e:
-        raise HTTPException(status_code=401, detail=f"Invalid token: {e}")
+        raise Exception(f"Invalid token: {e}")
 
     def get_my_chat_history():
         return get_ai_advisor_chat_history(supabase_user_client, user_id)
@@ -84,35 +88,8 @@ async def _run_agent_logic(prompt: str, user_id: str, session_id: str, token: st
         return final_response_text
     except Exception as e:
         print(f"Error in agent invocation: {e}")
-        # Return error as a string to be displayed in chat
         return f"An error occurred while processing your request: {e}"
 
-# --- FastAPI Endpoints ---
-app = FastAPI()
-
-class LoginRequest(BaseModel):
-    user_id: str
-
-class AgentRequest(BaseModel):
-    prompt: str
-    user_id: str
-    session_id: str = "default-session"
-
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login")
-
-@app.post("/login")
-async def login(request: LoginRequest):
-    if not supabase_admin: raise HTTPException(status_code=500, detail="Auth service not configured.")
-    user_id = request.user_id
-    payload = { "sub": user_id, "aud": "authenticated", "exp": datetime.utcnow() + timedelta(hours=1), "role": "authenticated" }
-    access_token = jwt.encode(payload, JWT_SECRET, algorithm="HS256")
-    return {"access_token": access_token, "token_type": "bearer"}
-
-@app.post("/agent/invoke")
-async def invoke_gemini_agent(request: AgentRequest, token: str = Depends(oauth2_scheme)):
-    response_text = await _run_agent_logic(request.prompt, request.user_id, request.session_id, token)
-    return {"response": response_text}
-
 # --- Gradio UI ---
 with gr.Blocks() as demo:
     gr.Markdown("# 💎 Secure, Multi-User AI Agent (Live)")
@@ -130,14 +107,11 @@ with gr.Blocks() as demo:
     chatbot = gr.Chatbot(label="Agent Chat", visible=False, height=500)
     msg_input = gr.Textbox(label="Your Message", visible=False, show_label=False, placeholder="Type your message here...")
     
-    # CHANGED: login_fn now calls the login function directly
-    async def login_fn(user_id):
+    def login_fn(user_id):
         if not user_id:
             return {login_status: gr.update(value="<p style='color:red;'>Please enter a User ID.</p>")}
         try:
-            # Direct async call, no requests
-            token_data = await login(LoginRequest(user_id=user_id))
-            token = token_data["access_token"]
+            token = perform_login(user_id)
             status_html = f"<p style='color:green;'>Logged in as: {user_id}. You can start chatting.</p>"
             return {
                 login_status: gr.update(value=status_html), user_id_state: user_id, token_state: token,
@@ -146,14 +120,12 @@ with gr.Blocks() as demo:
         except Exception as e:
             return {login_status: gr.update(value=f"<p style='color:red;'>Login failed: {e}</p>")}
 
-    # CHANGED: chat_fn now calls the agent logic function directly
-    async def chat_fn(message, chat_history, user_id, token, session_id):
+    def chat_fn(message, chat_history, user_id, token, session_id):
         if not token:
             chat_history.append((message, "Error: You are not logged in."))
             return "", chat_history
         
-        # Direct async call, no requests or headers
-        bot_message = await _run_agent_logic(message, user_id, session_id, token)
+        bot_message = run_agent_logic(message, user_id, session_id, token)
         
         chat_history.append((message, bot_message))
         return "", chat_history
@@ -161,7 +133,5 @@ with gr.Blocks() as demo:
     login_button.click(login_fn, inputs=[user_id_input], outputs=[login_status, user_id_state, token_state, chatbot, msg_input])
     msg_input.submit(chat_fn, [msg_input, chatbot, user_id_state, token_state, session_id_state], [msg_input, chatbot])
 
-app = gr.mount_gradio_app(app, demo, path="/")
-
-if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+# The standard way to launch a Gradio app on Hugging Face
+demo.launch()