entari-plugin-hyw 3.3.3__tar.gz → 3.3.5__tar.gz

{entari_plugin_hyw-3.3.3/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.3.5}/PKG-INFO

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

{entari_plugin_hyw-3.3.3 → entari_plugin_hyw-3.3.5}/pyproject.toml

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

{entari_plugin_hyw-3.3.3 → entari_plugin_hyw-3.3.5}/src/entari_plugin_hyw/core/config.py

@@ -18,6 +18,7 @@ class HYWConfig:
     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
+    search_limit: int = 8 
     extra_body: Optional[Dict[str, Any]] = None
     temperature: float = 0.4
     max_turns: int = 10

{entari_plugin_hyw-3.3.3 → entari_plugin_hyw-3.3.5}/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.3 → entari_plugin_hyw-3.3.5}/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.3 → entari_plugin_hyw-3.3.5}/src/entari_plugin_hyw/utils/prompts.py

@@ -62,6 +62,7 @@ AGENT_SP = """# 你是一个 Agent 总控专家, 你需要理解用户意图,
 - 工具引用: 
   - 搜索摘要引用: 使用 `search:数字id` 如 `search:3`
   - 页面内容引用: 使用 `page:数字id` 如 `page:5`
+  - 图片内容不引用
   - 每个引用必须分开标注
   - 在正文底部添加 references 代码块:
     - 用不到的条目不写, 没有专家给信息就不写.

{entari_plugin_hyw-3.3.3 → entari_plugin_hyw-3.3.5}/src/entari_plugin_hyw/utils/search.py

@@ -33,7 +33,7 @@ class SearchService:
     """
     def __init__(self, config: Any):
         self.config = config
-        self._default_limit = 8
+        self._default_limit = getattr(config, "search_limit", 8)
         self._crawler: Optional[AsyncWebCrawler] = None
 
     def _build_search_url(self, query: str) -> str:

{entari_plugin_hyw-3.3.3 → entari_plugin_hyw-3.3.5/src/entari_plugin_hyw.egg-info}/PKG-INFO

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