Update app.py

app.py

@@ -1,25 +1,24 @@
 import os
 import requests
 import gradio as gr
-from google import genai # Correct modern library import
-# REMOVED: from google.generativeai.types import HarmCategory, HarmBlockThreshold
+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
+import uvicorn # Ensure uvicorn is imported
 from supabase import create_client, Client
 import jwt
 from datetime import datetime, timedelta
 
-# --- Configuration (No changes here) ---
+# --- Configuration ---
 GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
 SUPABASE_URL = os.getenv("SUPABASE_URL")
 SUPABASE_KEY = os.getenv("SUPABASE_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 (No changes here) ---
+# --- Initialize Supabase Admin Client ---
 try:
     supabase_admin: Client = create_client(SUPABASE_URL, SUPABASE_SERVICE_KEY)
     print("Successfully created Supabase admin client.")
@@ -27,7 +26,7 @@ except Exception as e:
     supabase_admin = None
     print(f"Warning: Supabase service key invalid. User authentication will fail. Error: {e}")
 
-# --- Tool Definitions (No changes here) ---
+# --- Tool Definitions ---
 def get_ai_advisor_chat_history(supabase_user_client: Client, user_id: str):
     print(f"TOOL CALL: get_ai_advisor_chat_history for user '{user_id}' from Supabase")
     try:
@@ -47,7 +46,7 @@ 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)}"}
 
-# --- FastAPI Application with Authentication (No changes here) ---
+# --- FastAPI Application ---
 app = FastAPI()
 
 class LoginRequest(BaseModel):
@@ -71,7 +70,6 @@ async def login(request: LoginRequest):
 
 @app.post("/agent/invoke")
 async def invoke_gemini_agent(request: AgentRequest, token: str = Depends(oauth2_scheme)):
-    # 1. Authenticate (No changes here)
     try:
         decoded_token = jwt.decode(token, JWT_SECRET, algorithms=["HS256"], audience="authenticated")
         user_id = decoded_token.get("sub")
@@ -83,17 +81,14 @@ async def invoke_gemini_agent(request: AgentRequest, token: str = Depends(oauth2
     except jwt.PyJWTError as e:
         raise HTTPException(status_code=401, detail=f"Invalid token: {e}")
 
-    # 2. Define tools (No changes here)
     def get_my_chat_history():
         """Fetches my most recent conversation history to provide context."""
         return get_ai_advisor_chat_history(supabase_user_client, user_id)
     
     tools_for_gemini = [get_my_chat_history]
     
-    # 3. Fetch history and run the Gemini agent
     try:
         genai.configure(api_key=GOOGLE_API_KEY)
-        
         history_data = get_my_chat_history()
         conversation_history = []
         if isinstance(history_data, list):
@@ -102,34 +97,24 @@ async def invoke_gemini_agent(request: AgentRequest, token: str = Depends(oauth2
                 conversation_history.append({'role': role, 'parts': [{'text': turn['content']}]})
         
         conversation_history.append({'role': 'user', 'parts': [{'text': request.prompt}]})
-
-        # Generate content using the modern client
-        model = genai.GenerativeModel('gemini-pro') # Correct way to init the model
         
-        # CHANGED: The safety_settings dictionary now uses strings
+        model = genai.GenerativeModel('gemini-pro')
         response = model.generate_content(
             conversation_history,
             tools=tools_for_gemini,
             safety_settings={
-                'HARM_CATEGORY_DANGEROUS_CONTENT': 'BLOCK_NONE',
-                'HARM_CATEGORY_HARASSMENT': 'BLOCK_NONE',
-                'HARM_CATEGORY_HATE_SPEECH': 'BLOCK_NONE',
-                'HARM_CATEGORY_SEXUALLY_EXPLICIT': 'BLOCK_NONE',
+                'HARM_CATEGORY_DANGEROUS_CONTENT': 'BLOCK_NONE', 'HARM_CATEGORY_HARASSMENT': 'BLOCK_NONE',
+                'HARM_CATEGORY_HATE_SPEECH': 'BLOCK_NONE', 'HARM_CATEGORY_SEXUALLY_EXPLICIT': 'BLOCK_NONE',
             }
         )
-
         final_response_text = response.text
-        
-        # 4. Save the new conversation turn (No changes here)
         save_chat_turn(supabase_user_client, user_id, request.session_id, request.prompt, final_response_text)
-        
         return {"response": final_response_text}
-        
     except Exception as e:
         print(f"Error in agent invocation: {e}")
         raise HTTPException(status_code=500, detail=str(e))
 
-# --- Gradio UI (The Face) - No changes needed here ---
+# --- Gradio UI ---
 with gr.Blocks() as demo:
     gr.Markdown("# 💎 Secure, Multi-User AI Agent (Upgraded)")
     gr.Markdown("First, 'log in' with a User ID (e.g., 'user-a', 'user-b'). This will generate a secure token. Then, you can chat with the agent, and your conversation will be saved securely to your own user record in Supabase.")
@@ -150,7 +135,8 @@ with gr.Blocks() as demo:
         if not user_id:
             return {login_status: gr.update(value="<p style='color:red;'>Please enter a User ID.</p>"), user_id_state: ""}
         try:
-            response = requests.post("http://127.0.0.1:7860/login", json={"user_id": user_id})
+            # For HF Spaces, the app runs on a specific port, but we call it internally via its name
+            response = requests.post("http://localhost:7860/login", json={"user_id": user_id})
             if response.status_code == 200:
                 token = response.json()["access_token"]
                 status_html = f"<p style='color:green;'>Logged in as: {user_id}. You can start chatting now.</p>"
@@ -170,7 +156,7 @@ with gr.Blocks() as demo:
         try:
             headers = {"Authorization": f"Bearer {token}"}
             payload = {"prompt": message, "user_id": user_id, "session_id": session_id}
-            response = requests.post("http://127.0.0.1:7860/agent/invoke", json=payload, headers=headers)
+            response = requests.post("http://localhost:7860/agent/invoke", json=payload, headers=headers)
             
             if response.status_code == 200:
                 bot_message = response.json()["response"]
@@ -185,4 +171,8 @@ 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="/")
+app = gr.mount_gradio_app(app, demo, path="/")
+
+# --- ADD THIS BLOCK AT THE VERY END ---
+if __name__ == "__main__":
+    uvicorn.run(app, host="0.0.0.0", port=7860)