Update app.py

app.py

@@ -3,19 +3,16 @@ import json
 import time
 import logging
 from typing import Any, Dict, List, Optional, Tuple
-
-import gradio as gr
+from fastapi import FastAPI, HTTPException, Request
+from fastapi.responses import StreamingResponse, JSONResponse
+from pydantic import BaseModel
 import g4f
 
-# ========== إضافة FastAPI (3 سطر فقط) ==========
-from fastapi import FastAPI, Request, HTTPException
-from fastapi.middleware.wsgi import WSGIMiddleware
-
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger("g4f-smart-router")
 
 # =====================================================
-# COOKIES
+# COOKIES (نفس الكود لم يتغير)
 # =====================================================
 def _load_cookies_raw() -> Dict[str, Any]:
     raw_env = (os.getenv("COOKIES_JSON") or "").strip()
@@ -68,7 +65,7 @@ def load_cookies() -> str:
 COOKIE_STATUS = load_cookies()
 
 # =====================================================
-# PROVIDERS
+# PROVIDERS (نفس الكود لم يتغير)
 # =====================================================
 def get_provider(name: str):
     try:
@@ -91,7 +88,7 @@ REAL_PROVIDERS: Dict[str, Any] = {
 REAL_PROVIDERS = {k: v for k, v in REAL_PROVIDERS.items() if v}
 
 # =====================================================
-# MODELS
+# MODELS (نفس الكود لم يتغير)
 # =====================================================
 PROVIDER_MODELS_FALLBACK: Dict[str, List[str]] = {
     "Perplexity": ["sonar", "sonar-pro", "gpt-4o", "llama-3"],
@@ -106,7 +103,7 @@ PROVIDER_MODELS_FALLBACK: Dict[str, List[str]] = {
 }
 
 # =====================================================
-# MODEL DISCOVERY
+# MODEL DISCOVERY (نفس الكود لم يتغير)
 # =====================================================
 def _normalize_model_list(x: Any) -> List[str]:
     out: List[str] = []
@@ -178,33 +175,27 @@ def discover_provider_models(provider_obj: Any, provider_name: str) -> List[str]
     return uniq
 
 # =====================================================
-# STREAM CLEANER (محسّنة جداً - تحل مشاكل JSON والأكواد)
+# STREAM CLEANER (نفس الكود لم يتغير)
 # =====================================================
 def clean_stream(chunk):
     try:
-        # إذا كانت القطعة قاموساً (dict) مثل JSON
         if isinstance(chunk, dict):
-            # استخراج النص من تنسيق Perplexity
             if 'choices' in chunk and chunk['choices']:
                 delta = chunk['choices'][0].get('delta', {})
                 if 'content' in delta:
                     return delta['content']
                 if 'text' in delta:
                     return delta['text']
-            # تنسيقات أخرى
             if 'content' in chunk:
                 return chunk['content']
             if 'text' in chunk:
                 return chunk['text']
             return ""
 
-        # إذا كانت القطعة نصاً
         if isinstance(chunk, str):
-            # محاولة تفسيرها كـ JSON
             if chunk.strip().startswith("{") and chunk.strip().endswith("}"):
                 try:
                     data = json.loads(chunk)
-                    # استخراج النص من JSON
                     if 'choices' in data and data['choices']:
                         delta = data['choices'][0].get('delta', {})
                         if 'content' in delta:
@@ -216,53 +207,24 @@ def clean_stream(chunk):
                 except:
                     pass
 
-            # تنظيف علامات الترميز (للكود)
             chunk = chunk.replace('\\n', '\n').replace('\\r', '\r').replace('\\t', '    ')
             chunk = chunk.replace('\\"', '"').replace("\\'", "'")
             return chunk
 
-        # إذا كانت القطعة شيئاً آخر
         return str(chunk)
     except Exception as e:
         logger.warning(f"خطأ في clean_stream: {e}")
         return ""
 
 # =====================================================
-# UI update
-# =====================================================
-_PROVIDER_MODEL_CACHE = {}
-
-def update_models(provider_name):
-
-    pobj = REAL_PROVIDERS.get(provider_name)
-
-    if not pobj:
-        arr = ["gpt-4o"]
-    else:
-        if provider_name not in _PROVIDER_MODEL_CACHE:
-            _PROVIDER_MODEL_CACHE[provider_name] = discover_provider_models(
-                pobj,
-                provider_name
-            )
-
-        arr = _PROVIDER_MODEL_CACHE[provider_name]
-
-    return gr.update(
-        choices=arr,
-        value=arr[0]
-    )
-
-# =====================================================
-# CACHE
+# CACHE (نفس الكود لم يتغير)
 # =====================================================
 CACHE = {}
 CACHE_TS = {}
 
 def _cache_get(key):
-
     if key not in CACHE:
         return None
-
     return CACHE[key]
 
 def _cache_set(key, val):
@@ -270,10 +232,11 @@ def _cache_set(key, val):
     CACHE_TS[key] = time.time()
 
 # =====================================================
-# CHAT (محسّنة - ذاكرة أطول وfallback أفضل)
+# CHAT LOGIC (نفس الكود لم يتغير - هذا هو قلب المشروع)
 # =====================================================
-def ask(message: str, history, provider_name: str, model_name: str):
+_PROVIDER_MODEL_CACHE = {}
 
+def ask(message: str, history, provider_name: str, model_name: str):
     history = history or []
     message = (message or "").strip()
 
@@ -289,16 +252,11 @@ def ask(message: str, history, provider_name: str, model_name: str):
         yield cached
         return
 
-    # =================================================
-    # بناء الذاكرة (محسّن - يحفظ آخر 40/20 بدلاً من 16/8)
-    # =================================================
     msgs = []
 
     try:
         if history:
-            # format جديد
             if isinstance(history[0], dict):
-                # حفظ آخر 40 رسالة (بدلاً من 16)
                 for item in history[-40:]:
                     role = item.get("role")
                     content = item.get("content")
@@ -307,9 +265,7 @@ def ask(message: str, history, provider_name: str, model_name: str):
                             "role": str(role),
                             "content": str(content)
                         })
-            # format قديم
             else:
-                # حفظ آخر 20 محادثة (بدلاً من 8)
                 for item in history[-20:]:
                     if isinstance(item, (list, tuple)) and len(item) == 2:
                         u = item[0]
@@ -332,9 +288,6 @@ def ask(message: str, history, provider_name: str, model_name: str):
         "content": message
     })
 
-    # =================================================
-    # تجربة المزودين مع fallback
-    # =================================================
     fallback_providers = [
         provider_name,
         "Perplexity",
@@ -349,7 +302,6 @@ def ask(message: str, history, provider_name: str, model_name: str):
     used = []
 
     for pname in fallback_providers:
-
         if pname in used:
             continue
 
@@ -372,7 +324,6 @@ def ask(message: str, history, provider_name: str, model_name: str):
         ]
 
         for m in model_candidates[:12]:
-
             try:
                 stream = g4f.ChatCompletion.create(
                     model=m,
@@ -403,78 +354,72 @@ def ask(message: str, history, provider_name: str, model_name: str):
     yield "❌ Failed with all providers."
 
 # =====================================================
-# UI
+# FASTAPI (الجزء الجديد - بدلاً من Gradio)
 # =====================================================
-css = """
-.gradio-container{
-max-width:1200px!important;
-}
-"""
-
-providers = list(REAL_PROVIDERS.keys())
-
-default_provider = (
-    "Perplexity"
-    if "Perplexity" in providers
-    else providers[0]
-)
-
-default_models = discover_provider_models(
-    REAL_PROVIDERS[default_provider],
-    default_provider
-)
-
-with gr.Blocks(
-    theme=gr.themes.Soft(),
-    css=css
-) as demo:
 
-    gr.Markdown("# 🤖 G4F Smart Router FINAL")
-    gr.Markdown(COOKIE_STATUS)
+app = FastAPI(title="G4F API", description="G4F Smart Router API")
 
-    with gr.Row():
-
-        provider_dd = gr.Dropdown(
-            choices=providers,
-            value=default_provider,
-            label="Provider"
-        )
-
-        model_dd = gr.Dropdown(
-            choices=default_models,
-            value=default_models[0],
-            label="Model"
-        )
-
-    provider_dd.change(
-        update_models,
-        inputs=provider_dd,
-        outputs=model_dd
-    )
-
-    gr.ChatInterface(
-        fn=ask,
-        additional_inputs=[
-            provider_dd,
-            model_dd
-        ],
-        title="",
-        description="Choose provider → models update automatically."
-    )
-
-# ========== إضافة FastAPI + مفتاح (6 سطر فقط) ==========
-fastapp = FastAPI()
+# المفتاح السري
 API_KEY = os.getenv("API_KEY", "mysecretkey123")
 
-@fastapp.middleware("http")
-async def auth_middleware(request: Request, call_next):
-    if request.headers.get("Authorization") != f"Bearer {API_KEY}":
-        raise HTTPException(401, "Invalid or missing API key")
-    return await call_next(request)
-
-fastapp.mount("/", WSGIMiddleware(demo))
-
-demo.queue().launch(
-    server_name="0.0.0.0",
-    server_port=int(os.getenv("PORT", "7860"))
-)
+# نموذج البيانات للطلب
+class ChatRequest(BaseModel):
+    message: str
+    provider: str = "Perplexity"
+    model: str = "sonar"
+    history: List[Any] = []
+
+# التحقق من المفتاح
+def verify_api_key(request: Request):
+    auth = request.headers.get("Authorization")
+    if not auth or not auth.startswith("Bearer "):
+        raise HTTPException(status_code=401, detail="Missing or invalid Authorization header. Use: Bearer YOUR_KEY")
+    key = auth.replace("Bearer ", "")
+    if key != API_KEY:
+        raise HTTPException(status_code=403, detail="Invalid API key")
+
+# نقطة الصحة
+@app.get("/health")
+async def health():
+    return {"status": "ok", "cookies": COOKIE_STATUS, "providers": list(REAL_PROVIDERS.keys())}
+
+# نقطة الدردشة (غير متدفق)
+@app.post("/chat")
+async def chat(request: Request, chat_req: ChatRequest):
+    verify_api_key(request)
+    
+    full_response = ""
+    for chunk in ask(chat_req.message, chat_req.history, chat_req.provider, chat_req.model):
+        full_response = chunk
+    
+    return JSONResponse(content={"response": full_response})
+
+# نقطة الدردشة (متتدفق - Stream)
+@app.post("/chat/stream")
+async def chat_stream(request: Request, chat_req: ChatRequest):
+    verify_api_key(request)
+    
+    async def generate():
+        for chunk in ask(chat_req.message, chat_req.history, chat_req.provider, chat_req.model):
+            yield f"data: {json.dumps({'chunk': chunk})}\n\n"
+        yield "data: [DONE]\n\n"
+    
+    return StreamingResponse(generate(), media_type="text/event-stream")
+
+# نقطة الحصول على المزودين والنماذج
+@app.get("/providers")
+async def get_providers(request: Request):
+    verify_api_key(request)
+    
+    providers_info = {}
+    for pname, pobj in REAL_PROVIDERS.items():
+        if pname not in _PROVIDER_MODEL_CACHE:
+            _PROVIDER_MODEL_CACHE[pname] = discover_provider_models(pobj, pname)
+        providers_info[pname] = _PROVIDER_MODEL_CACHE[pname]
+    
+    return JSONResponse(content={"providers": providers_info})
+
+if __name__ == "__main__":
+    import uvicorn
+    port = int(os.getenv("PORT", "7860"))
+    uvicorn.run(app, host="0.0.0.0", port=port)