entari-plugin-hyw 4.0.0rc9__py3-none-any.whl → 4.0.0rc10__py3-none-any.whl

entari_plugin_hyw/__init__.py

@@ -162,6 +162,7 @@ class HywConfig(BasicConfModel):
     admins: List[str] = field(default_factory=list)
     models: List[Dict[str, Any]] = field(default_factory=list)
     question_command: str = "/q"
+    web_command: str = "/w"
     language: str = "Simplified Chinese"
     temperature: float = 0.4
     
@@ -169,7 +170,7 @@ class HywConfig(BasicConfModel):
     api_key: Optional[str] = None
     base_url: str = "https://openrouter.ai/api/v1"
     
-    search_engine: str = "google"
+    search_engine: str = "duckduckgo"
     
     headless: bool = False
     save_conversation: bool = False
@@ -177,19 +178,14 @@ class HywConfig(BasicConfModel):
     quote: bool = False
     theme_color: str = "#ff0000"
 
-    # Nested configurations
+    # Main model configuration (used for summary/main LLM calls)
     main: Optional[Dict[str, Any]] = None
-    instruct: Optional[Dict[str, Any]] = None
-    vision: Optional[Dict[str, Any]] = None
-    deepsearch_instruct: Optional[Dict[str, Any]] = None
-    deepsearch_agent: Optional[Dict[str, Any]] = None
     
     def __post_init__(self):
         self.theme_color = parse_color(self.theme_color)
     
     def to_hyw_core_config(self) -> HywCoreConfig:
         main_cfg = self.main or {}
-        instruct_cfg = self.instruct or {}
         
         return HywCoreConfig.from_dict({
             "models": self.models,
@@ -207,20 +203,7 @@ class HywConfig(BasicConfModel):
             "summary_api_key": main_cfg.get("api_key"),
             "summary_base_url": main_cfg.get("base_url"),
             "summary_extra_body": main_cfg.get("extra_body"),
-            
-            # Map nested 'instruct' config to instruct stage
-            "instruct_model": instruct_cfg.get("model_name"),
-            "instruct_api_key": instruct_cfg.get("api_key"),
-            "instruct_base_url": instruct_cfg.get("base_url"),
-            "instruct_extra_body": instruct_cfg.get("extra_body"),
         })
-    
-    def get_model_config(self, stage: str) -> Dict[str, Any]:
-        return {
-            "model_name": self.model_name,
-            "api_key": self.api_key,
-            "base_url": self.base_url,
-        }
 
 
 conf = plugin_config(HywConfig)
@@ -690,7 +673,7 @@ async def handle_question_command(session: Session[MessageCreatedEvent], result:
 
 
 # Search/Web Command (/w)
-alc_search = Alconna("/w", Args["query;?", AllParam])
+alc_search = Alconna(conf.web_command, Args["query;?", AllParam])
 
 @command.on(alc_search)
 async def handle_web_command(session: Session[MessageCreatedEvent], result: Arparma):
@@ -756,6 +739,17 @@ async def handle_web_command(session: Session[MessageCreatedEvent], result: Arpa
             
             search_cache.cleanup()
             return
+        else:
+            # Reply to a non-cached message: append reply content to query
+            try:
+                # session.reply.origin.message is a list, wrap it in MessageChain
+                reply_msg = MessageChain(session.reply.origin.message)
+                reply_content = str(reply_msg.get(Text)).strip()
+                if reply_content:
+                    query = f"{query} {reply_content}".strip() if query else reply_content
+                    logger.info(f"/w appended reply content, new query: '{query}'")
+            except Exception as e:
+                logger.warning(f"/w failed to extract reply content: {e}")
     
     # No query and no cache context - nothing to do
     if not query:
@@ -805,8 +799,10 @@ async def handle_web_command(session: Session[MessageCreatedEvent], result: Arpa
             await session.send(filter_error)
             return
         
-        # Search first
+        # Start search and tab pre-warming in parallel
+        local_renderer = await get_content_renderer()
         search_task = asyncio.create_task(core.search([search_query]))
+        tab_task = asyncio.create_task(local_renderer.prepare_tab())
         
         if conf.reaction: 
             asyncio.create_task(react(session, "🔍"))
@@ -815,17 +811,25 @@ async def handle_web_command(session: Session[MessageCreatedEvent], result: Arpa
         flat_results = results[0] if results else []
         
         if not flat_results:
+            try: await tab_task
+            except: pass
             await session.send("Search returned no results.")
             return
 
         visible = [r for r in flat_results if not r.get("_hidden", False)]
         
         if not visible:
+            try: await tab_task
+            except: pass
             await session.send("Search returned no visible results.")
             return
         
         # === Filter Mode: Screenshot matching links ===
         if filters:
+            # No need for tab in filter/screenshot mode, cancel it
+            try: await tab_task
+            except: pass
+            
             urls_to_screenshot = []
             
             for filter_type, filter_value, count in filters:
@@ -881,20 +885,42 @@ async def handle_web_command(session: Session[MessageCreatedEvent], result: Arpa
                 await session.send("截图失败")
             return
              
-        # === Normal Search Mode: Screenshot search results page ===
-        search_service = core._search_service
-        search_url = search_service._build_search_url(search_query)
+        # === Normal Search Mode: Render search results as Sources card ===
+        
+        # Build references from search results for Sources card
+        references = []
+        for i, res in enumerate(visible[:10]):
+            references.append({
+                "title": res.get("title", f"Result {i+1}"),
+                "url": res.get("url", ""),
+                "snippet": res.get("content", "") or res.get("snippet", ""),
+                "original_idx": i + 1,
+            })
         
-        # Handle address bar search marker
-        if search_url.startswith("__ADDRESS_BAR_SEARCH__:"):
-            import urllib.parse
-            encoded_query = urllib.parse.quote_plus(search_query)
-            search_url = f"https://www.google.com/search?q={encoded_query}"
+        try:
+            tab_id = await tab_task
+        except Exception:
+            tab_id = None
+        
+        with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as tf:
+            output_path = tf.name
         
-        b64_img = await core.screenshot(search_url)
+        # Render Sources card with search results (no markdown content, just references)
+        render_ok = await core.render(
+            markdown_content=f"# 搜索结果: {search_query}",
+            output_path=output_path,
+            stats={"total_time": 0},
+            references=references,
+            page_references=[],
+            stages_used=[{"name": "search", "description": f"搜索 \"{search_query}\"", "time": 0}],
+            tab_id=tab_id
+        )
         
-        if b64_img:
-            msg_chain = MessageChain(Image(src=f'data:image/jpeg;base64,{b64_img}'))
+        if render_ok and os.path.exists(output_path):
+            with open(output_path, "rb") as f:
+                img_data = base64.b64encode(f.read()).decode()
+            
+            msg_chain = MessageChain(Image(src=f'data:image/png;base64,{img_data}'))
             if conf.quote:
                 msg_chain = MessageChain(Quote(session.event.message.id)) + msg_chain
             
@@ -909,8 +935,10 @@ async def handle_web_command(session: Session[MessageCreatedEvent], result: Arpa
                 mid = str(session.event.message.id) if getattr(session.event, "message", None) else str(session.event.id)
                 context_id = f"guild_{session.guild.id}" if session.guild else "user"
                 history_manager.remember(mid, [{"role": "user", "content": f"/w {query}"}], [], {}, context_id=context_id)
+            
+            os.remove(output_path)
         else:
-            await session.send(f"截图搜索页面失败: {search_url}")
+            await session.send("渲染搜索结果失败")
         
         search_cache.cleanup()  # Lazy cleanup
 

{entari_plugin_hyw-4.0.0rc9.dist-info → entari_plugin_hyw-4.0.0rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 4.0.0rc9
+Version: 4.0.0rc10
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT

{entari_plugin_hyw-4.0.0rc9.dist-info → entari_plugin_hyw-4.0.0rc10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 entari_plugin_hyw/Untitled-1,sha256=wbsr5i9iorqBMIYK4aAnpNTek3mXbhvyo2YOYw38pE4,30187
-entari_plugin_hyw/__init__.py,sha256=laQrEH-CdofBg3EEqIEOTwJu0pHlMG0wIvdQo8AycZk,35057
+entari_plugin_hyw/__init__.py,sha256=Fp82hv0D-Uu36POkjBWFVrZy_3JReBN0fxKFNrQwXIU,36258
 entari_plugin_hyw/history.py,sha256=0XJwbfvXH5T1EPt4G1J5wWMJsKi0FfmajY5cvw8CQWE,12065
 entari_plugin_hyw/misc.py,sha256=4ABzCHbEA87UCQfBX7AgAqACQwjQIhCSZuqHXPFGokg,5527
 entari_plugin_hyw/search_cache.py,sha256=7MIhTm5_YnZjc0aBaX7AE4AJp0VT8eU6ObR6mTkoerc,4285
@@ -9,14 +9,14 @@ hyw_core/core.py,sha256=G96C9mhmuXRwFOwIYm5M6q0ys1QD_2eQYvP89e_bmWg,10455
 hyw_core/definitions.py,sha256=syYMNy3vdey7VuSlD3JUZ0gjlp5tmVkGHup-nimT0X0,3264
 hyw_core/image_cache.py,sha256=t8pr1kgH2ngK9IhrBAhzUqhBWERNztUywMzgCFZEtQk,9899
 hyw_core/pipeline.py,sha256=ZWwF0DHa29-65lUMU1_Fem3xQmxl7X_vgeni0ErOb8Q,22826
-hyw_core/search.py,sha256=IqYCeWkIPpssLx8vHEv3qbqndLuPy5z6cE_L-IhNcNk,7468
-hyw_core/browser_control/__init__.py,sha256=X1vHZpYXLG-P1RRivVyK014WKnv48GN1ibF9TbMp_-c,1482
+hyw_core/search.py,sha256=L9LF3s4o4-ypDRyevvIlAqC0pa7xNYv-nESAql9N-pk,7345
+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=U8dVpkWTG5pcIE5WiSQSfTx4gEo9PnBbmBD0KZcLBbU,5513
-hyw_core/browser_control/renderer.py,sha256=hsCjJPMSCAvqTFtiAmyjaw0IE8xmbIjq5VK9dd70gfc,15539
-hyw_core/browser_control/service.py,sha256=tuNaEnxRZVkLgQczWnWDyEHXhyvhF9RboDmnT3OFX34,35905
+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=YKRxXnpSkbso2osmwRlImPldUKMFsGrwgGoQqMuiGf8,36483
 hyw_core/browser_control/assets/index.html,sha256=BpbM0vD9OYicE5MBHSVLo3j_y-MpULI82PMqmBKpWT8,2328623
-hyw_core/browser_control/assets/card-dist/index.html,sha256=fNfT_0TgSZLqwuTtKAl3Wzc4lKRAY_rbWxc_mQHfaCs,2209006
+hyw_core/browser_control/assets/card-dist/index.html,sha256=Xw-hQ5ctdQkK-1jV8_gqMdgVGNZDwWZvIAqNrh2eK7g,2210054
 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
@@ -54,15 +54,17 @@ hyw_core/browser_control/assets/logos/qwen.png,sha256=eqLbnIPbjh2_PsODU_mmqjeD82
 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=G-bjcxWMaPZoR4tUz-OcGhZDkQwkXjK234qVEFvjEbE,338
+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
 hyw_core/browser_control/engines/duckduckgo.py,sha256=QVYj1I6Fw6--2-f3DYdHVlOmeLPzet9qG4HUT7ynrSE,6789
-hyw_core/browser_control/engines/google.py,sha256=PmU0_n8UrnQ1oyYVS-Y_jLS6rzgkQZK_7yHlGeAUooY,6098
+hyw_core/crawling/__init__.py,sha256=W5Be02uQueAyADFhPXVbDAFpNUJ_W7KdMtMr923_N24,437
+hyw_core/crawling/completeness.py,sha256=iQoTHLXkXLCoT89NhoUO7P3_Zz8rfpa-2Wah_KvG-dI,12069
+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=ODOwhIAmBZJuA4KOhUP7Lygch7XSkshrTZj-MdZjbEs,7085
-entari_plugin_hyw-4.0.0rc9.dist-info/METADATA,sha256=ofBdYe9A6sFakK9NDDpnmTczWuh1mbm6OpzpLO1j3cc,3844
-entari_plugin_hyw-4.0.0rc9.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-entari_plugin_hyw-4.0.0rc9.dist-info/top_level.txt,sha256=ah76OrufRX0okOl4Fv8MO6PXiT0IaZ1oG0eDrdAPoNo,27
-entari_plugin_hyw-4.0.0rc9.dist-info/RECORD,,
+entari_plugin_hyw-4.0.0rc10.dist-info/METADATA,sha256=9xYusySUW6RTe5N51Y8hzawLbsqjQUm30EBG-UgpoxU,3845
+entari_plugin_hyw-4.0.0rc10.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+entari_plugin_hyw-4.0.0rc10.dist-info/top_level.txt,sha256=ah76OrufRX0okOl4Fv8MO6PXiT0IaZ1oG0eDrdAPoNo,27
+entari_plugin_hyw-4.0.0rc10.dist-info/RECORD,,

hyw_core/browser_control/__init__.py

@@ -5,7 +5,7 @@ This subpackage provides:
 - BrowserManager: Shared browser instance management
 - PageService: Page fetching and screenshot capabilities
 - RenderService: Vue-based card rendering
-- Search engines: Bing, Google, DuckDuckGo adapters
+- Search engines: DuckDuckGo adapter
 """
 
 from .manager import (
@@ -28,7 +28,6 @@ from .renderer import (
 )
 
 from .engines.base import SearchEngine
-from .engines.google import GoogleEngine
 from .engines.duckduckgo import DuckDuckGoEngine
 from .engines.default import DefaultEngine
 
@@ -59,7 +58,6 @@ __all__ = [
     
     # Search Engines
     "SearchEngine",
-    "GoogleEngine",
     "DuckDuckGoEngine",
     "DefaultEngine",
 ]