Update app.py

app.py

@@ -11,12 +11,6 @@ import logging
 
 import g4f
 from g4f.client import Client
-from g4f.Provider import (
-    Blackbox,
-    DeepInfra,
-    PerplexityLabs,
-    HuggingChat
-)
 
 # =====================================================
 # LOGGING
@@ -31,29 +25,13 @@ logger = logging.getLogger(__name__)
 
 API_KEY = "sk-your-secret-key"
 
-# =====================================================
-# PROVIDER MAPPING - التعديل الدقيق #1
-# =====================================================
-
-REAL_PROVIDERS = {
-    "gpt-4o": Blackbox,
-    "gpt-4o-mini": DeepInfra,
-    "gpt-4": Blackbox,
-    "gpt-3.5-turbo": DeepInfra,
-    "claude-3-haiku": HuggingChat,
-    "llama-3.1-70b": DeepInfra,
-    "mixtral-8x7b": DeepInfra,
-    "deepseek-chat": Blackbox,
-    "gemini-pro": PerplexityLabs
-}
-
 # =====================================================
 # FASTAPI
 # =====================================================
 
 app = FastAPI(
     title="Universal AI Gateway",
-    version="4.0.0"
+    version="5.0.0"
 )
 
 # =====================================================
@@ -69,7 +47,7 @@ app.add_middleware(
 )
 
 # =====================================================
-# MODELS
+# REQUEST MODELS
 # =====================================================
 
 class Message(BaseModel):
@@ -91,7 +69,7 @@ def verify_api_key(req: Request):
 
     auth = req.headers.get("Authorization")
 
-    # السماح للاختبار
+    # السماح بالاختبار
     if not auth:
         return True
 
@@ -111,6 +89,84 @@ def verify_api_key(req: Request):
 
     return True
 
+# =====================================================
+# PROVIDERS
+# =====================================================
+
+def get_provider(provider_name):
+
+    providers_map = {}
+
+    # Duck.ai
+    if hasattr(g4f.Provider, "DuckDuckGo"):
+        providers_map["duck"] = g4f.Provider.DuckDuckGo
+        providers_map["duckduckgo"] = g4f.Provider.DuckDuckGo
+
+    # Blackbox
+    if hasattr(g4f.Provider, "Blackbox"):
+        providers_map["blackbox"] = g4f.Provider.Blackbox
+
+    # Free2GPT
+    if hasattr(g4f.Provider, "Free2GPT"):
+        providers_map["free2gpt"] = g4f.Provider.Free2GPT
+
+    # Copilot
+    if hasattr(g4f.Provider, "Copilot"):
+        providers_map["copilot"] = g4f.Provider.Copilot
+
+    # Liaobots
+    if hasattr(g4f.Provider, "Liaobots"):
+        providers_map["liaobots"] = g4f.Provider.Liaobots
+
+    # Gemini
+    if hasattr(g4f.Provider, "Gemini"):
+        providers_map["gemini"] = g4f.Provider.Gemini
+
+    # DeepInfra
+    if hasattr(g4f.Provider, "DeepInfra"):
+        providers_map["deepinfra"] = g4f.Provider.DeepInfra
+
+    # Pollinations
+    if hasattr(g4f.Provider, "PollinationsAI"):
+        providers_map["pollinations"] = g4f.Provider.PollinationsAI
+
+    return providers_map.get(provider_name.lower())
+
+# =====================================================
+# MODEL ROUTING
+# =====================================================
+
+def detect_provider(model_name: str):
+
+    model = model_name.lower()
+
+    # GPT Models -> Duck.ai أولاً
+    if "gpt" in model:
+        return "duck"
+
+    # Claude
+    if "claude" in model:
+        return "liaobots"
+
+    # Gemini
+    if "gemini" in model:
+        return "gemini"
+
+    # DeepSeek
+    if "deepseek" in model:
+        return "deepinfra"
+
+    # Llama
+    if "llama" in model:
+        return "deepinfra"
+
+    # Mixtral
+    if "mixtral" in model:
+        return "deepinfra"
+
+    # fallback
+    return "duck"
+
 # =====================================================
 # ROOT
 # =====================================================
@@ -121,7 +177,9 @@ async def root():
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "4.0.0"
+        "version": "5.0.0",
+        "g4f": True,
+        "duck_ai": True
     }
 
 # =====================================================
@@ -131,53 +189,30 @@ async def root():
 @app.get("/v1/models")
 async def get_models():
 
-    models_data = []
-
     fallback_models = [
         "gpt-4o-mini",
         "gpt-4o",
         "gpt-4",
         "gpt-3.5-turbo",
         "claude-3-haiku",
+        "claude-3-sonnet",
+        "gemini-pro",
+        "gemini-1.5-flash",
         "llama-3.1-70b",
         "mixtral-8x7b",
-        "deepseek-chat",
-        "gemini-pro"
+        "deepseek-chat"
     ]
 
-    try:
-
-        if hasattr(g4f.models, "_all_models"):
-
-            all_models = list(g4f.models._all_models)
-
-            for model in all_models[:50]:
-
-                models_data.append({
-                    "id": str(model),
-                    "object": "model",
-                    "created": int(time.time()),
-                    "owned_by": "g4f"
-                })
-
-    except Exception as e:
-
-        logger.error(f"Models error: {e}")
+    models_data = []
 
-    # fallback - التعديل الدقيق #2
-    if not models_data:
+    for model in fallback_models:
 
-        for model in fallback_models:
-            provider_name = "g4f"
-            if model in REAL_PROVIDERS:
-                provider_name = REAL_PROVIDERS[model].__name__
-            
-            models_data.append({
-                "id": model,
-                "object": "model",
-                "created": int(time.time()),
-                "owned_by": provider_name
-            })
+        models_data.append({
+            "id": model,
+            "object": "model",
+            "created": int(time.time()),
+            "owned_by": "g4f"
+        })
 
     return {
         "object": "list",
@@ -204,12 +239,16 @@ async def chat_completions(
         for m in body.messages
     ]
 
+    provider_name = detect_provider(body.model)
+
+    provider = get_provider(provider_name)
+
     logger.info(
-        f"Request model={body.model} stream={body.stream}"
+        f"MODEL={body.model} | PROVIDER={provider_name}"
     )
 
     # =================================================
-    # STREAMING
+    # STREAM
     # =================================================
 
     if body.stream:
@@ -218,12 +257,11 @@ async def chat_completions(
 
             try:
 
-                # التعديل الدقيق #3 - استخدام المزود الحقيقي
-                provider = REAL_PROVIDERS.get(body.model, None)
-                client = Client(provider=provider) if provider else Client()
+                client = Client()
 
                 response = client.chat.completions.create(
                     model=body.model,
+                    provider=provider,
                     messages=messages,
                     stream=True
                 )
@@ -237,9 +275,9 @@ async def chat_completions(
                         content = ""
 
                         if (
-                            chunk.choices
+                            hasattr(chunk, "choices")
+                            and chunk.choices
                             and chunk.choices[0].delta
-                            and chunk.choices[0].delta.content
                         ):
                             content = chunk.choices[0].delta.content
 
@@ -265,11 +303,9 @@ async def chat_completions(
 
                             await asyncio.sleep(0)
 
-                    except Exception as chunk_error:
+                    except Exception as e:
 
-                        logger.error(
-                            f"Chunk error: {chunk_error}"
-                        )
+                        logger.error(f"Chunk Error: {e}")
 
                 final_payload = {
                     "id": chunk_id,
@@ -285,7 +321,15 @@ async def chat_completions(
                     ]
                 }
 
-                yield f"data: {json.dumps(final_payload)}\n\error_payload = {
+                yield f"data: {json.dumps(final_payload)}\n\n"
+
+                yield "data: [DONE]\n\n"
+
+            except Exception as e:
+
+                logger.error(f"Streaming Error: {e}")
+
+                error_payload = {
                     "error": {
                         "message": str(e),
                         "type": "server_error"
@@ -305,18 +349,17 @@ async def chat_completions(
         )
 
     # =================================================
-    # NORMAL RESPONSE
+    # NORMAL
     # =================================================
 
     try:
 
-        # التعديل الدقيق #4 - استخدام المزود الحقيقي
-        provider = REAL_PROVIDERS.get(body.model, None)
-        client = Client(provider=provider) if provider else Client()
+        client = Client()
 
         response = await asyncio.to_thread(
             client.chat.completions.create,
             model=body.model,
+            provider=provider,
             messages=messages
         )
 
@@ -351,13 +394,25 @@ async def chat_completions(
 
     except Exception as e:
 
-        logger.error(f"Chat error: {e}")
+        logger.error(f"Chat Error: {e}")
 
         raise HTTPException(
             status_code=500,
             detail=str(e)
         )
 
+# =====================================================
+# HEALTH
+# =====================================================
+
+@app.get("/health")
+async def health():
+
+    return {
+        "ok": True,
+        "time": int(time.time())
+    }
+
 # =====================================================
 # RUN
 # =====================================================
@@ -370,4 +425,4 @@ if __name__ == "__main__":
         app,
         host="0.0.0.0",
         port=7860
-    )
+    )