chatgpt-mirai-qq-bot-web-search 0.2.10__py3-none-any.whl → 0.2.12__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info → chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info}/METADATA

@@ -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.12.dist-info/RECORD

@@ -0,0 +1,11 @@
+web_search/__init__.py,sha256=_vfIxeLqXc53QoZ8sHzw_SbGkxb2CTRQdd1phQmC8GM,6147
+web_search/blocks.py,sha256=QuXt3KMuY4hUW-ucleNYXFvW6YbUAB4Xu4m_SxdCd-U,9152
+web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
+web_search/web_searcher.py,sha256=W0qOJv9cwzoxq-GKWbWiPZMshS6g0G5OB8_SS75B5f4,21761
+web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
+chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info/METADATA,sha256=n6jsXNDBGTDMwrR6-dcz6FquMFufee9gApqA-NRXa0A,1735
+chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.2.12.dist-info/RECORD,,

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)

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}")

chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/RECORD

@@ -1,11 +0,0 @@
-web_search/__init__.py,sha256=yhYI7F6dFaFSz4rKdE3BCMJ2X0x4tgp4yEVtKaLVG8Q,5995
-web_search/blocks.py,sha256=QuXt3KMuY4hUW-ucleNYXFvW6YbUAB4Xu4m_SxdCd-U,9152
-web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
-web_search/web_searcher.py,sha256=wjhe6vqhnPvxhK4ssvmCAjvefQP6iE_7CpyhhHdY4a8,21813
-web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
-chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/METADATA,sha256=ahbVLiN43oJbQ6snNcHfgLassbQ5WLlA-B2F2Dr8ZtI,1735
-chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.2.10.dist-info/RECORD,,