Update main.py

main.py

@@ -102,7 +102,7 @@ class AsyncBrowserThread(threading.Thread):
     async def _chat(self, model_label: str, prompt: str) -> str:
         page = await self.persistent_context.new_page()
         try:
-            page.set_default_timeout(120000)
+            page.set_default_timeout(30000)
 
             # ── 1. فتح صفحة جديدة ──────────────────────────────────
             await page.goto(
@@ -115,6 +115,7 @@ class AsyncBrowserThread(threading.Thread):
                 agree = page.locator('button:has-text("Agree and Continue")')
                 if await agree.count() > 0 and await agree.first.is_visible():
                     await agree.first.click()
+                    print("[DUCK] Terms re-accepted ✓")
                     await asyncio.sleep(2)
             except Exception:
                 pass
@@ -125,7 +126,7 @@ class AsyncBrowserThread(threading.Thread):
             )
             print("[DUCK] Input ready ✓")
 
-            # ── 4. تغيير النموذج ───────────────────────────────────
+            # ── 4. تغيير النموذج بطريقة آمنة ──────────────────────
             try:
                 model_btn    = page.locator('button[data-testid="model-select-button"]')
                 current_text = await model_btn.inner_text()
@@ -137,7 +138,6 @@ class AsyncBrowserThread(threading.Thread):
 
                     option = page.locator(
                         f"li:has-text('{model_label}'), "
-                        f"button:has-text('{model_label}'), "
                         f"[role='option']:has-text('{model_label}')"
                     )
                     if await option.count() > 0:
@@ -147,80 +147,106 @@ class AsyncBrowserThread(threading.Thread):
                         await page.keyboard.press("Escape")
                         print(f"[DUCK] Model not found, using default")
 
-                    # انتظر إعادة تحميل الـ textarea بعد تغيير النموذج
-                    await asyncio.sleep(2)
+                    # انتظر إعادة render بعد تغيير النموذج
+                    await asyncio.sleep(3)
                     await page.wait_for_selector(
-                        'textarea[name="user-prompt"]', timeout=15000
+                        'textarea[name="user-prompt"]',
+                        state="visible",
+                        timeout=15000
                     )
+                    print("[DUCK] Textarea re-confirmed ✓")
+
             except Exception as e:
                 print(f"[DUCK] Model select (non-fatal): {e}")
-
-            # ── 5. إرسال الرسالة بـ JavaScript مباشرة ─────────────
-            # هذا يتجاوز مشكلة زر Send الـ disabled
-            textarea = page.locator('textarea[name="user-prompt"]')
-            await textarea.click()
-            await asyncio.sleep(0.5)
-
-            # استخدام JavaScript لضبط القيمة وإطلاق الأحداث
-            await page.evaluate("""
+                await page.wait_for_selector(
+                    'textarea[name="user-prompt"]',
+                    state="visible",
+                    timeout=10000
+                )
+
+            # ── 5. كتابة الرسالة بـ JavaScript ────────────────────
+            # يتجاوز React's synthetic events ويضمن تفعيل زر Send
+            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 InputEvent('input', { bubbles: true }));
                     ta.dispatchEvent(new Event('change', { bubbles: true }));
+                    ta.focus();
                 }
-            """, prompt)
-            await asyncio.sleep(1)
+                """,
+                prompt
+            )
+            await asyncio.sleep(1.5)
 
-            # انتظر أن يصبح زر Send enabled
+            # ── 6. إرسال الرسالة ───────────────────────────────────
+            send_btn = page.locator('button[type="submit"][aria-label="Send"]')
+
+            # انتظر حتى 5 ثوان لزر Send
             send_enabled = False
             for _ in range(10):
-                disabled = await page.locator(
-                    'button[type="submit"][aria-label="Send"]'
-                ).get_attribute("disabled")
-                if disabled is None:
+                is_disabled = await send_btn.get_attribute("disabled")
+                if is_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()
+                await send_btn.click()
                 print(f"[DUCK] Sent via button ✓ ({len(prompt)} chars)")
             else:
-                # fallback: Enter من لوحة المفاتيح
-                await textarea.press("Enter")
+                # fallback: Enter على الـ textarea
+                ta = page.locator('textarea[name="user-prompt"]')
+                await ta.click()
+                await asyncio.sleep(0.3)
+                await page.keyboard.press("Enter")
                 print(f"[DUCK] Sent via Enter ✓ ({len(prompt)} chars)")
 
-            # ── 6. انتظار بدء الرد ────────────────────────────────
-            await asyncio.sleep(3)
+            # ── 7. انتظار بدء الرد ────────────────────────────────
+            await asyncio.sleep(2)
+            response_started = False
             try:
                 stop_btn = page.locator('button[aria-label="Stop generating"]')
-                await stop_btn.wait_for(state="visible", timeout=20000)
+                await stop_btn.wait_for(state="visible", timeout=30000)
                 print("[DUCK] Response started ✓")
+                response_started = True
             except Exception:
-                print("[DUCK] Stop btn not visible, continuing...")
+                print("[DUCK] Stop btn not detected, will watch for content...")
 
-            # ── 7. انتظار اكتمال الرد ─────────────────────────────
+            # ── 8. انتظار اكتمال الرد ─────────────────────────────
+            page.set_default_timeout(120000)
             max_wait = 120
             elapsed  = 0
-            while elapsed < max_wait:
-                await asyncio.sleep(2)
-                elapsed += 2
-                still_running = await page.locator(
-                    'button[aria-label="Stop generating"]:not([disabled])'
-                ).count()
-                if still_running == 0:
-                    print(f"[DUCK] Done after ~{elapsed}s ✓")
-                    break
 
-            await asyncio.sleep(1.5)
+            if response_started:
+                while elapsed < max_wait:
+                    await asyncio.sleep(2)
+                    elapsed += 2
+                    still_running = await page.locator(
+                        'button[aria-label="Stop generating"]:not([disabled])'
+                    ).count()
+                    if still_running == 0:
+                        print(f"[DUCK] Response complete (~{elapsed}s) ✓")
+                        break
+            else:
+                # انتظر ظهور article (محتوى الرد)
+                while elapsed < max_wait:
+                    await asyncio.sleep(2)
+                    elapsed += 2
+                    arts = await page.locator('article').count()
+                    if arts > 0:
+                        await asyncio.sleep(5)
+                        print(f"[DUCK] Content appeared (~{elapsed}s) ✓")
+                        break
+
+            await asyncio.sleep(2)
 
-            # ── 8. استخراج الرد ───────────────────────────────────
+            # ── 9. استخراج الرد ───────────────────────────────────
             response_text = await page.evaluate("""
                 () => {
                     // طريقة 1: article
@@ -243,7 +269,7 @@ class AsyncBrowserThread(threading.Thread):
                             return valid[valid.length - 1].innerText.trim();
                         }
                     }
-                    // طريقة 3: أطول div
+                    // طريقة 3: أطول div نظيف
                     const divs = [...document.querySelectorAll('div')].filter(el =>
                         el.children.length < 10 &&
                         el.innerText &&
@@ -260,7 +286,7 @@ class AsyncBrowserThread(threading.Thread):
                 }
             """)
 
-            # fallback
+            # fallback نهائي
             if not response_text or len(response_text.strip()) < 10:
                 await asyncio.sleep(5)
                 response_text = await page.evaluate("""
@@ -286,7 +312,7 @@ class AsyncBrowserThread(threading.Thread):
         future = asyncio.run_coroutine_threadsafe(
             self._chat(model_label, prompt), self.loop
         )
-        return future.result(timeout=180)
+        return future.result(timeout=200)
 
 
 browser_engine = AsyncBrowserThread()
@@ -360,7 +386,10 @@ def _parse_tool_calls(text: str):
 
 
 def _auth(request: Request) -> bool:
-    return request.headers.get("authorization", "").replace("Bearer ", "").strip() == API_SECRET_KEY
+    return (
+        request.headers.get("authorization", "")
+        .replace("Bearer ", "").strip() == API_SECRET_KEY
+    )
 
 
 def _get_model_label(model: str) -> str:
@@ -497,7 +526,11 @@ async def list_models(request: Request):
 @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__":