Update app.py

app.py

@@ -1,68 +1,42 @@
 import random
+import httpx
+
+from fastapi import FastAPI, Request, HTTPException
+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 logging
 
-from typing import List, Optional
-
 import g4f
 from g4f.client import Client
 
-from fastapi import FastAPI, Request, HTTPException
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import StreamingResponse, JSONResponse
-from pydantic import BaseModel
-
-# =====================================================
-# SAFE PROVIDERS
-# =====================================================
-
-SAFE_PROVIDER_NAMES = [
-    "DeepInfra",
-    "DDG",
-    "Cloudflare",
-]
 
 # =====================================================
 # LOGGING
 # =====================================================
 
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s [%(levelname)s] %(message)s"
-)
-
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+
 # =====================================================
 # CONFIG
 # =====================================================
 
 API_KEY = "sk-your-secret-key"
 
-# =====================================================
-# LOAD SAFE PROVIDERS
-# =====================================================
-
-AVAILABLE_PROVIDERS = []
-
-for provider_name in SAFE_PROVIDER_NAMES:
-
-    try:
-
-        provider = getattr(g4f.Provider, provider_name)
-
-        AVAILABLE_PROVIDERS.append(provider)
+# Timeout لمنع التعليق
+REQUEST_TIMEOUT = 40
 
-        logger.info(f"Loaded provider: {provider_name}")
+# عدد المحاولات
+MAX_RETRIES = 3
 
-    except Exception:
-
-        logger.warning(
-            f"Provider not available: {provider_name}"
-        )
 
 # =====================================================
 # FASTAPI
@@ -70,9 +44,10 @@ for provider_name in SAFE_PROVIDER_NAMES:
 
 app = FastAPI(
     title="Universal AI Gateway",
-    version="5.0.0"
+    version="4.1.0"
 )
 
+
 # =====================================================
 # CORS
 # =====================================================
@@ -85,6 +60,7 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+
 # =====================================================
 # MODELS
 # =====================================================
@@ -101,6 +77,7 @@ class ChatRequest(BaseModel):
     temperature: Optional[float] = 0.7
     max_tokens: Optional[int] = 4096
 
+
 # =====================================================
 # AUTH
 # =====================================================
@@ -109,6 +86,7 @@ def verify_api_key(req: Request):
 
     auth = req.headers.get("Authorization")
 
+    # السماح للاختبار
     if not auth:
         return True
 
@@ -128,6 +106,7 @@ def verify_api_key(req: Request):
 
     return True
 
+
 # =====================================================
 # ROOT
 # =====================================================
@@ -138,13 +117,10 @@ async def root():
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "5.0.0",
-        "providers": [
-            p.__name__
-            for p in AVAILABLE_PROVIDERS
-        ]
+        "version": "4.1.0"
     }
 
+
 # =====================================================
 # MODELS
 # =====================================================
@@ -185,6 +161,7 @@ async def get_models():
 
         logger.error(f"Models error: {e}")
 
+    # fallback
     if not models_data:
 
         for model in fallback_models:
@@ -201,22 +178,12 @@ async def get_models():
         "data": models_data
     }
 
-# =====================================================
-# PROVIDER PICKER
-# =====================================================
-
-def pick_provider():
-
-    if not AVAILABLE_PROVIDERS:
-        return None
-
-    return random.choice(AVAILABLE_PROVIDERS)
 
 # =====================================================
-# COMPLETION HELPER
+# SAFE COMPLETION
 # =====================================================
 
-async def create_completion(
+async def safe_completion(
     model,
     messages,
     stream=False
@@ -224,33 +191,25 @@ async def create_completion(
 
     last_error = None
 
-    providers = AVAILABLE_PROVIDERS.copy()
-
-    random.shuffle(providers)
-
-    for provider in providers:
+    for attempt in range(MAX_RETRIES):
 
         try:
 
             logger.info(
-                f"Trying provider: {provider.__name__}"
+                f"Attempt {attempt + 1} | model={model}"
             )
 
             client = Client()
 
+            # timeout لمنع التعليق
             response = await asyncio.wait_for(
                 asyncio.to_thread(
                     client.chat.completions.create,
                     model=model,
                     messages=messages,
-                    provider=provider,
                     stream=stream
                 ),
-                timeout=45
-            )
-
-            logger.info(
-                f"Success provider: {provider.__name__}"
+                timeout=REQUEST_TIMEOUT
             )
 
             return response
@@ -260,14 +219,13 @@ async def create_completion(
             last_error = e
 
             logger.warning(
-                f"Provider failed: {provider.__name__} | {e}"
+                f"Attempt failed {attempt + 1}: {e}"
             )
 
             await asyncio.sleep(1)
 
-    raise Exception(
-        f"All providers failed: {last_error}"
-    )
+    raise Exception(last_error)
+
 
 # =====================================================
 # CHAT COMPLETIONS
@@ -303,7 +261,7 @@ async def chat_completions(
 
             try:
 
-                response = await create_completion(
+                response = await safe_completion(
                     model=body.model,
                     messages=messages,
                     stream=True
@@ -311,6 +269,8 @@ async def chat_completions(
 
                 chunk_id = f"chatcmpl-{uuid.uuid4().hex}"
 
+                chunk_count = 0
+
                 for chunk in response:
 
                     try:
@@ -327,6 +287,8 @@ async def chat_completions(
 
                         if content:
 
+                            chunk_count += 1
+
                             payload = {
                                 "id": chunk_id,
                                 "object": "chat.completion.chunk",
@@ -356,6 +318,21 @@ async def chat_completions(
                             f"Chunk error: {chunk_error}"
                         )
 
+                # إذا لم يصل أي chunk
+                if chunk_count == 0:
+
+                    error_payload = {
+                        "error": {
+                            "message": "Provider returned empty stream",
+                            "type": "empty_stream"
+                        }
+                    }
+
+                    yield (
+                        f"data: "
+                        f"{json.dumps(error_payload)}\n\n"
+                    )
+
                 final_payload = {
                     "id": chunk_id,
                     "object": "chat.completion.chunk",
@@ -377,6 +354,22 @@ async def chat_completions(
 
                 yield "data: [DONE]\n\n"
 
+            except asyncio.TimeoutError:
+
+                logger.error("Streaming timeout")
+
+                error_payload = {
+                    "error": {
+                        "message": "Request timeout",
+                        "type": "timeout"
+                    }
+                }
+
+                yield (
+                    f"data: "
+                    f"{json.dumps(error_payload)}\n\n"
+                )
+
             except Exception as e:
 
                 logger.error(f"Streaming error: {e}")
@@ -409,7 +402,7 @@ async def chat_completions(
 
     try:
 
-        response = await create_completion(
+        response = await safe_completion(
             model=body.model,
             messages=messages,
             stream=False
@@ -449,6 +442,15 @@ async def chat_completions(
             }
         })
 
+    except asyncio.TimeoutError:
+
+        logger.error("Request timeout")
+
+        raise HTTPException(
+            status_code=408,
+            detail="Request timeout"
+        )
+
     except Exception as e:
 
         logger.error(f"Chat error: {e}")
@@ -458,6 +460,7 @@ async def chat_completions(
             detail=str(e)
         )
 
+
 # =====================================================
 # RUN
 # =====================================================
@@ -466,8 +469,6 @@ if __name__ == "__main__":
 
     import uvicorn
 
-    logger.info("Starting Universal AI Gateway")
-
     uvicorn.run(
         app,
         host="0.0.0.0",