Update app.py

app.py

@@ -2,34 +2,39 @@ 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
+from typing import List, Optional
 import asyncio
 import json
 import time
 import uuid
-
 import g4f
-import g4f.models
+from g4f.client import Client
+from g4f.models import Model
+from g4f.providers import Provider, ProviderType
+import logging
 
 # =====================================================
-# CONFIG
+# LOGGING
 # =====================================================
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 
-API_KEY = "sk-your-secret-key"
+# =====================================================
+# CONFIG
+# =====================================================
+API_KEY = "sk-your-secret-key"  # غير هذا في الإنتاج
 
 # =====================================================
 # FASTAPI
 # =====================================================
-
 app = FastAPI(
     title="Universal AI Gateway",
-    version="3.0.0"
+    version="3.1.0"
 )
 
 # =====================================================
-# CORS
+# CORS (للسماح للواجهة بالتواصل)
 # =====================================================
-
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -41,7 +46,6 @@ app.add_middleware(
 # =====================================================
 # MODELS
 # =====================================================
-
 class Message(BaseModel):
     role: str
     content: str
@@ -50,31 +54,25 @@ class ChatRequest(BaseModel):
     model: str
     messages: List[Message]
     stream: bool = False
-    temperature: float = 0.7
-    max_tokens: int = 4096
+    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:
         raise HTTPException(
             status_code=401,
             detail="Missing Authorization Header"
         )
-
     if not auth.startswith("Bearer "):
         raise HTTPException(
             status_code=401,
             detail="Invalid Authorization Format"
         )
-
     token = auth.replace("Bearer ", "")
-
     if token != API_KEY:
         raise HTTPException(
             status_code=403,
@@ -82,186 +80,191 @@ def verify_api_key(req: Request):
         )
 
 # =====================================================
-# PROVIDERS
+# PROVIDERS - قائمة المزودين العاملين حالياً
 # =====================================================
-
-def get_providers():
-
+def get_working_providers():
+    """إرجاع قائمة المزودين المتاحين في الإصدار الحالي من g4f"""
     providers = []
-
-    if hasattr(g4f.Provider, "DuckDuckGo"):
-        providers.append(g4f.Provider.DuckDuckGo)
-
-    if hasattr(g4f.Provider, "Blackbox"):
-        providers.append(g4f.Provider.Blackbox)
-
-    if hasattr(g4f.Provider, "Free2GPT"):
-        providers.append(g4f.Provider.Free2GPT)
-
-    return providers
+    
+    # المزودين المعروفين بأنهم يعملون حالياً
+    try:
+        # محاولة استيراد المزودين المتاحين
+        from g4f.providers import (
+            Blackbox,
+            DuckDuckGo,
+            Free2GPT,
+            Liaobots,
+            Copilot,
+            Gemini,
+            OpenaiChat,
+            DeepAi
+        )
+        
+        # إضافة المزودين الذين يعملون عادةً
+        providers = [
+            DuckDuckGo,
+            Blackbox, 
+            Free2GPT,
+            Liaobots,
+            Copilot,
+            Gemini,
+            OpenaiChat,
+            DeepAi
+        ]
+    except ImportError:
+        logger.warning("بعض المزودين غير متاحين، استخدام المزودين الأساسيين")
+        # محاولة الحصول على المزودين من g4f.Provider مباشرة
+        if hasattr(g4f.Provider, 'DuckDuckGo'):
+            providers.append(g4f.Provider.DuckDuckGo)
+        if hasattr(g4f.Provider, 'Blackbox'):
+            providers.append(g4f.Provider.Blackbox)
+        if hasattr(g4f.Provider, 'Free2GPT'):
+            providers.append(g4f.Provider.Free2GPT)
+        if hasattr(g4f.Provider, 'Liaobots'):
+            providers.append(g4f.Provider.Liaobots)
+    
+    return providers if providers else [g4f.Provider.Auto]
 
 # =====================================================
 # ROOT
 # =====================================================
-
 @app.get("/")
 async def root():
-
     return {
         "status": "online",
         "service": "Universal AI Gateway",
-        "version": "3.0.0"
+        "version": "3.1.0"
     }
 
 # =====================================================
-# MODELS
+# MODELS LIST (نقطة نهاية متوافقة مع OpenAI)
 # =====================================================
-
 @app.get("/v1/models")
-async def models():
-
-    data = []
-
+async def get_models():
+    """إرجاع قائمة النماذج المتاحة"""
+    models_list = []
+    
     try:
-
-        all_models = list(g4f.models._all_models)
-
-        for model_name in all_models:
-
-            data.append({
-                "id": str(model_name),
-                "object": "model",
-                "created": int(time.time()),
-                "owned_by": "g4f"
-            })
-
-    except Exception:
-
-        fallback = [
-            "gpt-4o-mini",
-            "gpt-4",
-            "claude-3-haiku",
-            "llama-3.1-70b",
-            "mixtral-8x7b"
+        # محاولة الحصول على النماذج من g4f
+        if hasattr(g4f.models, '_all_models'):
+            for model in list(g4f.models._all_models)[:30]:  # حد أقصى 30 نموذج
+                models_list.append({
+                    "id": str(model),
+                    "object": "model",
+                    "created": int(time.time()),
+                    "owned_by": "g4f"
+                })
+    except Exception as e:
+        logger.error(f"خطأ في جلب النماذج: {e}")
+    
+    # نماذج احتياطية إذا فشل الجلب
+    if not models_list:
+        fallback_models = [
+            "gpt-4o-mini", "gpt-4o", "gpt-4", "gpt-3.5-turbo",
+            "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b",
+            "gemini-flash", "deepseek-chat", "blackboxai"
         ]
-
-        for model_name in fallback:
-
-            data.append({
+        for model_name in fallback_models:
+            models_list.append({
                 "id": model_name,
                 "object": "model",
                 "created": int(time.time()),
                 "owned_by": "g4f"
             })
-
+    
     return {
         "object": "list",
-        "data": data
+        "data": models_list
     }
 
 # =====================================================
-# CHAT COMPLETIONS
+# CHAT COMPLETIONS - الطريقة المحدثة باستخدام Client
 # =====================================================
-
 @app.post("/v1/chat/completions")
 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"طلب: model={body.model}, messages={len(messages)}, stream={body.stream}")
+    
     # =================================================
-    # STREAMING
+    # وضع الدفق (Streaming) - للتجاوب الفوري
     # =================================================
-
     if body.stream:
-
         async def generate_stream():
-
-            providers = get_providers()
-
+            providers_list = get_working_providers()
             last_error = None
-
-            for provider in providers:
-
+            response_text = ""
+            chunk_id = f"chatcmpl-{uuid.uuid4().hex}"
+            
+            for provider in providers_list:
                 try:
-
-                    response = await asyncio.to_thread(
-                        g4f.ChatCompletion.create,
+                    # استخدام الطريقة الحديثة مع Client
+                    client = Client(provider=provider)
+                    
+                    stream_response = await asyncio.to_thread(
+                        client.chat.completions.create,
                         model=body.model,
-                        provider=provider,
                         messages=messages,
                         stream=True
                     )
-
-                    for chunk in response:
-
-                        if chunk:
-
+                    
+                    for chunk in stream_response:
+                        if chunk.choices and chunk.choices[0].delta.content:
+                            content = chunk.choices[0].delta.content
+                            response_text += content
                             payload = {
-                                "id": f"chatcmpl-{uuid.uuid4().hex}",
+                                "id": chunk_id,
                                 "object": "chat.completion.chunk",
                                 "created": int(time.time()),
                                 "model": body.model,
-                                "choices": [
-                                    {
-                                        "index": 0,
-                                        "delta": {
-                                            "content": str(chunk)
-                                        },
-                                        "finish_reason": None
-                                    }
-                                ]
+                                "choices": [{
+                                    "index": 0,
+                                    "delta": {"content": content},
+                                    "finish_reason": None
+                                }]
                             }
-
                             yield f"data: {json.dumps(payload)}\n\n"
-
-                            await asyncio.sleep(0)
-
-                    done_payload = {
-                        "id": f"chatcmpl-{uuid.uuid4().hex}",
+                            await asyncio.sleep(0.01)
+                    
+                    # إرسال إشارة الانتهاء
+                    final_payload = {
+                        "id": chunk_id,
                         "object": "chat.completion.chunk",
                         "created": int(time.time()),
                         "model": body.model,
-                        "choices": [
-                            {
-                                "index": 0,
-                                "delta": {},
-                                "finish_reason": "stop"
-                            }
-                        ]
+                        "choices": [{
+                            "index": 0,
+                            "delta": {},
+                            "finish_reason": "stop"
+                        }]
                     }
-
-                    yield f"data: {json.dumps(done_payload)}\n\n"
-
+                    yield f"data: {json.dumps(final_payload)}\n\n"
                     yield "data: [DONE]\n\n"
-
                     return
-
+                    
                 except Exception as e:
-
                     last_error = str(e)
-
+                    logger.warning(f"المزود {provider.__name__ if hasattr(provider, '__name__') else provider} فشل: {e}")
                     continue
-
+            
+            # إذا فشلت كل المزودين
             error_payload = {
                 "error": {
                     "message": last_error or "All providers failed",
                     "type": "server_error"
                 }
             }
-
             yield f"data: {json.dumps(error_payload)}\n\n"
-
+        
         return StreamingResponse(
             generate_stream(),
             media_type="text/event-stream",
@@ -271,67 +274,154 @@ async def chat_completions(
                 "X-Accel-Buffering": "no"
             }
         )
-
+    
     # =================================================
-    # NORMAL RESPONSE
+    # الوضع العادي (بدون دفق)
     # =================================================
-
-    providers = get_providers()
-
+    providers_list = get_working_providers()
     last_error = None
-
-    for provider in providers:
-
+    
+    for provider in providers_list:
         try:
-
+            logger.info(f"محاولة استخدام المزود: {provider.__name__ if hasattr(provider, '__name__') else provider}")
+            
+            # الطريقة الحديثة باستخدام Client
+            client = Client(provider=provider)
             response = await asyncio.to_thread(
-                g4f.ChatCompletion.create,
+                client.chat.completions.create,
                 model=body.model,
-                provider=provider,
                 messages=messages
             )
-
+            
+            assistant_message = response.choices[0].message.content
+            
             return JSONResponse({
                 "id": f"chatcmpl-{uuid.uuid4().hex}",
                 "object": "chat.completion",
                 "created": int(time.time()),
                 "model": body.model,
-                "choices": [
-                    {
-                        "index": 0,
-                        "message": {
-                            "role": "assistant",
-                            "content": str(response)
-                        },
-                        "finish_reason": "stop"
-                    }
-                ],
+                "choices": [{
+                    "index": 0,
+                    "message": {
+                        "role": "assistant",
+                        "content": assistant_message
+                    },
+                    "finish_reason": "stop"
+                }],
                 "usage": {
                     "prompt_tokens": 0,
                     "completion_tokens": 0,
                     "total_tokens": 0
                 }
             })
-
+            
         except Exception as e:
-
             last_error = str(e)
-
+            logger.warning(f"المزود فشل: {e}")
             continue
-
+    
+    # إذا وصلنا إلى هنا، جميع المزودين فشلوا
     raise HTTPException(
         status_code=500,
-        detail=last_error or "All providers failed"
+        detail=last_error or "All providers failed. Please check your internet connection and try again."
     )
 
 # =====================================================
-# RUN
+# نقطة نهاية إضافية للاختبار - واجهة بسيطة
 # =====================================================
+@app.get("/test")
+async def test_ui():
+    """صفحة HTML بسيطة لاختبار البوت"""
+    return """
+    <!DOCTYPE html>
+    <html>
+    <head>
+        <title>اختبار البوت</title>
+        <meta charset="utf-8">
+        <style>
+            body { font-family: Arial; max-width: 800px; margin: 50px auto; padding: 20px; }
+            #chat { border: 1px solid #ccc; height: 400px; overflow-y: auto; padding: 10px; margin-bottom: 10px; }
+            .user { background: #e3f2fd; padding: 8px; margin: 5px; border-radius: 10px; }
+            .bot { background: #f5f5f5; padding: 8px; margin: 5px; border-radius: 10px; }
+            #input { width: 80%; padding: 10px; }
+            #send { padding: 10px 20px; }
+        </style>
+    </head>
+    <body>
+        <h1>اختبار البوت</h1>
+        <div id="chat"></div>
+        <input type="text" id="input" placeholder="اكتب رسالتك...">
+        <button id="send">إرسال</button>
+        
+        <script>
+            const API_KEY = "sk-your-secret-key";
+            
+            async function sendMessage() {
+                const input = document.getElementById('input');
+                const message = input.value.trim();
+                if (!message) return;
+                
+                // عرض رسالة المستخدم
+                const chatDiv = document.getElementById('chat');
+                const userMsg = document.createElement('div');
+                userMsg.className = 'user';
+                userMsg.textContent = 'أنت: ' + message;
+                chatDiv.appendChild(userMsg);
+                
+                // عرض مؤشر "يكتب..."
+                const botMsg = document.createElement('div');
+                botMsg.className = 'bot';
+                botMsg.textContent = 'البوت: جاري التفكير...';
+                chatDiv.appendChild(botMsg);
+                chatDiv.scrollTop = chatDiv.scrollHeight;
+                
+                input.value = '';
+                
+                try {
+                    const response = await fetch('/v1/chat/completions', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                            'Authorization': 'Bearer ' + API_KEY
+                        },
+                        body: JSON.stringify({
+                            model: 'gpt-4o-mini',
+                            messages: [{role: 'user', content: message}],
+                            stream: false
+                        })
+                    });
+                    
+                    const data = await response.json();
+                    botMsg.textContent = 'البوت: ' + data.choices[0].message.content;
+                } catch (err) {
+                    botMsg.textContent = 'البوت: حدث خطأ: ' + err.message;
+                }
+                chatDiv.scrollTop = chatDiv.scrollHeight;
+            }
+            
+            document.getElementById('send').onclick = sendMessage;
+            document.getElementById('input').onkeypress = (e) => {
+                if (e.key === 'Enter') sendMessage();
+            };
+        </script>
+    </body>
+    </html>
+    """
 
+# =====================================================
+# RUN
+# =====================================================
 if __name__ == "__main__":
-
     import uvicorn
-
+    print("""
+    ╔════════════════════════════════════════════════╗
+    ║     AI Gateway - تم التشغيل بنجاح! 🚀          ║
+    ╠════════════════════════════════════════════════╣
+    ║  الواجهة التفاعلية: http://localhost:7860/test║
+    ║  API: http://localhost:7860/v1/chat/completions║
+    ║  المفتاح: sk-your-secret-key                   ║
+    ╚════════════════════════════════════════════════╝
+    """)
     uvicorn.run(
         app,
         host="0.0.0.0",