Update app.py

app.py

@@ -1,12 +1,13 @@
-from fastapi import FastAPI, Request, HTTPException
+from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse, JSONResponse
 from pydantic import BaseModel
 from typing import List, Optional
+
 import asyncio
 import json
-import time
 import uuid
+import time
 import logging
 
 import g4f
@@ -18,22 +19,15 @@ from g4f.client import Client
 # =====================================================
 
 logging.basicConfig(level=logging.INFO)
-
 logger = logging.getLogger(__name__)
 
-# =====================================================
-# CONFIG
-# =====================================================
-
-API_KEY = "sk-your-secret-key"
-
 # =====================================================
 # FASTAPI
 # =====================================================
 
 app = FastAPI(
     title="Universal AI Gateway",
-    version="4.0.0"
+    version="5.0.0"
 )
 
 # =====================================================
@@ -56,7 +50,6 @@ class Message(BaseModel):
     role: str
     content: str
 
-
 class ChatRequest(BaseModel):
     model: str
     messages: List[Message]
@@ -64,36 +57,6 @@ class ChatRequest(BaseModel):
     temperature: Optional[float] = 0.7
     max_tokens: Optional[int] = 4096
 
-
-# =====================================================
-# AUTH
-# =====================================================
-
-def verify_api_key(req: Request):
-
-    auth = req.headers.get("Authorization")
-
-    if not auth:
-        raise HTTPException(
-            status_code=401,
-            detail="Missing Authorization Header"
-        )
-
-    if not auth.startswith("Bearer "):
-        raise HTTPException(
-            status_code=401,
-            detail="Invalid Authorization Format"
-        )
-
-    token = auth.replace("Bearer ", "")
-
-    if token != API_KEY:
-        raise HTTPException(
-            status_code=403,
-            detail="Invalid API Key"
-        )
-
-
 # =====================================================
 # ROOT
 # =====================================================
@@ -104,10 +67,9 @@ async def root():
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "4.0.0"
+        "version": "5.0.0"
     }
 
-
 # =====================================================
 # AUTO MODELS IMPORT
 # =====================================================
@@ -124,9 +86,6 @@ async def get_models():
         if hasattr(g4f.models, "_all_models"):
             all_models = list(g4f.models._all_models)
 
-        elif hasattr(g4f.models, "__models__"):
-            all_models = list(g4f.models.__models__)
-
         unique_models = set()
 
         for model in all_models:
@@ -144,60 +103,45 @@ async def get_models():
                     "owned_by": "g4f"
                 })
 
-        if not models_data:
-
-            fallback_models = [
-                "gpt-4o-mini",
-                "gpt-4o",
-                "gpt-4",
-                "gpt-3.5-turbo",
-                "claude-3-haiku",
-                "claude-3-opus",
-                "gemini-pro",
-                "llama-3.1-70b",
-                "mixtral-8x7b"
-            ]
+    except Exception as e:
 
-            for model_name in fallback_models:
+        logger.error(f"Models error: {e}")
 
-                models_data.append({
-                    "id": model_name,
-                    "object": "model",
-                    "created": int(time.time()),
-                    "owned_by": "g4f"
-                })
+    # fallback
+    if not models_data:
 
-    except Exception as e:
+        fallback = [
+            "gpt-4o-mini",
+            "gpt-4o",
+            "gpt-4",
+            "claude-3-haiku",
+            "gemini-pro",
+            "llama-3.1-70b"
+        ]
 
-        logger.error(f"Models error: {e}")
+        for m in fallback:
 
-        models_data = [
-            {
-                "id": "gpt-4o-mini",
+            models_data.append({
+                "id": m,
                 "object": "model",
                 "created": int(time.time()),
                 "owned_by": "g4f"
-            }
-        ]
+            })
 
     return {
         "object": "list",
         "data": models_data
     }
 
-
 # =====================================================
 # CHAT COMPLETIONS
 # =====================================================
 
 @app.post("/v1/chat/completions")
 async def chat_completions(
-    req: Request,
     body: ChatRequest
 ):
 
-    verify_api_key(req)
-
     messages = [
         {
             "role": m.role,
@@ -206,10 +150,10 @@ async def chat_completions(
         for m in body.messages
     ]
 
-    logger.info(f"Request model: {body.model}")
+    logger.info(f"Model: {body.model}")
 
     # =================================================
-    # STREAM MODE
+    # STREAM
     # =================================================
 
     if body.stream:
@@ -263,11 +207,10 @@ async def chat_completions(
 
                             await asyncio.sleep(0)
 
-                    except Exception as chunk_error:
+                    except Exception as e:
+                        logger.error(e)
 
-                        logger.error(f"Chunk error: {chunk_error}")
-
-                final_payload = {
+                done_payload = {
                     "id": chunk_id,
                     "object": "chat.completion.chunk",
                     "created": int(time.time()),
@@ -281,13 +224,12 @@ async def chat_completions(
                     ]
                 }
 
-                yield f"data: {json.dumps(final_payload)}\n\n"
-
+                yield f"data: {json.dumps(done_payload)}\n\n"
                 yield "data: [DONE]\n\n"
 
             except Exception as e:
 
-                logger.error(f"Streaming error: {e}")
+                logger.error(e)
 
                 error_payload = {
                     "error": {
@@ -353,26 +295,15 @@ async def chat_completions(
 
     except Exception as e:
 
-        logger.error(f"Chat error: {e}")
+        logger.error(e)
 
-        raise HTTPException(
+        return JSONResponse(
             status_code=500,
-            detail=str(e)
+            content={
+                "error": str(e)
+            }
         )
 
-
-# =====================================================
-# TEST UI
-# =====================================================
-
-@app.get("/test")
-async def test():
-
-    return {
-        "message": "Server is working"
-    }
-
-
 # =====================================================
 # RUN
 # =====================================================
@@ -381,8 +312,6 @@ if __name__ == "__main__":
 
     import uvicorn
 
-    print("Server running on port 7860")
-
     uvicorn.run(
         app,
         host="0.0.0.0",