Update app.py

app.py

@@ -22,8 +22,7 @@ CURRENT_USER = os.getenv("USER", "ErRickow")
 
 # Default API Keys (fallback if user doesn't provide their own)
 DEFAULT_XAI_KEY = os.getenv(
-    "XAI_API_KEY",
-    "xai-vfjhklL384Z4HKdItsZomqpFlXubTZJAFnISQUpV7dE8lRnWwYBVPSCxSTlu08wDbAcv720bx2dDiQ9x",
+    "XAI_API_KEY"
 )
 DEFAULT_GEMINI_KEY = os.getenv("GEMINI_API_KEY")
 GEMINI_BASE_URL = "https://generativelanguage.googleapis.com/v1beta/openai/"
@@ -121,8 +120,11 @@ async def get_available_models(provider: str, api_key: str = None) -> List[str]:
         if provider == AIProvider.XAI:
             if not api_key and not DEFAULT_XAI_KEY:
                 return ["grok-2-latest"], "⚠️ API Key diperlukan untuk mendapatkan daftar model lengkap"
-
-            client = AsyncOpenAI(api_key=api_key or DEFAULT_XAI_KEY, base_url=XAI_BASE_URL)
+            
+            client = AsyncOpenAI(
+                api_key=api_key or DEFAULT_XAI_KEY,
+                base_url=XAI_BASE_URL
+            )
             models = await client.models.list()
             available_models = [m.id for m in models.data if "grok" in m.id.lower()]
             return available_models, None
@@ -130,16 +132,32 @@ async def get_available_models(provider: str, api_key: str = None) -> List[str]:
         elif provider == AIProvider.GEMINI:
             if not api_key and not DEFAULT_GEMINI_KEY:
                 return ["gemini-pro"], "⚠️ API Key diperlukan untuk mendapatkan daftar model lengkap"
-
-            genai.configure(api_key=api_key or DEFAULT_GEMINI_KEY)
-            models = [m.name for m in genai.list_models() if "gemini" in m.name.lower()]
-            return models, None
+            
+            client = AsyncOpenAI(
+                api_key=api_key or DEFAULT_GEMINI_KEY,
+                base_url=GEMINI_BASE_URL
+            )
+            try:
+                models = await client.models.list()
+                available_models = []
+                if hasattr(models, 'data'):
+                    for model in models.data:
+                        if "gemini" in model.id.lower():
+                            # Remove 'models/' prefix if exists
+                            model_name = model.id.replace("models/", "")
+                            available_models.append(model_name)
+                
+                if not available_models:  # Fallback if no models found
+                    available_models = GEMINI_MODELS
+                return available_models, None
+            except Exception as e:
+                return GEMINI_MODELS, f"⚠️ Error listing models: {str(e)}"
 
         else:  # OLLAMA
             try:
                 response = requests.get(f"{OLLAMA_API}/api/tags")
                 if response.status_code == 200:
-                    models = [m["name"] for m in response.json()["models"]]
+                    models = [m['name'] for m in response.json()['models']]
                     return models, None
                 return ["llama2"], f"⚠️ Error mengakses Ollama API: {response.status_code}"
             except Exception as e:
@@ -148,7 +166,6 @@ async def get_available_models(provider: str, api_key: str = None) -> List[str]:
     except Exception as e:
         return [], f"⚠️ Error mendapatkan daftar model: {str(e)}"
 
-
 class AIProvider:
     OLLAMA = "ollama"
     GEMINI = "gemini"