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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.12
+Version: 0.2.14
 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 → chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info}/RECORD

@@ -1,11 +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/web_searcher.py,sha256=gYfD0K4_zTIn0pDbB2BABpw7poFuAC4mohJmQWL-3I4,21285
 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,,
+chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info/METADATA,sha256=Li4wXJNuG8jkqSQM3-EuR_X4Fx7qmopEViUjwxlzpDE,1735
+chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.2.14.dist-info/RECORD,,

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'
@@ -62,10 +62,8 @@ class WebSearcher:
     async def _ensure_initialized(self,proxy):
         """确保浏览器已初始化"""
         try:
-            if self.context:
-                return self.context
-            self.playwright = await async_playwright().start()
 
+            self.playwright = await async_playwright().start()
             # 创建用户数据目录路径
             user_data_dir = os.path.join(os.path.expanduser("~"), ".playwright_user_data")+f'{random.randint(1, 1000000)}'
             os.makedirs(user_data_dir, exist_ok=True)
@@ -106,7 +104,6 @@ class WebSearcher:
                     user_data_dir=user_data_dir,
                     **context_options
                 )
-
                 self.browser = None  # 不再需要单独的browser引用
 
             except Exception as e:
@@ -148,7 +145,6 @@ class WebSearcher:
 
         except Exception as e:
             logger.error(f"Failed to initialize WebSearcher: {e}")
-            await self.close()
             raise
 
     async def simulate_human_scroll(self, page):
@@ -260,7 +256,6 @@ class WebSearcher:
                                 wait_until='load',
                                 timeout=timeout * 1000
                             )
-
             # 使用搜索引擎特定的选择器
             results = None
 
@@ -268,7 +263,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 +292,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 +337,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 +481,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()