Update app.py

app.py

@@ -12,7 +12,6 @@ import logging
 
 import g4f
 from g4f.client import Client
-from g4f import Provider
 
 
 # =====================================================
@@ -32,31 +31,6 @@ API_KEY = "sk-your-secret-key"
 REQUEST_TIMEOUT = 60
 
 
-# =====================================================
-# PROVIDERS ONLY
-# لا نحدد النماذج نهائياً
-# فقط نحدد المزودين الجيدين
-# =====================================================
-
-WORKING_PROVIDERS = [
-
-    # مجاني وسريع
-    Provider.PollinationsAI,
-
-    # ممتاز لكوهير / كيمي / GPT
-    Provider.Jmuz,
-
-    # جيد لبعض نماذج GPT
-    Provider.Liaobots,
-
-    # جيد لبعض النماذج المفتوحة
-    Provider.HuggingSpace,
-
-    # DuckDuckGo AI
-    Provider.DDGS,
-]
-
-
 # =====================================================
 # FASTAPI
 # =====================================================
@@ -141,7 +115,6 @@ async def root():
 
 # =====================================================
 # MODELS
-# استرجاع النماذج الحقيقية من g4f
 # =====================================================
 
 @app.get("/v1/models")
@@ -176,65 +149,25 @@ async def get_models():
 
 # =====================================================
 # SAFE COMPLETION
-# يجرب providers فقط
-# بدون تقييد النماذج
+# لا تقييد providers
+# نترك g4f يختار تلقائياً
 # =====================================================
 
 async def safe_completion(model, messages, stream=False):
 
-    last_error = None
-
-    for provider_cls in WORKING_PROVIDERS:
-
-        provider_name = getattr(
-            provider_cls,
-            "__name__",
-            str(provider_cls)
-        )
-
-        try:
-
-            logger.info(
-                f"Trying provider={provider_name} model={model}"
-            )
-
-            client = Client(
-                provider=provider_cls
-            )
-
-            response = await asyncio.wait_for(
-                asyncio.to_thread(
-                    client.chat.completions.create,
-                    model=model,
-                    messages=messages,
-                    stream=stream
-                ),
-                timeout=REQUEST_TIMEOUT
-            )
-
-            logger.info(
-                f"Success provider={provider_name} model={model}"
-            )
-
-            return response
-
-        except asyncio.TimeoutError:
-
-            last_error = (
-                f"Timeout provider={provider_name}"
-            )
-
-            logger.warning(last_error)
+    client = Client()
 
-        except Exception as e:
-
-            last_error = str(e)
-
-            logger.warning(
-                f"Failed provider={provider_name} error={e}"
-            )
+    response = await asyncio.wait_for(
+        asyncio.to_thread(
+            client.chat.completions.create,
+            model=model,
+            messages=messages,
+            stream=stream
+        ),
+        timeout=REQUEST_TIMEOUT
+    )
 
-    raise Exception(last_error)
+    return response
 
 
 # =====================================================
@@ -269,6 +202,8 @@ async def chat_completions(
 
         async def generate_stream():
 
+            chunk_id = f"chatcmpl-{uuid.uuid4().hex}"
+
             try:
 
                 response = await safe_completion(
@@ -277,10 +212,6 @@ async def chat_completions(
                     stream=True
                 )
 
-                chunk_id = (
-                    f"chatcmpl-{uuid.uuid4().hex}"
-                )
-
                 has_content = False
 
                 for chunk in response:
@@ -340,14 +271,11 @@ async def chat_completions(
                             f"Chunk error: {chunk_error}"
                         )
 
-                # stream فارغ
                 if not has_content:
 
                     error_payload = {
                         "error": {
-                            "message": (
-                                "Provider returned empty stream"
-                            ),
+                            "message": "Provider returned empty stream",
                             "type": "empty_stream"
                         }
                     }
@@ -358,7 +286,6 @@ async def chat_completions(
                         + "\n\n"
                     )
 
-                # stop
                 final_payload = {
                     "id": chunk_id,
                     "object": "chat.completion.chunk",
@@ -381,6 +308,27 @@ async def chat_completions(
 
                 yield "data: [DONE]\n\n"
 
+            except asyncio.TimeoutError:
+
+                logger.error(
+                    f"Timeout model={body.model}"
+                )
+
+                error_payload = {
+                    "error": {
+                        "message": "Request timeout",
+                        "type": "timeout"
+                    }
+                }
+
+                yield (
+                    "data: "
+                    + json.dumps(error_payload)
+                    + "\n\n"
+                )
+
+                yield "data: [DONE]\n\n"
+
             except Exception as e:
 
                 logger.error(
@@ -470,6 +418,13 @@ async def chat_completions(
 
         })
 
+    except asyncio.TimeoutError:
+
+        raise HTTPException(
+            status_code=408,
+            detail="Request timeout"
+        )
+
     except Exception as e:
 
         logger.error(f"Chat error: {e}")