Update main.py

main.py

@@ -2,6 +2,7 @@ import os
 import json
 import time
 import logging
+import asyncio
 import g4f
 
 from fastapi import FastAPI, HTTPException, Header
@@ -14,13 +15,13 @@ from typing import List, Optional
 # ================= Logging =================
 
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger=logging.getLogger(__name__)
 
 
 # ================= App =================
 
-app = FastAPI(
-    title="G4F OpenAI API",
+app=FastAPI(
+    title="G4F OpenAI Compatible",
     version="1.0"
 )
 
@@ -32,8 +33,7 @@ app.add_middleware(
     allow_headers=["*"]
 )
 
-
-API_KEY = os.getenv(
+API_KEY=os.getenv(
     "API_KEY",
     "your_fallback_secret"
 )
@@ -42,22 +42,20 @@ API_KEY = os.getenv(
 # ================= Models =================
 
 class ChatMessage(BaseModel):
-    role: str
-    content: str
+    role:str
+    content:str
 
 
 class ChatRequest(BaseModel):
-    model: str = "gpt-4o-mini"
-    messages: List[ChatMessage]
-    stream: bool = False
-    provider: Optional[str] = None
-    max_tokens: Optional[int] = 2048
-    temperature: Optional[float] = 0.7
+    model:str="gpt-4o-mini"
+    messages:List[ChatMessage]
+    stream:bool=False
+    provider:Optional[str]=None
 
 
 # ================= Auth =================
 
-def verify_key(auth: str):
+def verify_key(auth:str):
 
     if not auth:
         raise HTTPException(
@@ -65,21 +63,21 @@ def verify_key(auth: str):
             detail="Missing Authorization"
         )
 
-    parts = auth.split()
+    parts=auth.split()
 
-    if len(parts) != 2:
+    if len(parts)!=2:
         raise HTTPException(
             status_code=401,
             detail="Malformed Authorization"
         )
 
-    if parts[0] != "Bearer":
+    if parts[0]!="Bearer":
         raise HTTPException(
             status_code=401,
-            detail="Invalid Bearer"
+            detail="Invalid Authorization"
         )
 
-    if parts[1] != API_KEY:
+    if parts[1]!=API_KEY:
         raise HTTPException(
             status_code=401,
             detail="Invalid API Key"
@@ -89,71 +87,70 @@ def verify_key(auth: str):
 # ================= Health =================
 
 @app.get("/")
-async def root():
+async def health():
 
     return {
-        "status": "online"
+        "status":"online"
     }
 
 
-# ================= Models Endpoint =================
+# ================= Models =================
 
 @app.get("/v1/models")
 async def models(
-    authorization: str = Header(None)
+    authorization:str=Header(None)
 ):
 
     verify_key(authorization)
 
     try:
 
-        found = []
-
-        # استخراج أسماء النماذج تلقائياً
-        for name in dir(g4f.models):
+        models=[]
 
-            if name.startswith("_"):
-                continue
+        if hasattr(g4f.models,"ModelUtils"):
 
-            obj = getattr(
-                g4f.models,
-                name
+            models=list(
+                g4f.models.ModelUtils.convert.keys()
             )
 
-            if isinstance(name, str):
-                found.append(name)
+        models=sorted(
+            list(set(models))
+        )
 
-        found = sorted(list(set(found)))
+        if not models:
 
-        if not found:
-            found = [
+            models=[
                 "gpt-4o-mini",
                 "gpt-4",
                 "gpt-3.5-turbo"
             ]
 
         return {
-            "object": "list",
-            "data": [
+
+            "object":"list",
+
+            "data":[
                 {
-                    "id": model,
-                    "object": "model",
-                    "owned_by": "g4f"
+                    "id":m,
+                    "object":"model",
+                    "owned_by":"g4f"
                 }
-                for model in found
+                for m in models
             ]
         }
 
     except Exception as e:
 
-        logger.error(e)
+        logger.exception(e)
 
         return {
-            "object": "list",
-            "data": [
+
+            "object":"list",
+
+            "data":[
                 {
-                    "id": "gpt-4o-mini",
-                    "object": "model"
+                    "id":"gpt-4o-mini",
+                    "object":"model"
                 }
             ]
         }
@@ -163,34 +160,37 @@ async def models(
 
 @app.post("/v1/chat/completions")
 async def chat(
-    body: ChatRequest,
-    authorization: str = Header(None)
+    body:ChatRequest,
+    authorization:str=Header(None)
 ):
 
     verify_key(authorization)
 
     try:
 
-        provider = None
+        messages=[
+
+            {
+                "role":m.role,
+                "content":m.content
+            }
+
+            for m in body.messages
+        ]
+
+
+        provider=None
 
         if body.provider:
 
-            provider = getattr(
+            provider=getattr(
                 g4f.Provider,
                 body.provider,
                 None
             )
 
-        messages = [
-            {
-                "role": m.role,
-                "content": m.content
-            }
-            for m in body.messages
-        ]
-
 
-        # ================= STREAM =================
+        # ===== STREAM =====
 
         if body.stream:
 
@@ -198,7 +198,7 @@ async def chat(
 
                 try:
 
-                    response = g4f.ChatCompletion.create(
+                    response=g4f.ChatCompletion.create(
                         model=body.model,
                         messages=messages,
                         provider=provider,
@@ -207,15 +207,9 @@ async def chat(
 
                     for chunk in response:
 
-                        if not chunk:
-                            continue
+                        payload={
 
-                        payload = {
-
-                            "id":
-                            "chatcmpl-"+str(
-                                int(time.time())
-                            ),
+                            "id":"chatcmpl",
 
                             "object":
                             "chat.completion.chunk",
@@ -238,39 +232,32 @@ async def chat(
                         }
 
                         yield (
-                            "data: "
-                            + json.dumps(payload)
-                            + "\n\n"
+                            f"data: {json.dumps(payload)}\n\n"
                         )
 
                     yield "data: [DONE]\n\n"
 
                 except Exception as e:
 
-                    logger.error(e)
-
-                    error_payload={
-
-                        "error":
-                        str(e)
-
-                    }
+                    logger.exception(e)
 
                     yield (
-                        "data: "
-                        + json.dumps(error_payload)
-                        + "\n\n"
+                        f"data: {json.dumps({'error':str(e)})}\n\n"
                     )
 
+
             return StreamingResponse(
                 generate(),
                 media_type="text/event-stream"
             )
 
 
-        # ================= NORMAL =================
+        # ===== NORMAL =====
+
+        response=await asyncio.to_thread(
+
+            g4f.ChatCompletion.create,
 
-        response = await g4f.ChatCompletion.create_async(
             model=body.model,
             messages=messages,
             provider=provider
@@ -278,35 +265,45 @@ async def chat(
 
         return {
 
-            "id":
-            "chatcmpl-g4f",
+            "id":"chatcmpl",
 
-            "object":
-            "chat.completion",
+            "object":"chat.completion",
 
-            "created":
-            int(time.time()),
+            "created":int(
+                time.time()
+            ),
 
             "model":
             body.model,
 
             "choices":[
+
                 {
+
                     "index":0,
+
                     "message":{
+
                         "role":"assistant",
-                        "content":str(response)
+
+                        "content":
+                        str(response)
+
                     },
-                    "finish_reason":"stop"
+
+                    "finish_reason":
+                    "stop"
                 }
+
             ]
         }
 
+
     except Exception as e:
 
         logger.exception(e)
 
         raise HTTPException(
-            status_code=503,
+            status_code=500,
             detail=str(e)
         )