entari-plugin-hyw 4.0.0rc14__py3-none-any.whl → 4.0.0rc16__py3-none-any.whl

{entari_plugin_hyw-4.0.0rc14.dist-info → entari_plugin_hyw-4.0.0rc16.dist-info}/RECORD

@@ -1,24 +1,22 @@
-entari_plugin_hyw/Untitled-1,sha256=wbsr5i9iorqBMIYK4aAnpNTek3mXbhvyo2YOYw38pE4,30187
-entari_plugin_hyw/__init__.py,sha256=0q-i4F_xm--klgtp__r7cx_xPK7rV164aRzISEmVO7o,39053
+entari_plugin_hyw/__init__.py,sha256=Ro4nryYC5WXfPvC125ds39M00QZ1bsbADCLmZlZk1UU,29868
 entari_plugin_hyw/filters.py,sha256=sQnLaiqqZ2NkykcH4QgzFImP-JW3uVU7l6iuAAyUsJg,3080
 entari_plugin_hyw/history.py,sha256=0XJwbfvXH5T1EPt4G1J5wWMJsKi0FfmajY5cvw8CQWE,12065
 entari_plugin_hyw/misc.py,sha256=5IqF5Z2C_6Ufy5TI89uX5hX5fVYcXOTZIQUIu_tvf54,6855
 entari_plugin_hyw/search_cache.py,sha256=7MIhTm5_YnZjc0aBaX7AE4AJp0VT8eU6ObR6mTkoerc,4285
 hyw_core/__init__.py,sha256=Jlr9Ic-BLOPTnff6OctUCdjDMdK4nssTF_vHie4QKTo,1958
-hyw_core/agent.py,sha256=lyGwJI0SiRGYdpPPL7mtzHj569UNIgm-s4P_xz1MNGc,33096
+hyw_core/agent.py,sha256=t4xW0xI_Sb29eAO9FPfnmXNZG-sszKvHWXCRVYdP9nQ,37858
 hyw_core/config.py,sha256=DHxwToUVLm1nT88gG05e3hVzSLxXMk9BjgjAnhGCADk,4918
 hyw_core/core.py,sha256=_jN4831OeHQ_aM7sIlzcwYb5_Lp82kp2XmqpJD_tsLA,16097
-hyw_core/definitions.py,sha256=pH46L-N25pSuPaIiN7l7yfoD6oHK6BLHigE0eYLFmJQ,4270
+hyw_core/definitions.py,sha256=oH7TZO_vEbOlt8DE9mtz3_caq1Pca_6QjBWAgjrjQSk,6936
 hyw_core/image_cache.py,sha256=t8pr1kgH2ngK9IhrBAhzUqhBWERNztUywMzgCFZEtQk,9899
 hyw_core/pipeline.py,sha256=ZWwF0DHa29-65lUMU1_Fem3xQmxl7X_vgeni0ErOb8Q,22826
-hyw_core/search.py,sha256=VvfNSb9Hf7ZQWlNtnZfYe2eO9qPjYtwJxVlud6OdeCQ,7787
+hyw_core/search.py,sha256=cLx1rPpy8BH6WiOKudH_XcO-DhqEU-CHANRDlyEB3MY,7612
 hyw_core/browser_control/__init__.py,sha256=IeMErRC6fbq1PJWNK3klSbarSrUwOM4yyd_kJ6uWCPM,1406
 hyw_core/browser_control/landing.html,sha256=wgqldumdylz69T83pvOkrigT1Mdb9GY0_KU0ceLGwdY,4642
 hyw_core/browser_control/manager.py,sha256=-dHb0FamRsLfuU3jqX5cKaDo8DOOFV32zY912GuMdXU,6048
 hyw_core/browser_control/renderer.py,sha256=s-QNIU-NMVQGLd_drLmeERgHsTm6C9XYm78CObt2KXc,17409
-hyw_core/browser_control/service.py,sha256=_TcRRQuSei8PCsZs8hYU_DJ4DRMQ6jAFNqWmwca35Tc,43984
-hyw_core/browser_control/assets/index.html,sha256=BpbM0vD9OYicE5MBHSVLo3j_y-MpULI82PMqmBKpWT8,2328623
-hyw_core/browser_control/assets/card-dist/index.html,sha256=Xw-hQ5ctdQkK-1jV8_gqMdgVGNZDwWZvIAqNrh2eK7g,2210054
+hyw_core/browser_control/service.py,sha256=mo2qkFJgi5DkzURVD8QrIj3xdd_jKwiJSoTVEfFAsY0,46626
+hyw_core/browser_control/assets/card-dist/index.html,sha256=4SA4QA2aaUwHGETtCcdUGEMjjoHaw7wJVACZr4VC70Q,2213449
 hyw_core/browser_control/assets/card-dist/vite.svg,sha256=SnSK_UQ5GLsWWRyDTEAdrjPoeGGrXbrQgRw6O0qSFPs,1497
 hyw_core/browser_control/assets/card-dist/logos/anthropic.svg,sha256=ASsy1ypo3osNc3n-B0R81tk_dIFsVgg7qQORrd5T2kA,558
 hyw_core/browser_control/assets/card-dist/logos/cerebras.svg,sha256=bpmiiYTODwc06knTmPj3GQ7NNtosMog5lkggvB_Z-7M,44166
@@ -38,24 +36,6 @@ hyw_core/browser_control/assets/card-dist/logos/qwen.png,sha256=eqLbnIPbjh2_PsOD
 hyw_core/browser_control/assets/card-dist/logos/xai.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
 hyw_core/browser_control/assets/card-dist/logos/xiaomi.png,sha256=WHxlDFGU5FCjb-ure3ngdGG18-efYZUUfqA3_lqCUN0,4084
 hyw_core/browser_control/assets/card-dist/logos/zai.png,sha256=K-gnabdsjMLInppHA1Op7Nyt33iegrx1x-yNlvCZ0Tc,2351
-hyw_core/browser_control/assets/logos/anthropic.svg,sha256=ASsy1ypo3osNc3n-B0R81tk_dIFsVgg7qQORrd5T2kA,558
-hyw_core/browser_control/assets/logos/cerebras.svg,sha256=bpmiiYTODwc06knTmPj3GQ7NNtosMog5lkggvB_Z-7M,44166
-hyw_core/browser_control/assets/logos/deepseek.png,sha256=KWWAr9aeYMc6I07U_1qo7zcXO6e7-kfd9S2XjQumnf4,25338
-hyw_core/browser_control/assets/logos/gemini.svg,sha256=H74CoVmx5opcCtr3Ay3M09dpqL9cd9Whkx-M6an3t7s,599
-hyw_core/browser_control/assets/logos/google.svg,sha256=H74CoVmx5opcCtr3Ay3M09dpqL9cd9Whkx-M6an3t7s,599
-hyw_core/browser_control/assets/logos/grok.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
-hyw_core/browser_control/assets/logos/huggingface.png,sha256=8eAudeftUDO11jf0coOscPeRkskCb7l9TNMx78q61mY,24564
-hyw_core/browser_control/assets/logos/microsoft.svg,sha256=-am_6N3UEQYSzldDg-xrdGYjTWsagH-3v4Q_eia1ymE,684
-hyw_core/browser_control/assets/logos/minimax.png,sha256=tWqVlMdFNPpP8zWWX9tvIsWXI9q76P7O3t3CEZO7NU0,1525
-hyw_core/browser_control/assets/logos/mistral.png,sha256=0vv7jPmPKiBRYVYYJxVL_wIH_qa_ZssIdV3NDO5vbmk,869
-hyw_core/browser_control/assets/logos/nvida.png,sha256=JMITdcyjR9Lz6Gub0n1_30d0ynvV1ZSCJRcjy23qgrA,1607
-hyw_core/browser_control/assets/logos/openai.svg,sha256=LhVwCR4qaXj6qHm31qniQTCkJ-FX932JLSycUis5kao,1692
-hyw_core/browser_control/assets/logos/openrouter.png,sha256=exxfjWGDWpYH-Vc8xJDbhNVeXFEVxnu6TMxYIBc1WmY,1665
-hyw_core/browser_control/assets/logos/perplexity.svg,sha256=mHWZFoeWmDYXOIDzm9pj6_sRotaI8xNy5Lkeg5Vzu70,555
-hyw_core/browser_control/assets/logos/qwen.png,sha256=eqLbnIPbjh2_PsODU_mmqjeD82xXj8fV_kN0fDrNaD0,38419
-hyw_core/browser_control/assets/logos/xai.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
-hyw_core/browser_control/assets/logos/xiaomi.png,sha256=WHxlDFGU5FCjb-ure3ngdGG18-efYZUUfqA3_lqCUN0,4084
-hyw_core/browser_control/assets/logos/zai.png,sha256=K-gnabdsjMLInppHA1Op7Nyt33iegrx1x-yNlvCZ0Tc,2351
 hyw_core/browser_control/engines/__init__.py,sha256=01-jOjvtQcqWIwwY56ql3j00oSHGE2XhDHjkIi1Ij3Q,284
 hyw_core/browser_control/engines/base.py,sha256=q5y4SM1G6xS7-6TQ-nZz9iTWw3XonjJn01fWzoTxr6c,414
 hyw_core/browser_control/engines/default.py,sha256=BlHCQI4-rN9cEzLLfqvRD4bvhyP2G2KUGlo92J4kFNw,6092
@@ -65,8 +45,8 @@ hyw_core/crawling/completeness.py,sha256=OKdS8XlYYWDU1Vl1k-u7yEFqppukuJv-YQB0Px5
 hyw_core/crawling/models.py,sha256=pCKe0k9xT3taSAlTlh0PazcLV0xYsm8p3XIkLHGf-LM,2353
 hyw_core/stages/__init__.py,sha256=W89cWpq-HBLi2FprtJQSjQNLzpbhM8ZCkqPG61D_imE,521
 hyw_core/stages/base.py,sha256=EfnTkISXbBNxjARykqIhmMrVqw2tqZl7ozJbJEbRnhI,2806
-hyw_core/stages/summary.py,sha256=sgHCm_Leq_pkJ4YcgQuf8croiOP1oKz171TnzJwRwVs,7080
-entari_plugin_hyw-4.0.0rc14.dist-info/METADATA,sha256=aOkMfm8FTTHNF_2ZkwNRw47sjLPlLNxu_MU8uoAFGX0,3845
-entari_plugin_hyw-4.0.0rc14.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-entari_plugin_hyw-4.0.0rc14.dist-info/top_level.txt,sha256=ah76OrufRX0okOl4Fv8MO6PXiT0IaZ1oG0eDrdAPoNo,27
-entari_plugin_hyw-4.0.0rc14.dist-info/RECORD,,
+hyw_core/stages/summary.py,sha256=D0XwhqmtoyovSXUWoa-_RxeoKWEkdjqMyoJV-gWQwvQ,8342
+entari_plugin_hyw-4.0.0rc16.dist-info/METADATA,sha256=2cd09y-WU9e9_yBjkQVpTi4RLSSET0Vhp-1TeQmxuQ4,3875
+entari_plugin_hyw-4.0.0rc16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+entari_plugin_hyw-4.0.0rc16.dist-info/top_level.txt,sha256=ah76OrufRX0okOl4Fv8MO6PXiT0IaZ1oG0eDrdAPoNo,27
+entari_plugin_hyw-4.0.0rc16.dist-info/RECORD,,

{entari_plugin_hyw-4.0.0rc14.dist-info → entari_plugin_hyw-4.0.0rc16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

hyw_core/agent.py

@@ -15,7 +15,7 @@ from typing import Any, Callable, Awaitable, Dict, List, Optional
 from loguru import logger
 from openai import AsyncOpenAI
 
-from .definitions import get_web_tool, get_refuse_answer_tool, AGENT_SYSTEM_PROMPT
+from .definitions import get_web_tool, get_refuse_answer_tool, get_js_tool, AGENT_SYSTEM_PROMPT
 from .stages.base import StageContext, StageResult
 from .search import SearchService
 
@@ -209,8 +209,19 @@ class AgentPipeline:
         
         session.messages = [
             {"role": "system", "content": system_prompt},
-            {"role": "user", "content": user_content}
         ]
+
+        # Add conversation history (previous turns) before current user message
+        # This enables continuous conversation context
+        if conversation_history:
+            for msg in conversation_history:
+                role = msg.get("role", "")
+                content = msg.get("content", "")
+                if role in ("user", "assistant") and content:
+                    session.messages.append({"role": role, "content": content})
+
+        # Add current user message
+        session.messages.append({"role": "user", "content": user_content})
         
         # Add image source hint for user images
         if user_image_count > 0:
@@ -223,8 +234,9 @@ class AgentPipeline:
         # Tool definitions
         web_tool = get_web_tool()
         refuse_tool = get_refuse_answer_tool()
-        tools = [web_tool, refuse_tool]
-        
+        js_tool = get_js_tool()
+        tools = [web_tool, refuse_tool, js_tool]
+
         usage_totals = {"input_tokens": 0, "output_tokens": 0}
         final_content = ""
         
@@ -429,7 +441,10 @@ class AgentPipeline:
                 if func_name == "web_tool":
                     tasks_to_run.append(self._execute_web_tool(tool_call_args_list[idx], context))
                     task_indices.append(idx)
-            
+                elif func_name == "js_executor":
+                    tasks_to_run.append(self._execute_js_tool(tool_call_args_list[idx], context))
+                    task_indices.append(idx)
+
             # Run all web_tool calls in parallel
             if tasks_to_run:
                 results = await asyncio.gather(*tasks_to_run, return_exceptions=True)
@@ -465,7 +480,18 @@ class AgentPipeline:
                     notifications.append(f"🔍 {result['summary']}")
                     
                     # Add tool result to messages
-                    result_content = f"搜索完成: {result['summary']}\n\n找到 {len(result.get('results', []))} 个结果"
+                    formatted_results = ""
+                    if result.get("results"):
+                        formatted_results = "\n\n详细结果:\n"
+                        for i, r in enumerate(result["results"]):
+                            title = r.get("title", "无标题")
+                            url = r.get("url", "")
+                            snippet = r.get("snippet", "") or r.get("content", "") or ""
+                            # Limit snippet length
+                            snippet = snippet[:300] + "..." if len(snippet) > 300 else snippet
+                            formatted_results += f"{i+1}. [{title}]({url})\n   摘要: {snippet}\n\n"
+
+                    result_content = f"搜索完成: {result['summary']}\n\n找到 {len(result.get('results', []))} 个结果{formatted_results}"
                     session.messages.append({
                         "role": "tool",
                         "tool_call_id": tc_id,
@@ -647,6 +673,59 @@ class AgentPipeline:
             "screenshot_count": 0
         }
     
+    async def _execute_js_tool(self, args: Dict, context: StageContext) -> Dict[str, Any]:
+        """执行 JS 代码工具"""
+        script = args.get("script", "")
+        if not script:
+             return {"summary": "JS执行失败: 代码为空", "results": []}
+
+        if self.send_func:
+            try:
+                await self.send_func("💻 正在执行JavaScript代码...")
+            except: pass
+
+        logger.info(f"AgentPipeline: Executing JS script: {script[:50]}...")
+        result = await self.search_service.execute_script(script)
+
+        # 格式化结果
+        success = result.get("success", False)
+        output = result.get("result", None)
+        error = result.get("error", None)
+        url = result.get("url", "")
+        title = result.get("title", "")
+
+        # Add to context
+        context.web_results.append({
+            "_id": context.next_id(),
+            "_type": "js_result",
+            "url": url,
+            "title": title or "JS Execution",
+            "script": script,
+            "output": str(output) if success else str(error),
+            "success": success,
+            "content": f"Script: {script}\n\nOutput: {output}" if success else f"Error: {error}"
+        })
+
+        if success:
+            summary = f"JS执行成功 (返回: {str(output)[:50]}...)"
+            return {
+                "summary": summary,
+                "results": [{"_type": "js_result", "url": url}],
+                "screenshot_count": 0,
+                "full_output": str(output),  # Return full output for LLM
+                "success": True
+            }
+        else:
+            return {
+                "summary": f"JS执行失败: {str(error)[:50]}",
+                "results": [],
+                "screenshot_count": 0,
+                "full_output": f"JS Execution Failed: {error}",
+                "success": False,
+                "error": str(error)
+            }
+
+
     def _collect_filter_urls(self, filters: List, visible: List[Dict]) -> List[str]:
         """Collect URLs based on filter specifications."""
         urls = []
@@ -729,22 +808,51 @@ class AgentPipeline:
                 "cost": instruct_cost,
             })
         
-        # 2. Search Stage (搜索)
+        # 2. Search Stage (搜索) / Browser JS Stage
         if session.tool_calls:
-            # Collect all search descriptions
+            # Collect all search descriptions and check for JS executor calls
             search_descriptions = []
+            js_calls = []
+
             for tc, result in zip(session.tool_calls, session.tool_results):
-                desc = result.get("summary", "")
-                if desc:
-                    search_descriptions.append(desc)
-            
-            stages.append({
-                "name": "Search",
-                "model": "",
-                "provider": "Web",
-                "description": " → ".join(search_descriptions) if search_descriptions else "Web Search",
-                "time": session.search_time,
-            })
+                if tc.get("name") == "js_executor":
+                    # Collect JS execution info
+                    js_calls.append({
+                        "script": tc.get("args", {}).get("script", ""),
+                        "output": result.get("full_output", result.get("summary", "")),
+                        "url": result.get("results", [{}])[0].get("url", "") if result.get("results") else "",
+                        "success": result.get("success", True), # Default to True if not present
+                        "error": result.get("error", "")
+                    })
+                else:
+                    desc = result.get("summary", "")
+                    if desc:
+                        search_descriptions.append(desc)
+
+            # Add Search stage if there are search calls
+            if search_descriptions:
+                stages.append({
+                    "name": "Search",
+                    "model": "",
+                    "provider": "Web",
+                    "description": " → ".join(search_descriptions),
+                    "time": session.search_time,
+                })
+
+            # Add Browser JS stage for each JS call
+            for js_call in js_calls:
+                stages.append({
+                    "name": "browser_js",
+                    "model": "",
+                    "provider": "Browser",
+                    "description": "JavaScript Execution",
+                    "script": js_call["script"],
+                    "output": js_call["output"],
+                    "url": js_call["url"],
+                    "success": js_call.get("success"),
+                    "error": js_call.get("error"),
+                    "time": 0,  # JS execution time is included in search_time
+                })
         
         # 3. Summary Stage (总结)
         # Calculate remaining tokens after instruct