chatgpt-mirai-qq-bot-web-search 0.2.10__tar.gz → 0.2.12__tar.gz

{chatgpt-mirai-qq-bot-web-search-0.2.10 → chatgpt-mirai-qq-bot-web-search-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.10
+Version: 0.2.12
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir

{chatgpt-mirai-qq-bot-web-search-0.2.10 → chatgpt-mirai-qq-bot-web-search-0.2.12}/chatgpt_mirai_qq_bot_web_search.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.10
+Version: 0.2.12
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir

{chatgpt-mirai-qq-bot-web-search-0.2.10 → chatgpt-mirai-qq-bot-web-search-0.2.12}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import io
 import os
 
-version = os.environ.get('RELEASE_VERSION', '0.2.10'
+version = os.environ.get('RELEASE_VERSION', '0.2.12'
 '').lstrip('v')
 
 setup(

{chatgpt-mirai-qq-bot-web-search-0.2.10 → chatgpt-mirai-qq-bot-web-search-0.2.12}/web_search/__init__.py

@@ -45,7 +45,8 @@ class WebSearchPlugin(Plugin):
                 )
                 stdout, stderr = process.communicate()
                 if process.returncode != 0:
-                    raise RuntimeError(f"Failed to install playwright browsers: {stderr.stderr}")
+                    logger.error(f"Failed to install playwright browsers: {stderr}")
+                    raise RuntimeError(f"Failed to install playwright browsers: {stderr}")
         except Exception as e:
             logger.info("Installing playwright browsers...")
             process = subprocess.Popen(
@@ -55,7 +56,8 @@ class WebSearchPlugin(Plugin):
             )
             stdout, stderr = process.communicate()
             if process.returncode != 0:
-                raise RuntimeError(f"Failed to install playwright browsers: {stderr.stderr}")
+                logger.error(f"Failed to install playwright browsers: {stderr}")
+                raise RuntimeError(f"Failed to install playwright browsers: {stderr}")
         # 注册Block
         try:
             self.block_registry.register("web_search", "search", WebSearchBlock)

{chatgpt-mirai-qq-bot-web-search-0.2.10 → chatgpt-mirai-qq-bot-web-search-0.2.12}/web_search/web_searcher.py

@@ -163,9 +163,9 @@ class WebSearcher:
             # 创建新标签页获取内容
             page = await context.new_page()
             try:
-                # 修改资源加载策略，允许加载必要的CSS
+                # 设置更严格的资源加载策略
                 await page.route("**/*", lambda route: route.abort()
-                    if route.request.resource_type in ['image', 'font', 'media']  # 移除 'stylesheet'
+                    if route.request.resource_type in ['image', 'stylesheet', 'font', 'media']
                     else route.continue_())
 
                 # 使用 domcontentloaded 而不是 networkidle
@@ -263,8 +263,6 @@ class WebSearcher:
 
             # 使用搜索引擎特定的选择器
             results = None
-            # 等待页面稳定
-            await asyncio.sleep(2)  # 添加短暂延迟
 
             # 对于Google，让页面有更多时间加载
             if engine == 'google':
@@ -344,9 +342,10 @@ class WebSearcher:
             logger.error(f"Search failed - Query: {query} - Error: {e}", exc_info=True)
             return f"搜索失败: {str(e)}"
         finally:
-            if page:
+            if context:
                 try:
-                    await page.close()
+                    logger.debug("context.close")
+                    await context.close()
                 except Exception as e:
                     logger.error(f"Error closing page: {e}")
 
@@ -491,8 +490,8 @@ class WebSearcher:
             logger.error(f"抖音视频搜索失败 - 关键词: {keyword} - 错误: {e}", exc_info=True)
             return f"搜索失败: {str(e)}"
         finally:
-            if page:
+            if context:
                 try:
-                    await page.close()
+                    await context.close()
                 except Exception as e:
                     logger.error(f"关闭页面错误: {e}")