Update app.py

app.py

@@ -3,30 +3,31 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse, JSONResponse
 from pydantic import BaseModel
 from typing import List
+import g4f
+import g4f.models
 import json
 import uuid
 import time
 import asyncio
-import g4f
 
-# =========================================
+# =====================================================
 # CONFIG
-# =========================================
+# =====================================================
 
 API_KEY = "sk-your-secret-key"
 
-# =========================================
+# =====================================================
 # FASTAPI
-# =========================================
+# =====================================================
 
 app = FastAPI(
-    title="Universal OpenAI API",
-    version="1.0.0"
+    title="Universal AI Gateway",
+    version="2.0.0"
 )
 
-# =========================================
+# =====================================================
 # CORS
-# =========================================
+# =====================================================
 
 app.add_middleware(
     CORSMiddleware,
@@ -36,21 +37,9 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# =========================================
+# =====================================================
 # MODELS
-# =========================================
-
-AVAILABLE_MODELS = [
-    "gpt-4o-mini",
-    "gpt-4",
-    "claude-3-haiku",
-    "llama-3.1-70b",
-    "mixtral-8x7b"
-]
-
-# =========================================
-# Pydantic
-# =========================================
+# =====================================================
 
 class Message(BaseModel):
     role: str
@@ -63,9 +52,9 @@ class ChatRequest(BaseModel):
     temperature: float = 0.7
     max_tokens: int = 4096
 
-# =========================================
+# =====================================================
 # AUTH
-# =========================================
+# =====================================================
 
 def verify_api_key(req: Request):
 
@@ -91,40 +80,67 @@ def verify_api_key(req: Request):
             detail="Invalid API Key"
         )
 
-# =========================================
+# =====================================================
 # ROOT
-# =========================================
+# =====================================================
 
 @app.get("/")
 async def root():
 
     return {
-        "status": "online"
+        "status": "online",
+        "service": "Universal AI Gateway"
     }
 
-# =========================================
+# =====================================================
 # MODELS ENDPOINT
-# =========================================
+# =====================================================
 
 @app.get("/v1/models")
 async def models():
 
-    return {
-        "object": "list",
-        "data": [
-            {
-                "id": model,
+    data = []
+
+    try:
+
+        all_models = list(g4f.models._all_models)
+
+        for model_name in all_models:
+
+            data.append({
+                "id": str(model_name),
                 "object": "model",
                 "created": int(time.time()),
-                "owned_by": "9router"
-            }
-            for model in AVAILABLE_MODELS
+                "owned_by": "g4f"
+            })
+
+    except Exception:
+
+        fallback = [
+            "gpt-4o-mini",
+            "gpt-4",
+            "claude-3-haiku",
+            "llama-3.1-70b",
+            "mixtral-8x7b"
         ]
+
+        for model_name in fallback:
+
+            data.append({
+                "id": model_name,
+                "object": "model",
+                "created": int(time.time()),
+                "owned_by": "g4f"
+            })
+
+    return {
+        "object": "list",
+        "data": data
     }
 
-# =========================================
+# =====================================================
 # CHAT COMPLETIONS
-# =========================================
+# =====================================================
 
 @app.post("/v1/chat/completions")
 async def chat_completions(
@@ -142,11 +158,9 @@ async def chat_completions(
         for m in body.messages
     ]
 
-    provider = g4f.Provider.Blackbox
-
-    # =====================================
+    # =================================================
     # STREAMING
-    # =====================================
+    # =================================================
 
     if body.stream:
 
@@ -156,7 +170,6 @@ async def chat_completions(
 
                 response = g4f.ChatCompletion.create(
                     model=body.model,
-                    provider=provider,
                     messages=messages,
                     stream=True
                 )
@@ -219,15 +232,14 @@ async def chat_completions(
             media_type="text/event-stream"
         )
 
-    # =====================================
+    # =================================================
     # NORMAL RESPONSE
-    # =====================================
+    # =================================================
 
     try:
 
         response = g4f.ChatCompletion.create(
             model=body.model,
-            provider=provider,
             messages=messages
         )