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

{entari_plugin_hyw-4.0.0rc15.dist-info → entari_plugin_hyw-4.0.0rc16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 4.0.0rc15
+Version: 4.0.0rc16
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT
@@ -23,6 +23,7 @@ Requires-Dist: markdown>=3.10
 Requires-Dist: DrissionPage>=4.1.1.2
 Requires-Dist: trafilatura>=1.6.0
 Requires-Dist: json-repair>=0.55.0
+Requires-Dist: Pillow>=10.0.0
 Provides-Extra: dev
 Requires-Dist: entari-plugin-server>=0.5.0; extra == "dev"
 Requires-Dist: satori-python-adapter-onebot11>=0.2.5; extra == "dev"

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

@@ -4,10 +4,10 @@ entari_plugin_hyw/history.py,sha256=0XJwbfvXH5T1EPt4G1J5wWMJsKi0FfmajY5cvw8CQWE,
 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=ArpcvlzZZH73s3T4qu8gb-Kik05wCAP07BOucD-uu-o,37165
+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=fod0RlZwWzK8kSKYr5kIsSa8CM5DL5p3ADTexgnN-o4,6568
+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=cLx1rPpy8BH6WiOKudH_XcO-DhqEU-CHANRDlyEB3MY,7612
@@ -15,8 +15,7 @@ hyw_core/browser_control/__init__.py,sha256=IeMErRC6fbq1PJWNK3klSbarSrUwOM4yyd_k
 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=Wq_alwsQ_c_Tpn2TrjJuIosnOaMjnTvCKvfqxj0Gi0o,45448
-hyw_core/browser_control/assets/index.html,sha256=BpbM0vD9OYicE5MBHSVLo3j_y-MpULI82PMqmBKpWT8,2328623
+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
@@ -37,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,7 +46,7 @@ hyw_core/crawling/models.py,sha256=pCKe0k9xT3taSAlTlh0PazcLV0xYsm8p3XIkLHGf-LM,2
 hyw_core/stages/__init__.py,sha256=W89cWpq-HBLi2FprtJQSjQNLzpbhM8ZCkqPG61D_imE,521
 hyw_core/stages/base.py,sha256=EfnTkISXbBNxjARykqIhmMrVqw2tqZl7ozJbJEbRnhI,2806
 hyw_core/stages/summary.py,sha256=D0XwhqmtoyovSXUWoa-_RxeoKWEkdjqMyoJV-gWQwvQ,8342
-entari_plugin_hyw-4.0.0rc15.dist-info/METADATA,sha256=398WlR_HKU96zAm_aYAvC2XIas1HjdpPXixbKB4dCHs,3845
-entari_plugin_hyw-4.0.0rc15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-entari_plugin_hyw-4.0.0rc15.dist-info/top_level.txt,sha256=ah76OrufRX0okOl4Fv8MO6PXiT0IaZ1oG0eDrdAPoNo,27
-entari_plugin_hyw-4.0.0rc15.dist-info/RECORD,,
+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,,

hyw_core/agent.py

@@ -480,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,

hyw_core/browser_control/service.py

@@ -12,6 +12,8 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Optional, Dict, Any, List
 from loguru import logger
 import trafilatura
+from PIL import Image
+from io import BytesIO
 
 # Import intelligent completeness checker
 from ..crawling.completeness import CompletenessChecker, trigger_lazy_load
@@ -541,13 +543,13 @@ class ScreenshotService:
         tasks = [self.screenshot_url(url, timeout=timeout, full_page=full_page) for url in urls]
         return await asyncio.gather(*tasks, return_exceptions=True)
 
-    async def screenshot_url(self, url: str, wait_load: bool = True, timeout: float = 15.0, full_page: bool = False, quality: int = 80) -> Optional[str]:
+    async def screenshot_url(self, url: str, wait_load: bool = True, timeout: float = 15.0, full_page: bool = False, quality: int = 90, scale: int = 1) -> Optional[str]:
         """Screenshot URL (Async wrapper for sync). Returns base64 string only."""
         loop = asyncio.get_running_loop()
         result = await loop.run_in_executor(
             self._executor,
             self._screenshot_sync,
-            url, wait_load, timeout, full_page, quality, False  # extract_content=False
+            url, wait_load, timeout, full_page, quality, scale, False  # extract_content=False
         )
         # Backward compatible: return just the screenshot for old callers
         if isinstance(result, dict):
@@ -569,7 +571,7 @@ class ScreenshotService:
         result = await loop.run_in_executor(
             self._executor,
             self._screenshot_sync,
-            url, True, timeout, False, 65, True  # quality=65 for balance, extract_content=True
+            url, True, timeout, False, 80, 2, True  # quality=80 for balance, scale=2, extract_content=True
         )
         
         if not isinstance(result, dict):
@@ -584,12 +586,12 @@ class ScreenshotService:
         return result
 
 
-    def _screenshot_sync(self, url: str, wait_load: bool, timeout: float, full_page: bool, quality: int, extract_content: bool = False) -> Any:
+    def _screenshot_sync(self, url: str, wait_load: bool, timeout: float, full_page: bool, quality: int, scale: int = 1, extract_content: bool = False) -> Any:
         """Synchronous screenshot. If extract_content=True, returns Dict else str."""
         if not url: 
             return {"screenshot_b64": None, "content": "", "title": "", "url": url} if extract_content else None
         tab = None
-        capture_width = 1440  # Higher resolution for readability
+        capture_width = 3000  # Increased for more comfortable page size while maintaining high resolution
         
         try:
             self._ensure_ready()
@@ -603,7 +605,7 @@ class ScreenshotService:
             # This eliminates the need for post-load resize and reflow
             try:
                 tab.run_cdp('Emulation.setDeviceMetricsOverride', 
-                            width=capture_width, height=900, deviceScaleFactor=1, mobile=False)
+                            width=capture_width, height=900, deviceScaleFactor=scale, mobile=False)
             except:
                 pass
             
@@ -876,6 +878,23 @@ class ScreenshotService:
             # Capture screenshot
             screenshot_b64 = tab.get_screenshot(as_base64='jpg', full_page=False)
             
+            # Use Pillow for intelligent compression
+            if screenshot_b64 and quality < 95: # Only compress if quality is not near maximum
+                try:
+                    img_bytes = base64.b64decode(screenshot_b64)
+                    img = Image.open(BytesIO(img_bytes))
+                    
+                    # Convert to RGB if not already (some images might be RGBA, which JPEG doesn't support)
+                    if img.mode in ("RGBA", "P"):
+                        img = img.convert("RGB")
+                    
+                    output_buffer = BytesIO()
+                    img.save(output_buffer, format="WebP", quality=quality, optimize=True) # Output as WebP format
+                    screenshot_b64 = base64.b64encode(output_buffer.getvalue()).decode()
+                    logger.debug(f"ScreenshotService: Applied Pillow compression with quality={quality}")
+                except Exception as e:
+                    logger.warning(f"ScreenshotService: Pillow compression failed: {e}")
+            
             # Extract content if requested
             if extract_content:
                 try:

hyw_core/definitions.py

@@ -120,6 +120,7 @@ AGENT_SYSTEM_PROMPT = """# 你是一个智能助手 (Agent), 你的职责是使
 ## 任务
 理解用户意图分配给你的任务.
 如果用户没有明确分配任务, 则默认任务为解释用户问题中的关键词.
+分辨用户消息的语意, 提取出用户最想了解的核心内容, 作为任务的核心.
 
 ## 核心原则
 最小限度使用自身知识, 尽可能使用 web_tool 获取信息.
@@ -128,11 +129,13 @@ AGENT_SYSTEM_PROMPT = """# 你是一个智能助手 (Agent), 你的职责是使
 - 并行调用工具
     - 网页搜索: 可以同时调用3次, 其中URL截图消耗较大, 最多同时调用1个
 - 积极使用 web_tool 获取信息
-    - 搜索时, 关键词保证简单、指向准确、利于传统搜索引擎.
-    - 不要尝试通过搜索引擎反推出角色、任务、地点, 搜索引擎没有这个能力
+    - 搜索时, 关键词保证简单、指向准确、利于传统搜索引擎, 通常只搜索1个词或短语, 非特定情况不建议加以限制, 搜索引擎会给出最佳推荐.
+        - 建议搜索: "minecraft create"; 不搜索 "create 是什么 百科"
+        - 建议搜索: "opnecode"; 不搜索 "open code 是什么"
+    - 不要尝试通过搜索引擎描述如何尼尔反推出角色、任务、地点, 搜索引擎没有这个能力
     - 禁止搜索可能导致一切潜在推销广告的内容, 不出现“是什么”、“怎么办”等容易产生广告的内容
     - 禁止搜索任何敏感内容(galgame之类的除外), 禁止搜索政治、成人色情、暴力等内容
-    - 获取页面截图时, 只使用官方性较强的 wiki、官方网站、资源站等等, 不使用第三方转载新闻网站.
+    - 获取页面截图时, 只挑选官方性较强的 wiki、官方网站、资源站等等, 不使用第三方转载新闻网站.
 - 最多可调用2轮工具, 之后必须给出最终回答
 - 适当时候调用 `refuse_answer`
 - 对于具体任务, 如果是转述、格式化、翻译等, 请直接给出最终回答, 不再调用工具