chatgpt-mirai-qq-bot-web-search 0.2.11__tar.gz → 0.2.13__tar.gz

{chatgpt-mirai-qq-bot-web-search-0.2.11 → chatgpt-mirai-qq-bot-web-search-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.11
+Version: 0.2.13
 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.11 → chatgpt-mirai-qq-bot-web-search-0.2.13}/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.11
+Version: 0.2.13
 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.11 → chatgpt-mirai-qq-bot-web-search-0.2.13}/setup.py

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

{chatgpt-mirai-qq-bot-web-search-0.2.11 → chatgpt-mirai-qq-bot-web-search-0.2.13}/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.11 → chatgpt-mirai-qq-bot-web-search-0.2.13}/web_search/web_searcher.py

@@ -31,8 +31,8 @@ class WebSearcher:
         self.video_ids = self._load_video_ids()
         self.search_engines = {
             'bing': {
-                'url': 'https://cn.bing.com/search?q={}',
-                'selectors': ['.b_algo', '#b_results .b_algo', 'main .b_algo'],
+                'url': 'https://www.bing.com/search?q={}',
+                'selectors': ['.b_algo'],
                 'title_selector': 'h2',
                 'link_selector': 'h2 a',
                 'snippet_selector': '.b_caption p'
@@ -260,7 +260,6 @@ class WebSearcher:
                                 wait_until='load',
                                 timeout=timeout * 1000
                             )
-
             # 使用搜索引擎特定的选择器
             results = None
 
@@ -268,7 +267,7 @@ class WebSearcher:
             if engine == 'google':
                 await self.simulate_human_scroll(page)
 
-            selector_timeout = 5000
+            selector_timeout = timeout * 1000
             for selector in engine_config['selectors']:
                 try:
                     logger.info(f"Trying selector: {selector}")
@@ -297,7 +296,7 @@ class WebSearcher:
                     await self.simulate_human_scroll(page)
 
                     # 重新尝试所有选择器
-                    selector_timeout = 5000
+                    selector_timeout = timeout * 1000
                     for selector in engine_config['selectors']:
                         try:
                             logger.info(f"Retrying selector: {selector}")
@@ -342,12 +341,8 @@ class WebSearcher:
             logger.error(f"Search failed - Query: {query} - Error: {e}", exc_info=True)
             return f"搜索失败: {str(e)}"
         finally:
-            if context:
-                try:
-                    logger.debug("context.close")
-                    await context.close()
-                except Exception as e:
-                    logger.error(f"Error closing page: {e}")
+            await self.close()
+
 
     async def close(self):
         """关闭浏览器"""
@@ -490,8 +485,4 @@ class WebSearcher:
             logger.error(f"抖音视频搜索失败 - 关键词: {keyword} - 错误: {e}", exc_info=True)
             return f"搜索失败: {str(e)}"
         finally:
-            if context:
-                try:
-                    await context.close()
-                except Exception as e:
-                    logger.error(f"关闭页面错误: {e}")
+            await self.close()