entari-plugin-hyw 3.5.0rc4__tar.gz → 3.5.0rc7__tar.gz

{entari_plugin_hyw-3.5.0rc4/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.5.0rc7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.5.0rc4
+Version: 3.5.0rc7
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: arclet-entari[full]>=0.16.5
 Requires-Dist: openai

{entari_plugin_hyw-3.5.0rc4 → entari_plugin_hyw-3.5.0rc7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "entari_plugin_hyw"
-version = "3.5.0-rc4"
+version = "3.5.0-rc7"
 description = "Use large language models to interpret chat messages"
 authors = [{name = "kumoSleeping", email = "zjr2992@outlook.com"}]
 dependencies = [
@@ -16,7 +16,7 @@ dependencies = [
     "jinja2>=3.0",
     "ddgs>=9.10.0",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.13"
 readme = "README.md"
 license = {text = "MIT"}
 keywords = ["entari", "llm", "ai", "bot", "chat"]

{entari_plugin_hyw-3.5.0rc4 → entari_plugin_hyw-3.5.0rc7}/src/entari_plugin_hyw/pipeline.py

@@ -798,15 +798,18 @@ class ProcessingPipeline:
             # Cancel all background image tasks on error
             if hasattr(self, '_image_search_tasks') and self._image_search_tasks:
                 for task in self._image_search_tasks:
-                    if not task.done():
-                        task.cancel()
+                    if not task.done(): task.cancel()
+                # Wait briefly for cleanup
+                await asyncio.wait(self._image_search_tasks, timeout=0.1)
                 self._image_search_tasks.clear()
+
             from .image_cache import get_image_cache
             cache = get_image_cache()
             if cache._pending:
-                for task in cache._pending.values():
-                    if not task.done():
-                        task.cancel()
+                pending_tasks = list(cache._pending.values())
+                for task in pending_tasks:
+                    if not task.done(): task.cancel()
+                await asyncio.wait(pending_tasks, timeout=0.1)
                 cache._pending.clear()
             return {
                 "llm_response": f"I encountered a critical error: {e}",
@@ -941,7 +944,7 @@ class ProcessingPipeline:
                     return f"[{unified_id_map[oid]}]"
                 if oid in image_url_map:
                     return "" # Remove standalone image citations like [5] if they aren't in ![]()
-                return match.group(0)
+                return "" # Remove hallucinated or invalid citations like [99] if not found in results
             
             return body_pattern.sub(sub_norm_ref, text)
 
@@ -993,12 +996,12 @@ class ProcessingPipeline:
                         item["is_image"] = True
                         self.all_web_results.append(item)
                     logger.info(f"Background image search completed: {len(images)} images for query '{query}'")
-                except asyncio.CancelledError:
-                    # Task was cancelled when agent ended - this is expected
-                    logger.debug(f"Background image search cancelled for query '{query}' (agent ended)")
-                    raise  # Re-raise to properly handle cancellation
-                except Exception as e:
-                    logger.error(f"Background image search failed for query '{query}': {e}")
+                except (asyncio.CancelledError, Exception) as e:
+                    # Silently handle cancellation or minor errors in background pre-warming
+                    if isinstance(e, asyncio.CancelledError):
+                        logger.debug(f"Background image search cancelled for query '{query}'")
+                    else:
+                        logger.error(f"Background image search failed for query '{query}': {e}")
             
             task = asyncio.create_task(_background_image_search())
             self._image_search_tasks.append(task)
@@ -1309,5 +1312,27 @@ class ProcessingPipeline:
             await self.search_service.close()
         except Exception:
             pass
-        # Do NOT close shared crawler here, as pipeline instances are now per-request.
-        # Shared crawler lifecycle is managed globally.
+
+        # Gracefully handle background tasks completion
+        if hasattr(self, '_image_search_tasks') and self._image_search_tasks:
+            for task in self._image_search_tasks:
+                if not task.done(): task.cancel()
+            try:
+                # Wait briefly for cancellation to propagate
+                await asyncio.wait(self._image_search_tasks, timeout=0.2)
+            except Exception: pass
+            self._image_search_tasks = []
+
+        # Also cleanup image cache pending tasks if any
+        try:
+            from .image_cache import get_image_cache
+            cache = get_image_cache()
+            if cache._pending:
+                pending = list(cache._pending.values())
+                for task in pending:
+                    if not task.done(): task.cancel()
+                await asyncio.wait(pending, timeout=0.2)
+                cache._pending.clear()
+        except Exception: pass
+        
+        self.all_web_results = []

{entari_plugin_hyw-3.5.0rc4 → entari_plugin_hyw-3.5.0rc7}/src/entari_plugin_hyw/render_vue.py

@@ -93,7 +93,7 @@ class ContentRenderer:
                 "theme_color": "#ef4444",
             }
             await self._page.evaluate("(data) => window.updateRenderData(data)", warmup_data)
-            await asyncio.sleep(0.1)  # Let Vue render
+            # await asyncio.sleep(0.1)  # Removed as requested
             logger.success("ContentRenderer: Browser + page ready!")
         except Exception as e:
             logger.error(f"ContentRenderer: Failed to start browser: {e}")
@@ -224,7 +224,7 @@ class ContentRenderer:
             await self._page.evaluate("(data) => window.updateRenderData(data)", render_data)
             
             # Wait for Vue to update DOM
-            await asyncio.sleep(0.1)
+            # await asyncio.sleep(0.1) # Removed as requested
             
             # Wait for images to load
             try:

{entari_plugin_hyw-3.5.0rc4 → entari_plugin_hyw-3.5.0rc7/src/entari_plugin_hyw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.5.0rc4
+Version: 3.5.0rc7
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: arclet-entari[full]>=0.16.5
 Requires-Dist: openai