Update app.py

app.py

@@ -12,7 +12,7 @@ import logging
 
 import g4f
 from g4f.client import Client
-from g4f import Provider
+import g4f.Provider as Provider
 
 
 # =====================================================
@@ -29,77 +29,216 @@ logger = logging.getLogger(__name__)
 
 API_KEY = "sk-your-secret-key"
 REQUEST_TIMEOUT = 45
-MAX_RETRIES = 2
 
 
 # =====================================================
 # MODEL → PROVIDER MAP
-# الإصلاح الوحيد: كل نموذج مربوط بـ provider يعمل
-# بدون API key بدل auto العشوائي
+# مزودون حقيقيون بدون API KEY
 # =====================================================
 
 MODEL_PROVIDERS = {
-    # Cohere - تعمل عبر HuggingSpace
-    "command-r":            [Provider.HuggingSpace, Provider.Jmuz],
-    "command-r-plus":       [Provider.HuggingSpace, Provider.Jmuz],
-    "command-r7b":          [Provider.HuggingSpace],
-    "command-a":            [Provider.HuggingSpace],
-    "command":              [Provider.HuggingSpace, Provider.Jmuz],
-    "command-light":        [Provider.HuggingSpace, Provider.Jmuz],
-    "command-nightly":      [Provider.HuggingSpace],
-    "c4ai-aya-expanse-8b":  [Provider.HuggingSpace],
-    "c4ai-aya-expanse-32b": [Provider.HuggingSpace],
-
-    # Kimi
-    "kimi":             [Provider.Jmuz],
-    "moonshot-v1-8k":   [Provider.Jmuz],
-    "moonshot-v1-32k":  [Provider.Jmuz],
-
-    # GPT-4
-    "gpt-4":         [Provider.Jmuz, Provider.Liaobots, Provider.PollinationsAI],
-    "gpt-4-turbo":   [Provider.Jmuz, Provider.Liaobots, Provider.PollinationsAI],
-    "gpt-4o":        [Provider.PollinationsAI, Provider.Jmuz, Provider.Liaobots],
-    "gpt-4o-mini":   [Provider.PollinationsAI, Provider.DDG, Provider.Jmuz],
-    "gpt-3.5-turbo": [Provider.DDG, Provider.Jmuz, Provider.PollinationsAI],
-
-    # DeepSeek
-    "deepseek-chat": [Provider.PollinationsAI, Provider.Jmuz],
-    "deepseek-r1":   [Provider.PollinationsAI, Provider.Jmuz],
-    "deepseek-v3":   [Provider.PollinationsAI, Provider.Jmuz],
-
-    # Llama
-    "llama-3.1-8b":     [Provider.PollinationsAI, Provider.DDG],
-    "llama-3.1-70b":    [Provider.PollinationsAI, Provider.Jmuz],
-    "llama-3.3-70b":    [Provider.PollinationsAI, Provider.Jmuz],
-    "llama-4-scout":    [Provider.PollinationsAI],
-    "llama-4-maverick": [Provider.PollinationsAI],
-
-    # Mistral
-    "mistral-7b":   [Provider.PollinationsAI, Provider.Jmuz],
-    "mixtral-8x7b": [Provider.PollinationsAI, Provider.Jmuz],
-    "mistral-large":[Provider.PollinationsAI, Provider.Jmuz],
-
-    # Gemini
-    "gemini-2.0-flash": [Provider.PollinationsAI, Provider.Jmuz],
-    "gemini-1.5-flash":  [Provider.PollinationsAI, Provider.Jmuz],
-    "gemini-1.5-pro":    [Provider.PollinationsAI, Provider.Jmuz],
-    "gemini-pro":        [Provider.PollinationsAI, Provider.Jmuz],
-
-    # Qwen
-    "qwen-2.5-72b":       [Provider.PollinationsAI, Provider.Jmuz],
-    "qwen-2.5-coder-32b": [Provider.PollinationsAI],
-    "qwq-32b":            [Provider.PollinationsAI, Provider.Jmuz],
-
-    # Claude (عبر Jmuz proxy)
-    "claude-3-haiku":    [Provider.Jmuz, Provider.Liaobots],
-    "claude-3-sonnet":   [Provider.Jmuz, Provider.Liaobots],
-    "claude-3-opus":     [Provider.Jmuz, Provider.Liaobots],
-    "claude-3.5-sonnet": [Provider.Jmuz, Provider.Liaobots],
-
-    # Other
-    "phi-4":     [Provider.PollinationsAI],
-    "sonar-pro": [Provider.PollinationsAI, Provider.Jmuz],
-    "sonar":     [Provider.PollinationsAI, Provider.Jmuz],
+
+    # =================================================
+    # COHERE
+    # =================================================
+
+    "command-r": [
+        Provider.PollinationsAI,
+        Provider.DDG
+    ],
+
+    "command-r-plus": [
+        Provider.PollinationsAI,
+        Provider.DDG
+    ],
+
+    "command-r7b": [
+        Provider.PollinationsAI
+    ],
+
+    "command-a": [
+        Provider.PollinationsAI
+    ],
+
+    "command": [
+        Provider.PollinationsAI
+    ],
+
+    "command-light": [
+        Provider.PollinationsAI
+    ],
+
+    "c4ai-aya-expanse-8b": [
+        Provider.PollinationsAI
+    ],
+
+    "c4ai-aya-expanse-32b": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # KIMI
+    # =================================================
+
+    "kimi-k2": [
+        Provider.PollinationsAI
+    ],
+
+    "kimi": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # GPT
+    # =================================================
+
+    "gpt-4": [
+        Provider.PollinationsAI,
+        Provider.DDG
+    ],
+
+    "gpt-4o": [
+        Provider.PollinationsAI,
+        Provider.DDG
+    ],
+
+    "gpt-4o-mini": [
+        Provider.PollinationsAI,
+        Provider.DDG
+    ],
+
+    "gpt-3.5-turbo": [
+        Provider.DDG,
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # DEEPSEEK
+    # =================================================
+
+    "deepseek-chat": [
+        Provider.PollinationsAI
+    ],
+
+    "deepseek-r1": [
+        Provider.PollinationsAI
+    ],
+
+    "deepseek-v3": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # LLAMA
+    # =================================================
+
+    "llama-3.1-8b": [
+        Provider.PollinationsAI
+    ],
+
+    "llama-3.1-70b": [
+        Provider.PollinationsAI
+    ],
+
+    "llama-3.3-70b": [
+        Provider.PollinationsAI
+    ],
+
+    "llama-4-scout": [
+        Provider.PollinationsAI
+    ],
+
+    "llama-4-maverick": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # QWEN
+    # =================================================
+
+    "qwen-2.5-72b": [
+        Provider.PollinationsAI
+    ],
+
+    "qwen-2.5-coder-32b": [
+        Provider.PollinationsAI
+    ],
+
+    "qwq-32b": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # GEMINI
+    # =================================================
+
+    "gemini-2.0-flash": [
+        Provider.PollinationsAI
+    ],
+
+    "gemini-1.5-flash": [
+        Provider.PollinationsAI
+    ],
+
+    "gemini-1.5-pro": [
+        Provider.PollinationsAI
+    ],
+
+    "gemini-pro": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # MISTRAL
+    # =================================================
+
+    "mistral-7b": [
+        Provider.PollinationsAI
+    ],
+
+    "mixtral-8x7b": [
+        Provider.PollinationsAI
+    ],
+
+    "mistral-large": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # CLAUDE
+    # =================================================
+
+    "claude-3-haiku": [
+        Provider.PollinationsAI
+    ],
+
+    "claude-3-sonnet": [
+        Provider.PollinationsAI
+    ],
+
+    "claude-3-opus": [
+        Provider.PollinationsAI
+    ],
+
+    "claude-3.5-sonnet": [
+        Provider.PollinationsAI
+    ],
+
+    # =================================================
+    # OTHER
+    # =================================================
+
+    "phi-4": [
+        Provider.PollinationsAI
+    ],
+
+    "sonar": [
+        Provider.PollinationsAI
+    ],
+
+    "sonar-pro": [
+        Provider.PollinationsAI
+    ],
 }
 
 
@@ -109,7 +248,7 @@ MODEL_PROVIDERS = {
 
 app = FastAPI(
     title="Universal AI Gateway",
-    version="4.2.0"
+    version="5.0.0"
 )
 
 
@@ -148,14 +287,26 @@ class ChatRequest(BaseModel):
 # =====================================================
 
 def verify_api_key(req: Request):
+
     auth = req.headers.get("Authorization")
+
     if not auth:
         return True
+
     if not auth.startswith("Bearer "):
-        raise HTTPException(status_code=401, detail="Invalid Authorization Format")
+        raise HTTPException(
+            status_code=401,
+            detail="Invalid Authorization Format"
+        )
+
     token = auth.replace("Bearer ", "").strip()
+
     if token != API_KEY:
-        raise HTTPException(status_code=403, detail="Invalid API Key")
+        raise HTTPException(
+            status_code=403,
+            detail="Invalid API Key"
+        )
+
     return True
 
 
@@ -165,28 +316,32 @@ def verify_api_key(req: Request):
 
 @app.get("/")
 async def root():
+
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "4.2.0"
+        "version": "5.0.0"
     }
 
 
 # =====================================================
-# MODELS
+# MODELS LIST
 # =====================================================
 
 @app.get("/v1/models")
 async def get_models():
+
     models_data = []
-    now = int(time.time())
+
     for model_name in MODEL_PROVIDERS.keys():
+
         models_data.append({
             "id": model_name,
             "object": "model",
-            "created": now,
+            "created": int(time.time()),
             "owned_by": "g4f"
         })
+
     return {
         "object": "list",
         "data": models_data
@@ -195,27 +350,42 @@ async def get_models():
 
 # =====================================================
 # SAFE COMPLETION
-# يجرب كل provider في القائمة واحداً تلو الآخر
 # =====================================================
 
 async def safe_completion(model, messages, stream=False):
 
-    # جلب قائمة الـ providers لهذا النموذج
     providers = MODEL_PROVIDERS.get(model)
 
-    # نموذج غير موجود في الجدول → fallback عام
     if not providers:
-        logger.warning(f"Model '{model}' not in table, using fallback providers")
-        providers = [Provider.PollinationsAI, Provider.Jmuz, Provider.DDG]
+
+        logger.warning(
+            f"Model '{model}' not found. Using fallback."
+        )
+
+        providers = [
+            Provider.PollinationsAI,
+            Provider.DDG
+        ]
 
     last_error = None
 
     for provider_cls in providers:
-        pname = getattr(provider_cls, "__name__", str(provider_cls))
+
+        provider_name = getattr(
+            provider_cls,
+            "__name__",
+            str(provider_cls)
+        )
+
         try:
-            logger.info(f"Trying provider={pname} model={model}")
 
-            client = Client(provider=provider_cls)
+            logger.info(
+                f"Trying provider={provider_name} model={model}"
+            )
+
+            client = Client(
+                provider=provider_cls
+            )
 
             response = await asyncio.wait_for(
                 asyncio.to_thread(
@@ -227,16 +397,27 @@ async def safe_completion(model, messages, stream=False):
                 timeout=REQUEST_TIMEOUT
             )
 
-            logger.info(f"Success | provider={pname} model={model}")
+            logger.info(
+                f"Success provider={provider_name} model={model}"
+            )
+
             return response
 
         except asyncio.TimeoutError:
-            last_error = f"{pname}: timeout"
-            logger.warning(f"Timeout | provider={pname}")
+
+            last_error = f"{provider_name}: timeout"
+
+            logger.warning(
+                f"Timeout provider={provider_name}"
+            )
 
         except Exception as e:
+
             last_error = e
-            logger.warning(f"Failed | provider={pname} | {e}")
+
+            logger.warning(
+                f"Failed provider={provider_name} error={e}"
+            )
 
     raise Exception(last_error)
 
@@ -246,16 +427,24 @@ async def safe_completion(model, messages, stream=False):
 # =====================================================
 
 @app.post("/v1/chat/completions")
-async def chat_completions(req: Request, body: ChatRequest):
+async def chat_completions(
+    req: Request,
+    body: ChatRequest
+):
 
     verify_api_key(req)
 
     messages = [
-        {"role": m.role, "content": m.content}
+        {
+            "role": m.role,
+            "content": m.content
+        }
         for m in body.messages
     ]
 
-    logger.info(f"Request model={body.model} stream={body.stream}")
+    logger.info(
+        f"Request model={body.model} stream={body.stream}"
+    )
 
     # =================================================
     # STREAMING
@@ -267,6 +456,8 @@ async def chat_completions(req: Request, body: ChatRequest):
 
             try:
 
+                yield ":\n\n"
+
                 response = await safe_completion(
                     model=body.model,
                     messages=messages,
@@ -274,9 +465,18 @@ async def chat_completions(req: Request, body: ChatRequest):
                 )
 
                 chunk_id = f"chatcmpl-{uuid.uuid4().hex}"
+
                 has_content = False
 
-                for chunk in response:
+                response_iter = iter(response)
+
+                while True:
+
+                    try:
+                        chunk = next(response_iter)
+
+                    except StopIteration:
+                        break
 
                     try:
 
@@ -302,7 +502,9 @@ async def chat_completions(req: Request, body: ChatRequest):
                                 "choices": [
                                     {
                                         "index": 0,
-                                        "delta": {"content": content},
+                                        "delta": {
+                                            "content": content
+                                        },
                                         "finish_reason": None
                                     }
                                 ]
@@ -316,16 +518,24 @@ async def chat_completions(req: Request, body: ChatRequest):
                             await asyncio.sleep(0)
 
                     except Exception as chunk_error:
-                        logger.error(f"Chunk error: {chunk_error}")
+
+                        logger.error(
+                            f"Chunk error: {chunk_error}"
+                        )
 
                 if not has_content:
+
                     error_payload = {
                         "error": {
                             "message": "Provider returned empty stream",
                             "type": "empty_stream"
                         }
                     }
-                    yield f"data: {json.dumps(error_payload)}\n\n"
+
+                    yield (
+                        f"data: "
+                        f"{json.dumps(error_payload)}\n\n"
+                    )
 
                 final_payload = {
                     "id": chunk_id,
@@ -341,12 +551,18 @@ async def chat_completions(req: Request, body: ChatRequest):
                     ]
                 }
 
-                yield f"data: {json.dumps(final_payload)}\n\n"
+                yield (
+                    f"data: "
+                    f"{json.dumps(final_payload)}\n\n"
+                )
+
                 yield "data: [DONE]\n\n"
 
             except Exception as e:
 
-                logger.error(f"Streaming error: {e}")
+                logger.error(
+                    f"Streaming error: {e}"
+                )
 
                 error_payload = {
                     "error": {
@@ -355,7 +571,12 @@ async def chat_completions(req: Request, body: ChatRequest):
                     }
                 }
 
-                yield f"data: {json.dumps(error_payload)}\n\n"
+                yield (
+                    f"data: "
+                    f"{json.dumps(error_payload)}\n\n"
+                )
+
+                yield "data: [DONE]\n\n"
 
         return StreamingResponse(
             generate_stream(),
@@ -382,8 +603,14 @@ async def chat_completions(req: Request, body: ChatRequest):
         assistant_message = ""
 
         try:
-            assistant_message = response.choices[0].message.content
+
+            assistant_message = (
+                response.choices[0]
+                .message.content
+            )
+
         except Exception:
+
             assistant_message = str(response)
 
         return JSONResponse({
@@ -410,7 +637,9 @@ async def chat_completions(req: Request, body: ChatRequest):
 
     except Exception as e:
 
-        logger.error(f"Chat error: {e}")
+        logger.error(
+            f"Chat error: {e}"
+        )
 
         raise HTTPException(
             status_code=500,
@@ -423,5 +652,11 @@ async def chat_completions(req: Request, body: ChatRequest):
 # =====================================================
 
 if __name__ == "__main__":
+
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+
+    uvicorn.run(
+        app,
+        host="0.0.0.0",
+        port=7860
+    )