chatgpt-mirai-qq-bot-web-search 0.2.6__py3-none-any.whl → 0.2.7__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info → chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
 web_search/__init__.py,sha256=bpu1gpf9tq3mOAoaGMM-8S6GBw2GzRAG6ClHGlp-CVw,4607
 web_search/blocks.py,sha256=QuXt3KMuY4hUW-ucleNYXFvW6YbUAB4Xu4m_SxdCd-U,9152
 web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
-web_search/web_searcher.py,sha256=760WTBGusxYntigGi5Wsbm2rRHEWq3sTwfNlf3ew3b0,20919
+web_search/web_searcher.py,sha256=Bgnc0HGXZkMULZ5BWCJxBUzLFew19LuTL7lmdeqmfWs,21384
 web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
-chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info/METADATA,sha256=88y-xtYK-se7dwVVU2_fcXx_rGCUEgIxWMJvjI4Dfwg,1734
-chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.2.6.dist-info/RECORD,,
+chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info/METADATA,sha256=88N33AlLdzPyW0GtLU8eDH0qGEKbqmHpl0UYooIU2-E,1734
+chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.2.7.dist-info/RECORD,,

web_search/web_searcher.py

@@ -268,10 +268,12 @@ class WebSearcher:
             if engine == 'google':
                 await self.simulate_human_scroll(page)
 
+            timeout = 5000
             for selector in engine_config['selectors']:
                 try:
                     logger.info(f"Trying selector: {selector}")
-                    await page.wait_for_selector(selector, timeout=8000)  # 增加等待时间
+                    await page.wait_for_selector(selector, timeout=timeout)  # 增加等待时间
+                    timeout = 500
                     results = await page.query_selector_all(selector)
                     if results and len(results) > 0:
                         logger.info(f"Found {len(results)} results with selector {selector}")
@@ -281,28 +283,36 @@ class WebSearcher:
                     continue
 
             if not results:
-                # 尝试直接使用 JavaScript 获取元素
-                if engine == 'google':
-                    try:
-                        # 使用更通用的JavaScript选择器尝试获取结果
-                        results = await page.evaluate("""
-                            () => {
-                                const elements = document.querySelectorAll('div[data-sokoban-container], div.g, .MjjYud');
-                                return Array.from(elements).length;
-                            }
-                        """)
-                        logger.info(f"JavaScript found {results} elements")
-
-                        # 如果找到了元素，使用evaluate来处理它们
-                        if results > 0:
-                            # 自定义处理逻辑...
-                            pass
-                    except Exception as e:
-                        logger.error(f"JavaScript evaluation failed: {e}")
-
-                logger.error("No search results found with any selector")
-                await page.screenshot(path=f'search_failed_{engine}.png')
-                return "搜索结果加载失败"
+                # 添加重试机制
+                retry_count = 0
+                while not results and retry_count < max_results:
+                    logger.info(f"Retrying search, attempt {retry_count + 1}/{max_results}")
+                    # 刷新页面重试
+                    await page.reload(wait_until='load', timeout=timeout * 1000)
+                    await self.simulate_human_scroll(page)
+
+                    # 重新尝试所有选择器
+                    timeout = 5000
+                    for selector in engine_config['selectors']:
+                        try:
+                            logger.info(f"Retrying selector: {selector}")
+                            await page.wait_for_selector(selector, timeout=timeout)
+                            timeout = 500
+                            results = await page.query_selector_all(selector)
+                            if results and len(results) > 0:
+                                logger.info(f"Found {len(results)} results with selector {selector} on retry {retry_count + 1}")
+                                break
+                        except Exception as e:
+                            logger.warning(f"Selector {selector} failed on retry {retry_count + 1}: {e}")
+                            continue
+
+                    retry_count += 1
+
+
+                # 如果所有重试都失败了，才返回错误
+                if not results:
+                    logger.error("No search results found after all retries")
+                    return "搜索结果加载失败"
 
             logger.info(f"Found {len(results)} search results")