entari-plugin-hyw 4.0.0rc7__py3-none-any.whl → 4.0.0rc8__py3-none-any.whl

entari_plugin_hyw/history.py

@@ -83,24 +83,30 @@ class HistoryManager:
         import shutil
         import json
         
-        if key not in self._history:
+        if key not in self._history and not web_results:
             return
 
         try:
             # Extract user's first message (question) for folder name
-            user_question = ""
-            for msg in self._history[key]:
-                if msg.get("role") == "user":
-                    content = msg.get("content", "")
-                    if isinstance(content, list):
-                        for item in content:
-                            if isinstance(item, dict) and item.get("type") == "text":
-                                user_question = item.get("text", "")
-                                break
-                    else:
-                        user_question = str(content)
-                    break
+            user_question = "unknown_query"
+            if key in self._history:
+                for msg in self._history[key]:
+                    if msg.get("role") == "user":
+                        content = msg.get("content", "")
+                        if isinstance(content, list):
+                            for item in content:
+                                if isinstance(item, dict) and item.get("type") == "text":
+                                    user_question = item.get("text", "")
+                                    break
+                        else:
+                            user_question = str(content)
+                        break
             
+            # Use raw query from first web result if available and no history (for pure search debug)
+            if user_question == "unknown_query" and web_results and len(web_results) > 0:
+                 q = web_results[0].get("query", "")
+                 if q: user_question = q
+
             # Clean and truncate question
             question_part = re.sub(r'[\\/:*?"<>|\n\r\t]', '', user_question)[:20].strip()
             if not question_part:
@@ -109,6 +115,13 @@ class HistoryManager:
             # Create folder: YYYYMMDD_HHMMSS_question
             time_str = time.strftime("%Y%m%d_%H%M%S", time.localtime())
             folder_name = f"{time_str}_{question_part}"
+            
+            # Auto-resolve relative paths to absolute if needed
+            if not os.path.isabs(save_root):
+                 # Try to save next to the project root (assuming we are in src/...)
+                 # But safer to just use CWD
+                 save_root = os.path.abspath(save_root)
+            
             folder_path = os.path.join(save_root, folder_name)
             
             os.makedirs(folder_path, exist_ok=True)

entari_plugin_hyw/misc.py

@@ -103,6 +103,7 @@ async def render_refuse_answer(
     output_path: str,
     reason: str = "Instruct 专家分配此任务流程失败，请尝试提出其他问题~",
     theme_color: str = "#ef4444",
+    tab_id: str = None,
 ) -> bool:
     """
     Render a refuse-to-answer image using the provided reason.
@@ -112,6 +113,7 @@ async def render_refuse_answer(
         output_path: Path to save the output image
         reason: The refusal reason to display
         theme_color: Theme color for the card
+        tab_id: Optional tab ID for reusing a prepared browser tab
         
     Returns:
         True if render succeeded, False otherwise
@@ -131,6 +133,7 @@ async def render_refuse_answer(
         stages_used=[],
         image_timeout=1000,
         theme_color=theme_color,
+        tab_id=tab_id,
     )
 
 

entari_plugin_hyw/search_cache.py

@@ -0,0 +1,154 @@
+"""
+Search Result Cache
+
+Caches search results in memory for 10 minutes to support
+deep query operations on search results.
+"""
+
+import time
+from dataclasses import dataclass, field
+from typing import Dict, List, Any, Optional
+
+
+@dataclass
+class CacheEntry:
+    """A cached search result entry."""
+    results: List[Dict[str, Any]]
+    query: str
+    timestamp: float = field(default_factory=time.time)
+
+
+class SearchResultCache:
+    """
+    In-memory cache for search results with TTL-based expiration.
+    
+    Cleanup is lazy - performed at the end of each request.
+    """
+    
+    def __init__(self, ttl_seconds: float = 600.0):  # 10 minutes default
+        self._cache: Dict[str, CacheEntry] = {}
+        self.ttl_seconds = ttl_seconds
+    
+    def store(self, message_id: str, results: List[Dict[str, Any]], query: str):
+        """
+        Store search results associated with a message ID.
+        
+        Args:
+            message_id: The sent message ID that contains the search results image
+            results: List of search result dicts with url, title, content, etc.
+            query: The original search query
+        """
+        self._cache[message_id] = CacheEntry(
+            results=results,
+            query=query,
+            timestamp=time.time()
+        )
+    
+    def get(self, message_id: str) -> Optional[CacheEntry]:
+        """
+        Get cached search results for a message ID.
+        
+        Returns None if not found or expired.
+        """
+        entry = self._cache.get(message_id)
+        if entry is None:
+            return None
+        
+        # Check expiration
+        if time.time() - entry.timestamp > self.ttl_seconds:
+            del self._cache[message_id]
+            return None
+        
+        return entry
+    
+    def cleanup(self):
+        """
+        Remove all expired entries.
+        
+        Called lazily at the end of each request.
+        """
+        now = time.time()
+        expired_keys = [
+            k for k, v in self._cache.items()
+            if now - v.timestamp > self.ttl_seconds
+        ]
+        for k in expired_keys:
+            del self._cache[k]
+    
+    def __len__(self) -> int:
+        return len(self._cache)
+
+
+def parse_single_index(text: str) -> Optional[int]:
+    """
+    Parse a single index from text like "1" or "3".
+    
+    Args:
+        text: The text to parse
+        
+    Returns:
+        0-based index or None if not a valid single index
+    """
+    if not text:
+        return None
+    text = text.strip()
+    if text.isdigit():
+        idx = int(text)
+        if 1 <= idx <= 10:  # 1-based, max 10 results
+            return idx - 1  # Convert to 0-based
+    return None
+
+
+def parse_multi_indices(text: str, max_count: int = 3) -> Optional[List[int]]:
+    """
+    Parse multiple indices from text like "1-2", "1,2,3", "1、2、5".
+    
+    Supports:
+        - Range: "1-2", "2-4"
+        - Comma separated: "1,2,3", "1, 2, 3"
+        - Chinese comma: "1、2、5"
+        - Space separated: "1 2 3"
+        
+    Args:
+        text: The text to parse
+        max_count: Maximum number of indices allowed (default 3), returns None if exceeded
+        
+    Returns:
+        List of 0-based indices, or None if empty/invalid/exceeds max_count
+    """
+    import re
+    
+    if not text:
+        return None
+    
+    text = text.strip()
+    if not text:
+        return None
+    
+    indices = set()
+    
+    # Check for range pattern: "1-3"
+    range_match = re.match(r'^(\d+)\s*[-–]\s*(\d+)$', text)
+    if range_match:
+        start, end = int(range_match.group(1)), int(range_match.group(2))
+        if 1 <= start <= 10 and 1 <= end <= 10 and start <= end:
+            indices.update(range(start - 1, end))  # 0-based
+            if len(indices) > max_count:
+                return None  # Exceeds max
+            return sorted(indices)
+        return None
+    
+    # Split by comma, Chinese comma, or space
+    parts = re.split(r'[,、\s]+', text)
+    for part in parts:
+        part = part.strip()
+        if part.isdigit():
+            idx = int(part)
+            if 1 <= idx <= 10:
+                indices.add(idx - 1)  # 0-based
+    
+    if indices:
+        if len(indices) > max_count:
+            return None  # Exceeds max
+        return sorted(indices)
+    return None

{entari_plugin_hyw-4.0.0rc7.dist-info → entari_plugin_hyw-4.0.0rc8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 4.0.0rc7
+Version: 4.0.0rc8
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT
@@ -26,6 +26,8 @@ Requires-Dist: json-repair>=0.55.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"
+Requires-Dist: noneprompt; extra == "dev"
+Requires-Dist: rich; extra == "dev"
 
 # Entari Plugin HYW
 

entari_plugin_hyw-4.0.0rc8.dist-info/RECORD

@@ -0,0 +1,68 @@
+entari_plugin_hyw/Untitled-1,sha256=wbsr5i9iorqBMIYK4aAnpNTek3mXbhvyo2YOYw38pE4,30187
+entari_plugin_hyw/__init__.py,sha256=laQrEH-CdofBg3EEqIEOTwJu0pHlMG0wIvdQo8AycZk,35057
+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
+hyw_core/__init__.py,sha256=Jlr9Ic-BLOPTnff6OctUCdjDMdK4nssTF_vHie4QKTo,1958
+hyw_core/config.py,sha256=DHxwToUVLm1nT88gG05e3hVzSLxXMk9BjgjAnhGCADk,4918
+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/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=cuNVpNhPDnFMptgQGSM1ABTRpsYfXD95AT4ymO0DKgY,32669
+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/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
+hyw_core/browser_control/assets/card-dist/logos/deepseek.png,sha256=KWWAr9aeYMc6I07U_1qo7zcXO6e7-kfd9S2XjQumnf4,25338
+hyw_core/browser_control/assets/card-dist/logos/gemini.svg,sha256=H74CoVmx5opcCtr3Ay3M09dpqL9cd9Whkx-M6an3t7s,599
+hyw_core/browser_control/assets/card-dist/logos/google.svg,sha256=H74CoVmx5opcCtr3Ay3M09dpqL9cd9Whkx-M6an3t7s,599
+hyw_core/browser_control/assets/card-dist/logos/grok.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
+hyw_core/browser_control/assets/card-dist/logos/huggingface.png,sha256=8eAudeftUDO11jf0coOscPeRkskCb7l9TNMx78q61mY,24564
+hyw_core/browser_control/assets/card-dist/logos/microsoft.svg,sha256=-am_6N3UEQYSzldDg-xrdGYjTWsagH-3v4Q_eia1ymE,684
+hyw_core/browser_control/assets/card-dist/logos/minimax.png,sha256=tWqVlMdFNPpP8zWWX9tvIsWXI9q76P7O3t3CEZO7NU0,1525
+hyw_core/browser_control/assets/card-dist/logos/mistral.png,sha256=0vv7jPmPKiBRYVYYJxVL_wIH_qa_ZssIdV3NDO5vbmk,869
+hyw_core/browser_control/assets/card-dist/logos/nvida.png,sha256=JMITdcyjR9Lz6Gub0n1_30d0ynvV1ZSCJRcjy23qgrA,1607
+hyw_core/browser_control/assets/card-dist/logos/openai.svg,sha256=LhVwCR4qaXj6qHm31qniQTCkJ-FX932JLSycUis5kao,1692
+hyw_core/browser_control/assets/card-dist/logos/openrouter.png,sha256=exxfjWGDWpYH-Vc8xJDbhNVeXFEVxnu6TMxYIBc1WmY,1665
+hyw_core/browser_control/assets/card-dist/logos/perplexity.svg,sha256=mHWZFoeWmDYXOIDzm9pj6_sRotaI8xNy5Lkeg5Vzu70,555
+hyw_core/browser_control/assets/card-dist/logos/qwen.png,sha256=eqLbnIPbjh2_PsODU_mmqjeD82xXj8fV_kN0fDrNaD0,38419
+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=G-bjcxWMaPZoR4tUz-OcGhZDkQwkXjK234qVEFvjEbE,338
+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/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.0rc8.dist-info/METADATA,sha256=9aXeWqMNxHgWJoRBDjne-8j3TXlSaKV8XJtzKhdNZQY,3844
+entari_plugin_hyw-4.0.0rc8.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+entari_plugin_hyw-4.0.0rc8.dist-info/top_level.txt,sha256=ah76OrufRX0okOl4Fv8MO6PXiT0IaZ1oG0eDrdAPoNo,27
+entari_plugin_hyw-4.0.0rc8.dist-info/RECORD,,

{entari_plugin_hyw-4.0.0rc7.dist-info → entari_plugin_hyw-4.0.0rc8.dist-info}/WHEEL

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

{entari_plugin_hyw-4.0.0rc7.dist-info → entari_plugin_hyw-4.0.0rc8.dist-info}/top_level.txt

@@ -1 +1,2 @@
 entari_plugin_hyw
+hyw_core

hyw_core/__init__.py

@@ -0,0 +1,94 @@
+"""
+hyw-core - Core LLM Pipeline and Browser Automation
+
+This package provides:
+- HywCore: Main service class with unified query interface
+- HywCoreConfig: Configuration management with standalone/passthrough support
+- QueryRequest/QueryResponse: Request/response data classes
+- SearchService: Web search abstraction
+- ModularPipeline: LLM pipeline orchestration
+- browser_control: Browser automation subpackage
+
+Usage:
+    from hyw_core import HywCore, HywCoreConfig, QueryRequest
+    
+    # Standalone usage with YAML config
+    config = HywCoreConfig.from_yaml("config.yaml")
+    core = HywCore(config)
+    
+    response = await core.query(QueryRequest(
+        user_input="What is Python?",
+        images=[],
+        conversation_history=[]
+    ))
+    
+    # Passthrough from parent package
+    config = HywCoreConfig.from_dict({
+        "model_name": parent_config.model_name,
+        "api_key": parent_config.api_key,
+        ...
+    })
+"""
+
+__version__ = "4.0.0-rc8"
+
+# Core classes
+from .core import HywCore, QueryRequest, QueryResponse
+
+# Configuration
+from .config import HywCoreConfig, ModelConfig
+
+# Pipeline components
+from .pipeline import ModularPipeline
+from .search import SearchService
+
+# Stage components
+from .stages import (
+    BaseStage,
+    StageContext,
+    StageResult,
+
+    SummaryStage,
+)
+
+# Definitions
+from .definitions import (
+    SUMMARY_REPORT_SP,
+    get_refuse_answer_tool,
+)
+
+# Browser control is available as subpackage
+from . import browser_control
+
+__all__ = [
+    # Version
+    "__version__",
+    
+    # Core
+    "HywCore",
+    "QueryRequest", 
+    "QueryResponse",
+    
+    # Configuration
+    "HywCoreConfig",
+    "ModelConfig",
+    
+    # Pipeline
+    "ModularPipeline",
+    "SearchService",
+    
+    # Stages
+    "BaseStage",
+    "StageContext",
+    "StageResult",
+
+    "SummaryStage",
+    
+    # Definitions
+    "SUMMARY_REPORT_SP",
+    "get_refuse_answer_tool",
+
+    
+    # Subpackage
+    "browser_control",
+]

hyw_core/browser_control/__init__.py

@@ -0,0 +1,65 @@
+"""
+hyw_core.browser_control - Browser automation and rendering
+
+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
+"""
+
+from .manager import (
+    SharedBrowserManager,
+    get_shared_browser_manager,
+    close_shared_browser,
+)
+
+from .service import (
+    ScreenshotService,
+    get_screenshot_service,
+    close_screenshot_service,
+    prestart_browser,
+)
+
+from .renderer import (
+    ContentRenderer,
+    get_content_renderer,
+    set_global_renderer,
+)
+
+from .engines.base import SearchEngine
+from .engines.google import GoogleEngine
+from .engines.duckduckgo import DuckDuckGoEngine
+from .engines.default import DefaultEngine
+
+# Aliases for cleaner API
+BrowserManager = SharedBrowserManager
+PageService = ScreenshotService
+RenderService = ContentRenderer
+
+__all__ = [
+    # Browser Management
+    "BrowserManager",
+    "SharedBrowserManager", 
+    "get_shared_browser_manager",
+    "close_shared_browser",
+    
+    # Page Service
+    "PageService",
+    "ScreenshotService",
+    "get_screenshot_service",
+    "close_screenshot_service",
+    "prestart_browser",
+    
+    # Render Service
+    "RenderService",
+    "ContentRenderer",
+    "get_content_renderer",
+    "set_global_renderer",
+    
+    # Search Engines
+    "SearchEngine",
+    "GoogleEngine",
+    "DuckDuckGoEngine",
+    "DefaultEngine",
+]