entari-plugin-hyw 3.3.2__tar.gz → 3.3.4__tar.gz

{entari_plugin_hyw-3.3.2/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.3.4}/PKG-INFO

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

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "entari_plugin_hyw"
-version = "3.3.2"
+version = "3.3.4"
 description = "Use large language models to interpret chat messages"
 authors = [{name = "kumoSleeping", email = "zjr2992@outlook.com"}]
 dependencies = [

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4}/src/entari_plugin_hyw/core/config.py

@@ -17,6 +17,7 @@ class HYWConfig:
     intruct_base_url: Optional[str] = None
     search_base_url: str = "https://lite.duckduckgo.com/lite/?q={query}"
     image_search_base_url: str = "https://duckduckgo.com/?q={query}&iax=images&ia=images"
+    search_params: Optional[str] = None  # e.g. "&kl=cn-zh" for China region
     extra_body: Optional[Dict[str, Any]] = None
     temperature: float = 0.4
     max_turns: int = 10

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4}/src/entari_plugin_hyw/core/hyw.py

@@ -11,31 +11,38 @@ class HYW:
     """
     def __init__(self, config: HYWConfig):
         self.config = config
-        self.pipeline = ProcessingPipeline(config)
+        # No persistent pipeline - we create one per request to ensure thread safety
+        # self.pipeline = ProcessingPipeline(config) 
         logger.info(f"HYW V2 (Ironclad) initialized - Model: {config.model_name}")
 
     async def agent(self, user_input: str, conversation_history: List[Dict] = None, images: List[str] = None, 
                    selected_model: str = None, selected_vision_model: str = None, local_mode: bool = False) -> Dict[str, Any]:
         """
         Main entry point for the plugin (called by __init__.py).
+        Creates a fresh pipeline instance for each request to avoid state contamination (race conditions).
         """
-        # Note: 'images' handling is skipped for V2 initial stability MVP as per user focus on 'search hangs'.
-        # We can re-integrate vision later, but for now we focus on Text/Search stability.
-        
-        # Delegate completely to pipeline
-        result = await self.pipeline.execute(
-            user_input,
-            conversation_history or [],
-            model_name=selected_model,
-            images=images,
-            selected_vision_model=selected_vision_model,
-        )
-        return result
+        pipeline = ProcessingPipeline(self.config)
+        try:
+            # Delegate completely to pipeline
+            result = await pipeline.execute(
+                user_input,
+                conversation_history or [],
+                model_name=selected_model,
+                images=images,
+                selected_vision_model=selected_vision_model,
+            )
+            return result
+        finally:
+             await pipeline.close()
 
     async def close(self):
         """Explicit async close method. NO __del__."""
-        if self.pipeline:
-            await self.pipeline.close()
+        # Close shared resources
+        try:
+            from ..utils.search import close_shared_crawler
+            await close_shared_crawler()
+        except Exception:
+            pass
 
     # Legacy Compatibility (optional attributes just to prevent blind attribute errors if referenced externally)
     # in V2 we strongly discourage accessing internal tools directly.

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4}/src/entari_plugin_hyw/core/pipeline.py

@@ -1058,8 +1058,5 @@ class ProcessingPipeline:
             await self.search_service.close()
         except Exception:
             pass
-        try:
-            from ..utils.search import close_shared_crawler
-            await close_shared_crawler()
-        except Exception:
-            pass
+        # Do NOT close shared crawler here, as pipeline instances are now per-request.
+        # Shared crawler lifecycle is managed by HYW.close() or global cleanup.

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4}/src/entari_plugin_hyw/utils/prompts.py

@@ -19,7 +19,7 @@ INTRUCT_SP = """# 你是一个专业的指导专家.
   - 用户消息包含链接: 调用 crawl_page 获取内容, 无需其他工具
   - 用户消息包含典型名词、可能的专有名词组合: 调用 internal_web_search 
     - 提炼出关键词搜索关键词本身, 不添加任何其他助词, 搜索效果最好
-    - 同时调用 internal_image_search
+    - 如果用户消息关键词清晰, 使用图片搜索能搜索出诸如海报、地标、物品、角色立绘等, 调用 internal_image_search
   - 用户消息不需要搜索: 不调用工具
 - 调用 set_mode:
   - 绝大部分常规问题: standard

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4}/src/entari_plugin_hyw/utils/search.py

@@ -90,8 +90,16 @@ class SearchService:
         results: List[Dict[str, str]] = []
 
         def find_snippet(url: str, domain: str) -> str:
-            for ln in lines:
+            for i, ln in enumerate(lines):
+                # Avoid matching DDG internal links (filter by site, etc) which contain the target URL in query params
+                if "duckduckgo.com" in ln:
+                    continue
+                
                 if url in ln or (domain and domain in ln):
+                    # If this line looks like the title/link line (e.g. starts with [Title](url) or similar), 
+                    # and the NEXT line exists, return the next line as snippet.
+                    if i + 1 < len(lines) and len(ln) < 300: # heuristic: title lines are usually shorter
+                         return lines[i+1][:400]
                     return ln[:400]
             # fallback to first non-empty line
             return lines[0][:400] if lines else ""

{entari_plugin_hyw-3.3.2 → entari_plugin_hyw-3.3.4/src/entari_plugin_hyw.egg-info}/PKG-INFO

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