Update main.py

main.py

@@ -65,7 +65,6 @@ class AsyncBrowserThread(threading.Thread):
             ],
         )
 
-        # ── Context دائم: cookies تُحفظ بين الـ requests ─────────
         self.persistent_context = await self.browser.new_context(
             user_agent=(
                 "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
@@ -78,82 +77,55 @@ class AsyncBrowserThread(threading.Thread):
             "Object.defineProperty(navigator, 'webdriver', {get: () => undefined})"
         )
 
-        # ── قبول شروط duck.ai مرة واحدة عند الإقلاع ─────────────
+        # قبول الشروط مرة واحدة عند الإقلاع
         setup_page = await self.persistent_context.new_page()
         try:
-            print("[SERVER] Opening duck.ai for first-time setup...")
+            print("[SERVER] Opening duck.ai for setup...")
             await setup_page.goto(
                 "https://duckduckgo.com/aichat", wait_until="domcontentloaded"
             )
             await asyncio.sleep(5)
-
-            # زر "Agree and Continue" من الصورة الحقيقية
             agree_btn = setup_page.locator('button:has-text("Agree and Continue")')
             await agree_btn.wait_for(state="visible", timeout=12000)
             await agree_btn.click()
-            print("[SERVER] Duck.ai terms accepted ✓")
+            print("[SERVER] Terms accepted ✓")
             await asyncio.sleep(3)
-
-            # انتظر ظهور صندوق الكتابة = الموقع جاهز
             await setup_page.wait_for_selector(
                 'textarea[name="user-prompt"]', timeout=20000
             )
-            print("[SERVER] Duck.ai chat interface ready ✓")
-
+            print("[SERVER] Interface ready ✓")
         except Exception as e:
-            print(f"[SERVER] Setup note (non-fatal): {e}")
+            print(f"[SERVER] Setup note: {e}")
         finally:
             await setup_page.close()
 
-    # ──────────────────────────────────────────────────────────────
-    # الدالة الرئيسية: إرسال prompt واستقبال الرد
-    # ──────────────────────────────────────────────────────────────
     async def _chat(self, model_label: str, prompt: str) -> str:
-        # كل request يأخذ page منفصلة من نفس الـ context المحفوظ
         page = await self.persistent_context.new_page()
-
         try:
             page.set_default_timeout(120000)
 
-            # ── 1. فتح صفحة جديدة نظيفة ───────────────────────────
+            # ── 1. فتح صفحة جديدة ──────────────────────────────────
             await page.goto(
                 "https://duckduckgo.com/aichat", wait_until="domcontentloaded"
             )
             await asyncio.sleep(3)
 
-            # ── 2. إغلاق أي popup/banner إضافي ────────────────────
-            # Agree and Continue إن ظهر مجدداً (احتياط)
-            try:
-                agree_btn = page.locator('button:has-text("Agree and Continue")')
-                if await agree_btn.count() > 0:
-                    is_visible = await agree_btn.first.is_visible()
-                    if is_visible:
-                        await agree_btn.first.click()
-                        print("[DUCK] Terms re-accepted ✓")
-                        await asyncio.sleep(2)
-            except Exception:
-                pass
-
-            # إغلاق إشعار PDF
+            # ── 2. قبول Popup احتياطي ──────────────────────────────
             try:
-                close_btn = page.locator(
-                    'button.XkSxBJ8ofSQsZmGZs6qx, '
-                    'li.HmVD0odzmaobZhTx3jzd button[aria-label="Close"], '
-                    'button[aria-label="Close"]'
-                )
-                if await close_btn.count() > 0:
-                    await close_btn.first.click()
-                    await asyncio.sleep(1)
+                agree = page.locator('button:has-text("Agree and Continue")')
+                if await agree.count() > 0 and await agree.first.is_visible():
+                    await agree.first.click()
+                    await asyncio.sleep(2)
             except Exception:
                 pass
 
-            # ── 3. انتظار صندوق الكتابة ────────────────────────────
+            # ── 3. انتظار textarea ─────────────────────────────────
             await page.wait_for_selector(
                 'textarea[name="user-prompt"]', timeout=30000
             )
             print("[DUCK] Input ready ✓")
 
-            # ── 4. تغيير النموذج إذا لزم ───────────────────────────
+            # ── 4. تغيير النموذج ───────────────────────────────────
             try:
                 model_btn    = page.locator('button[data-testid="model-select-button"]')
                 current_text = await model_btn.inner_text()
@@ -161,7 +133,7 @@ class AsyncBrowserThread(threading.Thread):
 
                 if model_label.lower() not in current_text.lower():
                     await model_btn.click()
-                    await asyncio.sleep(1.5)
+                    await asyncio.sleep(2)
 
                     option = page.locator(
                         f"li:has-text('{model_label}'), "
@@ -170,24 +142,59 @@ class AsyncBrowserThread(threading.Thread):
                     )
                     if await option.count() > 0:
                         await option.first.click()
-                        await asyncio.sleep(1)
                         print(f"[DUCK] Model → {model_label} ✓")
                     else:
                         await page.keyboard.press("Escape")
-                        print(f"[DUCK] Model '{model_label}' not found, using default")
+                        print(f"[DUCK] Model not found, using default")
+
+                    # انتظر إعادة تحميل الـ textarea بعد تغيير النموذج
+                    await asyncio.sleep(2)
+                    await page.wait_for_selector(
+                        'textarea[name="user-prompt"]', timeout=15000
+                    )
             except Exception as e:
                 print(f"[DUCK] Model select (non-fatal): {e}")
 
-            # ── 5. كتابة وإرسال الرسالة ────────────────────────────
+            # ── 5. إرسال الرسالة بـ JavaScript مباشرة ─────────────
+            # هذا يتجاوز مشكلة زر Send الـ disabled
             textarea = page.locator('textarea[name="user-prompt"]')
             await textarea.click()
-            await textarea.fill(prompt)
             await asyncio.sleep(0.5)
 
-            send_btn = page.locator('button[type="submit"][aria-label="Send"]')
-            await send_btn.wait_for(state="enabled", timeout=10000)
-            await send_btn.click()
-            print(f"[DUCK] Sent ({len(prompt)} chars) ✓")
+            # استخدام JavaScript لضبط القيمة وإطلاق الأحداث
+            await page.evaluate("""
+                (text) => {
+                    const ta = document.querySelector('textarea[name="user-prompt"]');
+                    if (!ta) return;
+                    // React/Vue يحتاج nativeInputValueSetter
+                    const nativeSetter = Object.getOwnPropertyDescriptor(
+                        window.HTMLTextAreaElement.prototype, 'value'
+                    ).set;
+                    nativeSetter.call(ta, text);
+                    ta.dispatchEvent(new Event('input', { bubbles: true }));
+                    ta.dispatchEvent(new Event('change', { bubbles: true }));
+                }
+            """, prompt)
+            await asyncio.sleep(1)
+
+            # انتظر أن يصبح زر Send enabled
+            send_enabled = False
+            for _ in range(10):
+                disabled = await page.locator(
+                    'button[type="submit"][aria-label="Send"]'
+                ).get_attribute("disabled")
+                if disabled is None:
+                    send_enabled = True
+                    break
+                await asyncio.sleep(0.5)
+
+            if send_enabled:
+                await page.locator('button[type="submit"][aria-label="Send"]').click()
+                print(f"[DUCK] Sent via button ✓ ({len(prompt)} chars)")
+            else:
+                # fallback: Enter من لوحة المفاتيح
+                await textarea.press("Enter")
+                print(f"[DUCK] Sent via Enter ✓ ({len(prompt)} chars)")
 
             # ── 6. انتظار بدء الرد ────────────────────────────────
             await asyncio.sleep(3)
@@ -196,59 +203,56 @@ class AsyncBrowserThread(threading.Thread):
                 await stop_btn.wait_for(state="visible", timeout=20000)
                 print("[DUCK] Response started ✓")
             except Exception:
-                print("[DUCK] Stop button not detected, continuing...")
+                print("[DUCK] Stop btn not visible, continuing...")
 
             # ── 7. انتظار اكتمال الرد ─────────────────────────────
-            # الرد اكت��ل = زر "Stop generating" اختفى أو أصبح disabled
             max_wait = 120
             elapsed  = 0
             while elapsed < max_wait:
                 await asyncio.sleep(2)
                 elapsed += 2
-                stop_active = await page.locator(
+                still_running = await page.locator(
                     'button[aria-label="Stop generating"]:not([disabled])'
                 ).count()
-                if stop_active == 0:
-                    print(f"[DUCK] Response complete (~{elapsed}s) ✓")
+                if still_running == 0:
+                    print(f"[DUCK] Done after ~{elapsed}s ✓")
                     break
 
             await asyncio.sleep(1.5)
 
-            # ── 8. استخراج النص ────────────────────────────────────
+            # ── 8. استخراج الرد ───────────────────────────────────
             response_text = await page.evaluate("""
                 () => {
-                    // طريقة 1: article elements
+                    // طريقة 1: article
                     const articles = document.querySelectorAll('article');
                     if (articles.length > 0) {
                         return articles[articles.length - 1].innerText.trim();
                     }
-
-                    // طريقة 2: divs تحتوي على "message" في class
+                    // طريقة 2: class يحتوي message
                     const msgDivs = document.querySelectorAll(
                         '[class*="message"]:not([class*="user"])' +
                         ':not([class*="User"]):not([class*="input"])'
                     );
                     if (msgDivs.length > 0) {
-                        const textDivs = [...msgDivs].filter(el =>
+                        const valid = [...msgDivs].filter(el =>
                             el.innerText &&
                             el.innerText.trim().length > 20 &&
                             !el.querySelector('textarea')
                         );
-                        if (textDivs.length > 0) {
-                            return textDivs[textDivs.length - 1].innerText.trim();
+                        if (valid.length > 0) {
+                            return valid[valid.length - 1].innerText.trim();
                         }
                     }
-
-                    // طريقة 3: أطول div بدون textarea
-                    const allDivs = [...document.querySelectorAll('div')].filter(el =>
+                    // طريقة 3: أطول div
+                    const divs = [...document.querySelectorAll('div')].filter(el =>
                         el.children.length < 10 &&
                         el.innerText &&
                         el.innerText.trim().length > 50 &&
                         !el.querySelector('textarea') &&
                         !el.querySelector('button[type="submit"]')
                     );
-                    if (allDivs.length > 0) {
-                        return allDivs.sort(
+                    if (divs.length > 0) {
+                        return divs.sort(
                             (a, b) => b.innerText.length - a.innerText.length
                         )[0].innerText.trim();
                     }
@@ -256,15 +260,13 @@ class AsyncBrowserThread(threading.Thread):
                 }
             """)
 
-            # ── 9. fallback إذا كان النص فارغاً ───────────────────
+            # fallback
             if not response_text or len(response_text.strip()) < 10:
                 await asyncio.sleep(5)
                 response_text = await page.evaluate("""
                     () => {
-                        const articles = document.querySelectorAll('article');
-                        if (articles.length > 0) {
-                            return articles[articles.length - 1].innerText.trim();
-                        }
+                        const arts = document.querySelectorAll('article');
+                        if (arts.length > 0) return arts[arts.length-1].innerText.trim();
                         return document.body.innerText.slice(0, 5000);
                     }
                 """)
@@ -278,10 +280,9 @@ class AsyncBrowserThread(threading.Thread):
         finally:
             await page.close()
 
-    # ──────────────────────────────────────────────────────────────
     def process(self, model_label: str, prompt: str) -> str:
         if not self.ready_event.wait(timeout=120):
-            raise RuntimeError("Browser not ready after 120s")
+            raise RuntimeError("Browser not ready")
         future = asyncio.run_coroutine_threadsafe(
             self._chat(model_label, prompt), self.loop
         )
@@ -359,8 +360,7 @@ def _parse_tool_calls(text: str):
 
 
 def _auth(request: Request) -> bool:
-    token = request.headers.get("authorization", "").replace("Bearer ", "").strip()
-    return token == API_SECRET_KEY
+    return request.headers.get("authorization", "").replace("Bearer ", "").strip() == API_SECRET_KEY
 
 
 def _get_model_label(model: str) -> str:
@@ -373,20 +373,16 @@ def _make_completion(start_time, model, text, messages, tools=None):
     tc = _parse_tool_calls(text) if tools else None
     if tc:
         return {
-            "id":      f"chatcmpl-{uuid.uuid4().hex[:29]}",
-            "object":  "chat.completion",
-            "created": int(start_time),
-            "model":   model,
+            "id": f"chatcmpl-{uuid.uuid4().hex[:29]}", "object": "chat.completion",
+            "created": int(start_time), "model": model,
             "choices": [{"index": 0, "message": {
                 "role": "assistant", "content": None, "tool_calls": tc
             }, "finish_reason": "tool_calls"}],
             "usage": {"prompt_tokens": p, "completion_tokens": c, "total_tokens": p + c},
         }
     return {
-        "id":      f"chatcmpl-{uuid.uuid4().hex[:29]}",
-        "object":  "chat.completion",
-        "created": int(start_time),
-        "model":   model,
+        "id": f"chatcmpl-{uuid.uuid4().hex[:29]}", "object": "chat.completion",
+        "created": int(start_time), "model": model,
         "choices": [{"index": 0, "message": {
             "role": "assistant", "content": text
         }, "finish_reason": "stop"}],
@@ -406,10 +402,8 @@ async def chat_completions(request: Request):
         data = await request.json()
     except Exception:
         return JSONResponse(status_code=400, content={"error": {"message": "Invalid JSON"}})
-
     if not _auth(request):
         return JSONResponse(status_code=401, content={"error": {"message": "Invalid API Key"}})
-
     messages = data.get("messages", [])
     if not messages:
         return JSONResponse(status_code=400, content={"error": {"message": "messages required"}})
@@ -421,7 +415,6 @@ async def chat_completions(request: Request):
     prompt      = _build_prompt(messages)
 
     print(f"[API] /v1/chat/completions → {model} ({model_label})")
-
     try:
         text = await asyncio.get_event_loop().run_in_executor(
             None, browser_engine.process, model_label, prompt
@@ -438,7 +431,6 @@ async def responses(request: Request):
         data = await request.json()
     except Exception:
         return JSONResponse(status_code=400, content={"error": {"message": "Invalid JSON"}})
-
     if not _auth(request):
         return JSONResponse(status_code=401, content={"error": {"message": "Invalid API Key"}})
 
@@ -449,7 +441,6 @@ async def responses(request: Request):
         messages = input_data
     else:
         messages = data.get("messages", [])
-
     if not messages:
         return JSONResponse(status_code=400, content={"error": {"message": "input required"}})
 
@@ -464,45 +455,30 @@ async def responses(request: Request):
     prompt      = _build_prompt(messages)
 
     print(f"[API] /v1/responses → {model} ({model_label})")
-
     try:
         text = await asyncio.get_event_loop().run_in_executor(
             None, browser_engine.process, model_label, prompt
         )
-
         p  = sum(len(_extract_content(m).split()) for m in messages)
         c  = len(text.split())
         tc = _parse_tool_calls(text) if tools else None
-
         if tc:
             return {
-                "id":         f"resp-{uuid.uuid4().hex[:29]}",
-                "object":     "response",
-                "created_at": int(start_time),
-                "model":      model,
-                "status":     "completed",
-                "output": [{
-                    "type":      "function_call",
-                    "id":        t["id"],
-                    "call_id":   t["id"],
-                    "name":      t["function"]["name"],
-                    "arguments": t["function"]["arguments"],
-                    "status":    "completed",
-                } for t in tc],
+                "id": f"resp-{uuid.uuid4().hex[:29]}", "object": "response",
+                "created_at": int(start_time), "model": model, "status": "completed",
+                "output": [{"type": "function_call", "id": t["id"], "call_id": t["id"],
+                            "name": t["function"]["name"],
+                            "arguments": t["function"]["arguments"],
+                            "status": "completed"} for t in tc],
                 "usage": {"input_tokens": p, "output_tokens": c, "total_tokens": p + c},
             }
-
         return {
-            "id":         f"resp-{uuid.uuid4().hex[:29]}",
-            "object":     "response",
-            "created_at": int(start_time),
-            "model":      model,
-            "status":     "completed",
+            "id": f"resp-{uuid.uuid4().hex[:29]}", "object": "response",
+            "created_at": int(start_time), "model": model, "status": "completed",
             "output": [{"type": "message", "role": "assistant",
                         "content": [{"type": "output_text", "text": text}]}],
             "usage": {"input_tokens": p, "output_tokens": c, "total_tokens": p + c},
         }
-
     except Exception as e:
         print(f"[API] ERROR: {e}")
         return JSONResponse(status_code=500, content={"error": {"message": str(e)}})
@@ -514,21 +490,14 @@ async def list_models(request: Request):
         return JSONResponse(status_code=401, content={"error": {"message": "Invalid API Key"}})
     return {
         "object": "list",
-        "data": [
-            {"id": m, "object": "model", "owned_by": "duck.ai"}
-            for m in ALL_MODELS
-        ],
+        "data": [{"id": m, "object": "model", "owned_by": "duck.ai"} for m in ALL_MODELS],
     }
 
 
 @app.get("/health")
 @app.get("/")
 async def health():
-    return {
-        "status":  "running",
-        "message": "Duck.ai API Server is active!",
-        "models":  ALL_MODELS,
-    }
+    return {"status": "running", "message": "Duck.ai API Server is active!", "models": ALL_MODELS}
 
 
 if __name__ == "__main__":