Update app.py

app.py

@@ -1,8 +1,8 @@
 import os
 import requests
 import gradio as gr
-from google import genai # CHANGED: Modern library import
-from google.generativeai.types import HarmCategory, HarmBlockThreshold # For safety settings
+from google import genai # Correct modern library import
+# REMOVED: from google.generativeai.types import HarmCategory, HarmBlockThreshold
 from fastapi import FastAPI, HTTPException, Depends
 from fastapi.security import OAuth2PasswordBearer
 from pydantic import BaseModel
@@ -12,14 +12,14 @@ from supabase import create_client, Client
 import jwt
 from datetime import datetime, timedelta
 
-# --- Configuration ---
+# --- Configuration (No changes here) ---
 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 ---
+# --- Initialize Supabase Admin Client (No changes here) ---
 try:
     supabase_admin: Client = create_client(SUPABASE_URL, SUPABASE_SERVICE_KEY)
     print("Successfully created Supabase admin client.")
@@ -27,11 +27,8 @@ 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, these are still correct) ---
-# NOTE: In a real app, these would call your mock API. For this example, we keep the Supabase calls.
-
+# --- Tool Definitions (No changes here) ---
 def get_ai_advisor_chat_history(supabase_user_client: Client, user_id: str):
-    """Fetches the conversation history for the logged-in user."""
     print(f"TOOL CALL: get_ai_advisor_chat_history for user '{user_id}' from Supabase")
     try:
         response = supabase_user_client.table('chat_history').select("*").eq('user_id', user_id).order('timestamp').limit(50).execute()
@@ -40,7 +37,6 @@ def get_ai_advisor_chat_history(supabase_user_client: Client, user_id: str):
         return {"error": f"Database query failed: {str(e)}"}
 
 def save_chat_turn(supabase_user_client: Client, user_id: str, session_id: str, user_message: str, assistant_message: str):
-    """Saves the conversation turn to the database for the logged-in user."""
     print(f"TOOL CALL: Saving chat turn for user '{user_id}' to Supabase")
     try:
         supabase_user_client.table('chat_history').insert([
@@ -51,7 +47,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 ---
+# --- FastAPI Application with Authentication (No changes here) ---
 app = FastAPI()
 
 class LoginRequest(BaseModel):
@@ -62,7 +58,7 @@ class AgentRequest(BaseModel):
     user_id: str
     session_id: str = "default-session"
 
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login") # Corrected tokenUrl
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login")
 
 @app.post("/login")
 async def login(request: LoginRequest):
@@ -75,7 +71,7 @@ async def login(request: LoginRequest):
 
 @app.post("/agent/invoke")
 async def invoke_gemini_agent(request: AgentRequest, token: str = Depends(oauth2_scheme)):
-    # 1. Authenticate and create user-specific Supabase client
+    # 1. Authenticate (No changes here)
     try:
         decoded_token = jwt.decode(token, JWT_SECRET, algorithms=["HS256"], audience="authenticated")
         user_id = decoded_token.get("sub")
@@ -83,50 +79,48 @@ async def invoke_gemini_agent(request: AgentRequest, token: str = Depends(oauth2
             raise HTTPException(status_code=401, detail="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) # Use token for both
+        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}")
 
-    # 2. Define tools available for this specific request
+    # 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 using the MODERN library structure
+    
+    # 3. Fetch history and run the Gemini agent
     try:
-        # CHANGED: Initialize the modern client
-        client = genai.Client(api_key=GOOGLE_API_KEY)
+        genai.configure(api_key=GOOGLE_API_KEY)
         
         history_data = get_my_chat_history()
-        
-        # CHANGED: Build the conversation history in the new format
         conversation_history = []
         if isinstance(history_data, list):
             for turn in history_data:
                 role = "user" if turn['role'] == 'user' else "model"
                 conversation_history.append({'role': role, 'parts': [{'text': turn['content']}]})
         
-        # Add the current user prompt
         conversation_history.append({'role': 'user', 'parts': [{'text': request.prompt}]})
 
-        # CHANGED: Call the model with the full history
-        model = client.models.get('gemini-pro')
+        # 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
         response = model.generate_content(
             conversation_history,
             tools=tools_for_gemini,
-            safety_settings={ # Added safety settings for robustness
-                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE,
-                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_NONE,
-                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_NONE,
-                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_NONE,
+            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',
             }
         )
 
         final_response_text = response.text
         
-        # 4. Save the new conversation turn to the database
+        # 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}