Update app.py

app.py

@@ -13,7 +13,6 @@ import logging
 import g4f
 from g4f.client import Client
 
-
 # =====================================================
 # LOGGING
 # =====================================================
@@ -21,33 +20,27 @@ from g4f.client import Client
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-
 # =====================================================
 # CONFIG
 # =====================================================
 
 API_KEY = "sk-your-secret-key"
 
-# timeout عام
+# timeout بسيط فقط لمنع التعليق الأبدي
 REQUEST_TIMEOUT = 45
 
-# timeout للـ stream نفسه
-STREAM_CHUNK_TIMEOUT = 20
-
 # retry خفيف
 MAX_RETRIES = 2
 
-
 # =====================================================
 # FASTAPI
 # =====================================================
 
 app = FastAPI(
     title="Universal AI Gateway",
-    version="4.3.0"
+    version="5.0.0"
 )
 
-
 # =====================================================
 # CORS
 # =====================================================
@@ -60,7 +53,6 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-
 # =====================================================
 # MODELS
 # =====================================================
@@ -77,7 +69,6 @@ class ChatRequest(BaseModel):
     temperature: Optional[float] = 0.7
     max_tokens: Optional[int] = 4096
 
-
 # =====================================================
 # AUTH
 # =====================================================
@@ -106,7 +97,6 @@ def verify_api_key(req: Request):
 
     return True
 
-
 # =====================================================
 # ROOT
 # =====================================================
@@ -117,10 +107,9 @@ async def root():
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "4.3.0"
+        "version": "5.0.0"
     }
 
-
 # =====================================================
 # MODELS
 # =====================================================
@@ -129,82 +118,19 @@ async def root():
 async def get_models():
 
     models_data = []
+    added_models = set()
 
     # =================================================
-    # CURATED MODELS
+    # DYNAMIC MODELS FROM G4F
     # =================================================
 
-    fallback_models = [
-
-        # GPT
-        "gpt-4o-mini",
-        "gpt-4o",
-        "gpt-4",
-        "gpt-3.5-turbo",
-
-        # Claude
-        "claude-3-haiku",
-        "claude-3-sonnet",
-
-        # Llama
-        "llama-3.1-70b",
-        "llama-3.1-8b",
-
-        # Qwen
-        "qwen-2-72b",
-        "qwen-2.5-72b",
-
-        # DeepSeek
-        "deepseek-chat",
-        "deepseek-v3",
-        "deepseek-r1-distill-qwen-14b",
-
-        # Kimi
-        "kimi-k2",
-
-        # Mixtral
-        "mixtral-8x7b",
-
-        # Aria
-        "aria",
-
-        # Sonar
-        "sonar-reasoning",
-        "sonar-reasoning-pro",
-
-        # Nemotron
-        "nemotron-70b",
-
-        # =================================================
-        # COHERE FAMILY
-        # =================================================
-
-        "command-r",
-        "command-r-plus",
-        "command-r7b",
-        "command",
-        "command-light",
-        "command-light-nightly",
-        "command-nightly",
-
-        # Cohere advanced
-        "cohere-command-r",
-        "cohere-command-r-plus",
-
-        # Additional aliases
-        "c4ai-command-r-plus",
-        "c4ai-command-r-v01",
-    ]
-
-    added_models = set()
-
     try:
 
         if hasattr(g4f.models, "_all_models"):
 
             all_models = list(g4f.models._all_models)
 
-            for model in all_models[:120]:
+            for model in all_models[:200]:
 
                 model_name = str(model)
 
@@ -224,10 +150,34 @@ async def get_models():
         logger.error(f"Models error: {e}")
 
     # =================================================
-    # ADD CURATED MODELS
+    # IMPORTANT WORKING MODELS
     # =================================================
 
-    for model in fallback_models:
+    important_models = [
+
+        # Cohere family
+        "command-r",
+        "command-r-plus",
+        "command-r7b",
+        "command-a",
+
+        # Kimi
+        "kimi-k2",
+
+        # DeepSeek
+        "deepseek-chat",
+        "deepseek-v3",
+        "deepseek-r1",
+
+        # Gemini
+        "gemini-2.5-flash",
+
+        # GPT
+        "gpt-4",
+        "gpt-4o",
+    ]
+
+    for model in important_models:
 
         if model not in added_models:
 
@@ -246,7 +196,6 @@ async def get_models():
         "total": len(models_data)
     }
 
-
 # =====================================================
 # SAFE COMPLETION
 # =====================================================
@@ -305,16 +254,6 @@ async def safe_completion(
 
     raise Exception(last_error)
 
-
-# =====================================================
-# STREAM WATCHDOG
-# =====================================================
-
-async def next_chunk(iterator):
-
-    return await asyncio.to_thread(next, iterator)
-
-
 # =====================================================
 # CHAT COMPLETIONS
 # =====================================================
@@ -359,50 +298,14 @@ async def chat_completions(
 
                 has_content = False
 
-                while True:
-
-                    try:
-
-                        # watchdog للـ stream
-                        chunk = await asyncio.wait_for(
-                            next_chunk(response),
-                            timeout=STREAM_CHUNK_TIMEOUT
-                        )
-
-                    except StopIteration:
-                        break
-
-                    except asyncio.TimeoutError:
-
-                        logger.warning(
-                            f"Stream stalled | model={body.model}"
-                        )
-
-                        error_payload = {
-                            "error": {
-                                "message": "Stream timeout",
-                                "type": "stream_timeout"
-                            }
-                        }
-
-                        yield (
-                            f"data: "
-                            f"{json.dumps(error_payload)}\n\n"
-                        )
-
-                        break
+                for chunk in response:
 
                     try:
 
                         content = ""
 
-                        # حماية من ImageResponse
+                        # تجاهل image models
                         if hasattr(chunk, "images"):
-
-                            logger.warning(
-                                f"Image model detected | model={body.model}"
-                            )
-
                             continue
 
                         if (
@@ -451,7 +354,7 @@ async def chat_completions(
 
                     error_payload = {
                         "error": {
-                            "message": "Provider returned empty stream",
+                            "message": "Empty stream",
                             "type": "empty_stream"
                         }
                     }
@@ -563,7 +466,6 @@ async def chat_completions(
             detail=str(e)
         )
 
-
 # =====================================================
 # RUN
 # =====================================================