Update app.py

app.py

@@ -2,16 +2,23 @@ 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
-
+from typing import List, Optional, AsyncGenerator
 import json
 import time
 import uuid
 import logging
+import asyncio
 
+# استيراد g4f بالطريقة الصحيحة
 import g4f
-from g4f.client import Client
-
+from g4f import ChatCompletion
+from g4f.Provider import (
+    Bing,
+    OpenaiChat,
+    Gemini,
+    You,
+    AIChat
+)
 
 # =====================================================
 # LOGGING
@@ -20,13 +27,11 @@ from g4f.client import Client
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-
 # =====================================================
 # CONFIG
 # =====================================================
 
-API_KEY = "sk-your-secret-key"
-
+API_KEY = "sk-your-secret-key"  # غيّر هذا
 
 # =====================================================
 # FASTAPI
@@ -37,7 +42,6 @@ app = FastAPI(
     version="5.3.0"
 )
 
-
 # =====================================================
 # CORS
 # =====================================================
@@ -50,7 +54,6 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-
 # =====================================================
 # MODELS
 # =====================================================
@@ -59,92 +62,64 @@ class Message(BaseModel):
     role: str
     content: str
 
-
 class ChatRequest(BaseModel):
-    model: str
+    model: str = "gpt-3.5-turbo"
     messages: List[Message]
     stream: bool = False
     temperature: Optional[float] = 0.7
     max_tokens: Optional[int] = 4096
 
-
 # =====================================================
 # AUTH
 # =====================================================
 
 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
 
-
 # =====================================================
 # ROOT
 # =====================================================
 
 @app.get("/")
 async def root():
-
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "5.3.0"
+        "version": "5.3.0",
+        "providers": ["Bing", "OpenaiChat", "Gemini", "You"]
     }
 
-
 # =====================================================
 # MODELS
 # =====================================================
 
 @app.get("/v1/models")
 async def get_models():
-
-    models_data = []
-
-    try:
-
-        if hasattr(g4f.models, "_all_models"):
-
-            all_models = list(g4f.models._all_models)
-
-            for model in all_models:
-
-                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 = [
+        {"id": "gpt-3.5-turbo", "object": "model", "owned_by": "g4f"},
+        {"id": "gpt-4", "object": "model", "owned_by": "g4f"},
+        {"id": "gpt-4o-mini", "object": "model", "owned_by": "g4f"},
+        {"id": "gemini", "object": "model", "owned_by": "g4f"},
+    ]
+    
     return {
         "object": "list",
         "data": models_data
     }
 
-
 # =====================================================
 # CHAT COMPLETIONS
 # =====================================================
@@ -154,64 +129,37 @@ 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}")
+    logger.info(f"Messages: {messages}")
+    
     # =================================================
     # STREAMING
     # =================================================
-
+    
     if body.stream:
-
-        def generate_stream():
-
-            chunk_id = f"chatcmpl-{uuid.uuid4().hex}"
-
+        async def generate_stream() -> AsyncGenerator[str, None]:
+            chunk_id = f"chatcmpl-{uuid.uuid4().hex[:8]}"
+            
             try:
-
-                client = Client()
-
-                response = client.chat.completions.create(
+                # استخدام ChatCompletion.create مع stream=True
+                response = await ChatCompletion.create_async(
                     model=body.model,
                     messages=messages,
-                    stream=True
+                    stream=True,
+                    provider=Bing  # جرب Bing أو OpenaiChat
                 )
-
-                has_content = False
-
-                for chunk in response:
-
-                    try:
-
-                        content = ""
-
-                        if (
-                            hasattr(chunk, "choices")
-                            and chunk.choices
-                            and len(chunk.choices) > 0
-                            and hasattr(chunk.choices[0], "delta")
-                            and chunk.choices[0].delta
-                            and chunk.choices[0].delta.content
-                        ):
-                            content = chunk.choices[0].delta.content
-
-                        if not content:
-                            continue
-
-                        has_content = True
-
+                
+                async for chunk in response:
+                    if chunk:
                         payload = {
                             "id": chunk_id,
                             "object": "chat.completion.chunk",
@@ -220,44 +168,14 @@ async def chat_completions(
                             "choices": [
                                 {
                                     "index": 0,
-                                    "delta": {
-                                        "content": content
-                                    },
+                                    "delta": {"content": chunk},
                                     "finish_reason": None
                                 }
                             ]
                         }
-
-                        yield (
-                            "data: "
-                            + json.dumps(
-                                payload,
-                                ensure_ascii=False
-                            )
-                            + "\n\n"
-                        )
-
-                    except Exception as 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 (
-                        "data: "
-                        + json.dumps(error_payload)
-                        + "\n\n"
-                    )
-
+                        yield f"data: {json.dumps(payload, ensure_ascii=False)}\n\n"
+                
+                # إرسال إشارة النهاية
                 final_payload = {
                     "id": chunk_id,
                     "object": "chat.completion.chunk",
@@ -271,124 +189,73 @@ async def chat_completions(
                         }
                     ]
                 }
-
-                yield (
-                    "data: "
-                    + json.dumps(final_payload)
-                    + "\n\n"
-                )
-
+                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"
-                    }
-                }
-
-                yield (
-                    "data: "
-                    + json.dumps(error_payload)
-                    + "\n\n"
-                )
-
+                logger.error(f"Streaming error: {e}", exc_info=True)
+                error_msg = {"error": {"message": str(e), "type": "stream_error"}}
+                yield f"data: {json.dumps(error_msg)}\n\n"
                 yield "data: [DONE]\n\n"
-
+        
         return StreamingResponse(
             generate_stream(),
             media_type="text/event-stream",
             headers={
                 "Cache-Control": "no-cache",
                 "Connection": "keep-alive",
-                "X-Accel-Buffering": "no"
+                "Access-Control-Allow-Origin": "*"
             }
         )
-
+    
     # =================================================
     # NORMAL RESPONSE
     # =================================================
-
+    
     try:
-
-        client = Client()
-
-        response = client.chat.completions.create(
+        # استخدام ChatCompletion.create_async
+        response = await ChatCompletion.create_async(
             model=body.model,
             messages=messages,
-            stream=False
+            stream=False,
+            provider=Bing  # جرب مزوداً مختلفاً إذا فشل
         )
-
-        assistant_message = ""
-
-        try:
-
-            assistant_message = (
-                response
-                .choices[0]
-                .message
-                .content
-            )
-
-        except Exception:
-
-            assistant_message = str(response)
-
+        
         return JSONResponse({
-
-            "id": (
-                f"chatcmpl-{uuid.uuid4().hex}"
-            ),
-
+            "id": f"chatcmpl-{uuid.uuid4().hex[:8]}",
             "object": "chat.completion",
-
             "created": int(time.time()),
-
             "model": body.model,
-
             "choices": [
                 {
                     "index": 0,
                     "message": {
                         "role": "assistant",
-                        "content": assistant_message
+                        "content": response
                     },
                     "finish_reason": "stop"
                 }
             ],
-
             "usage": {
                 "prompt_tokens": 0,
                 "completion_tokens": 0,
                 "total_tokens": 0
             }
-
         })
-
+        
     except Exception as e:
-
-        logger.error(f"Chat error: {e}")
-
+        logger.error(f"Chat error: {e}", exc_info=True)
         raise HTTPException(
             status_code=500,
-            detail=str(e)
+            detail=f"Provider error: {str(e)}"
         )
 
-
 # =====================================================
 # RUN
 # =====================================================
 
 if __name__ == "__main__":
-
     import uvicorn
-
     uvicorn.run(
         app,
         host="0.0.0.0",