From 2f1a9fa966e810166c096be61c161adbc0f9973b Mon Sep 17 00:00:00 2001 From: minecraft1024a Date: Thu, 21 Aug 2025 21:09:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor(cleanup):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E5=AF=BC=E5=85=A5=E9=A1=B9?= =?UTF-8?q?=E4=B8=8E=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 清理了整个代码库中所有无用的模块导入、重复定义以及冗余变量引用，具体包括： - bot.py 去掉了 random、typing 的未使用 import - antipromptinjector 模块统一移除未引用的 DetectionResult、Dict、List 等 - chat_loop 中删除了未调用的 Timer、mai_thinking_manager、events_manager 等引用 - qzone_service 删除多余 f-string 大括号，避免日志警告格式问题 - 其他模块同步剔除各自范围内的冗余 import（asyncio、datetime 等共 20+ 处） 保持功能不变，仅作代码整洁度优化，无破坏性变更。(并添加了一个现在暂时还没加进去的必应搜索源文件) --- bot.py | 2 - src/chat/antipromptinjector/anti_injector.py | 2 +- .../decision/decision_maker.py | 1 - src/chat/antipromptinjector/decision_maker.py | 1 - .../management/statistics.py | 2 +- src/chat/chat_loop/cycle_processor.py | 5 +- src/chat/chat_loop/heartFC_chat.py | 1 - src/chat/chat_loop/hfc_context.py | 2 +- src/chat/chat_loop/proactive_thinker.py | 2 +- src/chat/chat_loop/response_handler.py | 2 +- src/common/database/monthly_plan_db.py | 1 - src/llm_models/model_client/gemini_client.py | 2 +- src/plugin_system/core/plugin_manager.py | 1 - .../built_in/WEB_SEARCH_TOOL/bing_search.py | 439 ++++++++++++++++++ .../core_actions/anti_injector_manager.py | 3 +- .../services/qzone_service.py | 2 +- tests/test_wakeup_system.py | 3 +- 17 files changed, 449 insertions(+), 22 deletions(-) create mode 100644 src/plugins/built_in/WEB_SEARCH_TOOL/bing_search.py diff --git a/bot.py b/bot.py index 02e763985..ae37609b6 100644 --- a/bot.py +++ b/bot.py @@ -1,13 +1,11 @@ import asyncio import hashlib import os -import random import sys import time import platform import traceback from pathlib import Path -from typing import List, Optional, Sequence from dotenv import load_dotenv from rich.traceback import install from colorama import init, Fore diff --git a/src/chat/antipromptinjector/anti_injector.py b/src/chat/antipromptinjector/anti_injector.py index a1a1314d9..32df26349 100644 --- a/src/chat/antipromptinjector/anti_injector.py +++ b/src/chat/antipromptinjector/anti_injector.py @@ -17,7 +17,7 @@ from typing import Optional, Tuple, Dict, Any from src.common.logger import get_logger from src.config.config import global_config from src.chat.message_receive.message import MessageRecv -from .types import DetectionResult, ProcessResult +from .types import ProcessResult from .core import PromptInjectionDetector, MessageShield from .processors import should_skip_injection_detection, initialize_skip_list, MessageProcessor from .management import AntiInjectionStatistics, UserBanManager diff --git a/src/chat/antipromptinjector/decision/decision_maker.py b/src/chat/antipromptinjector/decision/decision_maker.py index 4264e8100..51218db1d 100644 --- a/src/chat/antipromptinjector/decision/decision_maker.py +++ b/src/chat/antipromptinjector/decision/decision_maker.py @@ -5,7 +5,6 @@ 负责根据检测结果和配置决定如何处理消息 """ -from typing import Dict, List from src.common.logger import get_logger from ..types import DetectionResult diff --git a/src/chat/antipromptinjector/decision_maker.py b/src/chat/antipromptinjector/decision_maker.py index 6f2a52834..c717cd485 100644 --- a/src/chat/antipromptinjector/decision_maker.py +++ b/src/chat/antipromptinjector/decision_maker.py @@ -5,7 +5,6 @@ 负责根据检测结果和配置决定如何处理消息 """ -from typing import Dict, List from src.common.logger import get_logger from .types import DetectionResult diff --git a/src/chat/antipromptinjector/management/statistics.py b/src/chat/antipromptinjector/management/statistics.py index 377a51e2a..813f3f87d 100644 --- a/src/chat/antipromptinjector/management/statistics.py +++ b/src/chat/antipromptinjector/management/statistics.py @@ -6,7 +6,7 @@ """ import datetime -from typing import Dict, Any, Optional +from typing import Dict, Any from src.common.logger import get_logger from src.common.database.sqlalchemy_models import AntiInjectionStats, get_db_session diff --git a/src/chat/chat_loop/cycle_processor.py b/src/chat/chat_loop/cycle_processor.py index 59eefd181..2f07dbb2d 100644 --- a/src/chat/chat_loop/cycle_processor.py +++ b/src/chat/chat_loop/cycle_processor.py @@ -5,12 +5,9 @@ from typing import Optional, Dict, Any from src.common.logger import get_logger from src.config.config import global_config -from src.chat.utils.timer_calculator import Timer from src.chat.planner_actions.planner import ActionPlanner from src.chat.planner_actions.action_modifier import ActionModifier -from src.plugin_system.core import events_manager -from src.plugin_system.base.component_types import EventType, ChatMode -from src.mais4u.mai_think import mai_thinking_manager +from src.plugin_system.base.component_types import ChatMode from src.mais4u.constant_s4u import ENABLE_S4U from src.chat.chat_loop.hfc_utils import send_typing, stop_typing from .hfc_context import HfcContext diff --git a/src/chat/chat_loop/heartFC_chat.py b/src/chat/chat_loop/heartFC_chat.py index b9fcf058b..60db03302 100644 --- a/src/chat/chat_loop/heartFC_chat.py +++ b/src/chat/chat_loop/heartFC_chat.py @@ -5,7 +5,6 @@ from typing import Optional from src.common.logger import get_logger from src.config.config import global_config -from src.chat.message_receive.chat_stream import get_chat_manager from src.person_info.relationship_builder_manager import relationship_builder_manager from src.chat.express.expression_learner import expression_learner_manager from src.plugin_system.base.component_types import ChatMode diff --git a/src/chat/chat_loop/hfc_context.py b/src/chat/chat_loop/hfc_context.py index 85cdbbc84..3aa376082 100644 --- a/src/chat/chat_loop/hfc_context.py +++ b/src/chat/chat_loop/hfc_context.py @@ -1,4 +1,4 @@ -from typing import List, Optional, Dict, Any, TYPE_CHECKING +from typing import List, Optional, TYPE_CHECKING import time from src.chat.message_receive.chat_stream import ChatStream, get_chat_manager from src.person_info.relationship_builder_manager import RelationshipBuilder diff --git a/src/chat/chat_loop/proactive_thinker.py b/src/chat/chat_loop/proactive_thinker.py index 1422528c1..243571aa8 100644 --- a/src/chat/chat_loop/proactive_thinker.py +++ b/src/chat/chat_loop/proactive_thinker.py @@ -1,7 +1,7 @@ import asyncio import time import traceback -from typing import Optional, Dict, Any, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING from src.common.logger import get_logger from src.config.config import global_config diff --git a/src/chat/chat_loop/response_handler.py b/src/chat/chat_loop/response_handler.py index 6d4292d22..d52908190 100644 --- a/src/chat/chat_loop/response_handler.py +++ b/src/chat/chat_loop/response_handler.py @@ -1,7 +1,7 @@ import time import random import traceback -from typing import Optional, Dict, Any, List, Tuple +from typing import Optional, Dict, Any, Tuple from src.common.logger import get_logger from src.config.config import global_config diff --git a/src/common/database/monthly_plan_db.py b/src/common/database/monthly_plan_db.py index 2bff98b22..811e7c6f5 100644 --- a/src/common/database/monthly_plan_db.py +++ b/src/common/database/monthly_plan_db.py @@ -1,6 +1,5 @@ # mmc/src/common/database/monthly_plan_db.py -import datetime from typing import List from src.common.database.sqlalchemy_models import MonthlyPlan, get_db_session from src.common.logger import get_logger diff --git a/src/llm_models/model_client/gemini_client.py b/src/llm_models/model_client/gemini_client.py index 9bda858ef..0b5375935 100644 --- a/src/llm_models/model_client/gemini_client.py +++ b/src/llm_models/model_client/gemini_client.py @@ -1,7 +1,7 @@ import asyncio import io import base64 -from typing import Callable, AsyncIterator, Optional, Coroutine, Any, List, Dict, Union +from typing import Callable, AsyncIterator, Optional, Coroutine, Any, List, Dict import google.generativeai as genai from google.generativeai.types import ( diff --git a/src/plugin_system/core/plugin_manager.py b/src/plugin_system/core/plugin_manager.py index 73c4ab34c..3beeca68b 100644 --- a/src/plugin_system/core/plugin_manager.py +++ b/src/plugin_system/core/plugin_manager.py @@ -13,7 +13,6 @@ from src.plugin_system.base.plugin_base import PluginBase from src.plugin_system.base.component_types import ComponentType from src.plugin_system.utils.manifest_utils import VersionComparator from .component_registry import component_registry -import asyncio from src.chat.antipromptinjector.processors.command_skip_list import skip_list_manager diff --git a/src/plugins/built_in/WEB_SEARCH_TOOL/bing_search.py b/src/plugins/built_in/WEB_SEARCH_TOOL/bing_search.py new file mode 100644 index 000000000..185203893 --- /dev/null +++ b/src/plugins/built_in/WEB_SEARCH_TOOL/bing_search.py @@ -0,0 +1,439 @@ +from src.common.logger import get_logger +from bs4 import BeautifulSoup +import requests +import random +import os +import traceback + +logger = get_logger("search_bing") + +ABSTRACT_MAX_LENGTH = 300 # abstract max length + +user_agents = [ + # Edge浏览器 + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0", + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", + # Chrome浏览器 + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36", + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36", + # Firefox浏览器 + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:123.0) Gecko/20100101 Firefox/123.0", + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:123.0) Gecko/20100101 Firefox/123.0", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0", + # Safari浏览器 + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Safari/605.1.15", + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15", + # 移动端浏览器 + "Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1", + "Mozilla/5.0 (iPad; CPU OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1", + "Mozilla/5.0 (Linux; Android 14; SM-S918B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36", + # 搜索引擎爬虫 (模拟) + "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)", + "Mozilla/5.0 (compatible; Bingbot/2.0; +http://www.bing.com/bingbot.htm)", + "Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)", +] + +# 请求头信息 +HEADERS = { + "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", + "Accept-Encoding": "gzip, deflate, br", + "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6", + "Cache-Control": "max-age=0", + "Connection": "keep-alive", + "Host": "www.bing.com", + "Referer": "https://www.bing.com/", + "Sec-Ch-Ua": '"Chromium";v="122", "Microsoft Edge";v="122", "Not-A.Brand";v="99"', + "Sec-Ch-Ua-Mobile": "?0", + "Sec-Ch-Ua-Platform": '"Windows"', + "Sec-Fetch-Dest": "document", + "Sec-Fetch-Mode": "navigate", + "Sec-Fetch-Site": "same-origin", + "Sec-Fetch-User": "?1", + "Upgrade-Insecure-Requests": "1", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", +} + +# 替代的中国区必应请求头 +CN_BING_HEADERS = { + "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", + "Accept-Encoding": "gzip, deflate, br", + "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6", + "Cache-Control": "max-age=0", + "Connection": "keep-alive", + "Host": "cn.bing.com", + "Referer": "https://cn.bing.com/", + "Sec-Ch-Ua": '"Chromium";v="122", "Microsoft Edge";v="122", "Not-A.Brand";v="99"', + "Sec-Ch-Ua-Mobile": "?0", + "Sec-Ch-Ua-Platform": '"Windows"', + "Sec-Fetch-Dest": "document", + "Sec-Fetch-Mode": "navigate", + "Sec-Fetch-Site": "same-origin", + "Sec-Fetch-User": "?1", + "Upgrade-Insecure-Requests": "1", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0", +} + +bing_host_url = "https://www.bing.com" +bing_search_url = "https://www.bing.com/search?q=" +cn_bing_host_url = "https://cn.bing.com" +cn_bing_search_url = "https://cn.bing.com/search?q=" + + +class BingSearch: + session = requests.Session() + session.headers = HEADERS + + def search(self, keyword, num_results=10): + """ + 通过关键字进行搜索 + :param keyword: 关键字 + :param num_results： 指定返回的结果个数 + :return: 结果列表 + """ + if not keyword: + return None + + list_result = [] + page = 1 + + # 起始搜索的url + next_url = bing_search_url + keyword + + # 循环遍历每一页的搜索结果，并返回下一页的url + while len(list_result) < num_results: + data, next_url = self.parse_html(next_url, rank_start=len(list_result)) + if data: + list_result += data + logger.debug( + "---searching[{}], finish parsing page {}, results number={}: ".format(keyword, page, len(data)) + ) + for d in data: + logger.debug(str(d)) + + if not next_url: + logger.debug("already search the last page。") + break + page += 1 + + logger.debug("\n---search [{}] finished. total results number={}！".format(keyword, len(list_result))) + return list_result[:num_results] if len(list_result) > num_results else list_result + + def parse_html(self, url, rank_start=0, debug=0): + """ + 解析处理结果 + :param url: 需要抓取的 url + :return: 结果列表，下一页的url + """ + try: + logger.debug("--search_bing-------url: {}".format(url)) + + # 确定是国际版还是中国版必应 + is_cn_bing = "cn.bing.com" in url + + # 保存当前URL以便调试 + query_part = url.split("?q=")[1] if "?q=" in url else "unknown_query" + debug_filename = f"debug/bing_{'cn' if is_cn_bing else 'www'}_search_{query_part[:30]}.html" + + # 设置必要的Cookie + cookies = { + "SRCHHPGUSR": "SRCHLANG=zh-Hans", # 设置默认搜索语言为中文 + "SRCHD": "AF=NOFORM", + "SRCHUID": "V=2&GUID=1A4D4F1C8844493F9A2E3DB0D1BC806C", + "_SS": "SID=0D89D9A3C95C60B62E7AC80CC85461B3", + "_EDGE_S": "ui=zh-cn", # 设置界面语言为中文 + "_EDGE_V": "1", + } + + # 使用适当的请求头 + # 为每次请求随机选择不同的用户代理，降低被屏蔽风险 + headers = CN_BING_HEADERS.copy() if is_cn_bing else HEADERS.copy() + headers["User-Agent"] = random.choice(user_agents) + + # 为不同域名使用不同的Session，避免Cookie污染 + session = requests.Session() + session.headers.update(headers) + session.cookies.update(cookies) + + # 添加超时和重试，降低超时时间并允许重试 + try: + res = session.get( + url=url, timeout=(3.05, 6), verify=True, allow_redirects=True + ) # 超时分别为连接超时和读取超时 + except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as e: + # 如果第一次尝试超时，使用更宽松的设置再试一次 + logger.warning(f"第一次请求超时，正在重试: {str(e)}") + try: + # 第二次尝试使用更长的超时时间 + res = session.get(url=url, timeout=(5, 10), verify=False) # 忽略SSL验证 + except Exception as e2: + logger.error(f"第二次请求也失败: {str(e2)}") + # 如果所有尝试都失败，返回空结果 + return [], None + + res.encoding = "utf-8" + + # 保存响应内容以便调试 + os.makedirs("debug", exist_ok=True) + with open(debug_filename, "w", encoding="utf-8") as f: + f.write(res.text) + + # 检查响应状态 + logger.debug(f"--search_bing-------status_code: {res.status_code}") + if res.status_code == 403: + logger.error("被禁止访问 (403 Forbidden)，可能是IP被限制") + # 如果被禁止，返回空结果 + return [], None + + if res.status_code != 200: + logger.error(f"必应搜索请求失败，状态码: {res.status_code}") + return None, None + + # 检查是否被重定向到登录页面或验证页面 + if "login.live.com" in res.url or "login.microsoftonline.com" in res.url: + logger.error("被重定向到登录页面，可能需要登录") + return None, None + + if "https://www.bing.com/ck/a" in res.url: + logger.error("被重定向到验证页面，可能被识别为机器人") + return None, None + + # 解析HTML - 添加对多种解析器的支持 + try: + # 首先尝试使用lxml解析器 + root = BeautifulSoup(res.text, "lxml") + except Exception as e: + logger.warning(f"lxml解析器不可用: {str(e)}，尝试使用html.parser") + try: + # 如果lxml不可用，使用内置解析器 + root = BeautifulSoup(res.text, "html.parser") + except Exception as e2: + logger.error(f"HTML解析失败: {str(e2)}") + return None, None + + # 保存解析结果的一小部分用于调试 + sample_html = str(root)[:1000] if root else "" + logger.debug(f"HTML解析结果示例: {sample_html}") + + list_data = [] + + # 确保我们能获取到内容 - 先尝试直接提取链接 + all_links = root.find_all("a") + + # 记录链接总数，帮助诊断 + logger.debug(f"页面中总共找到了 {len(all_links)} 个链接") + + # 保存一些链接示例到日志 + sample_links = [] + for i, link in enumerate(all_links): + if i < 10: # 只记录前10个链接 + sample_links.append({"text": link.text.strip(), "href": link.get("href", "")}) + logger.debug(f"链接示例: {sample_links}") + + # 尝试多种选择器查找搜索结果 + search_results = [] + + # 方法0：查找动态提取的结果 + # 尝试查找包含完整结果项的父容器 + result_containers = [] + # 一些可能的结果容器选择器 + container_selectors = [ + "ol#b_results", + "div.b_searchResults", + "div#b_content", + "div.srchrslt_main", + "div.mspg_cont", + "div.ms-srchResult-results", + "div#ContentAll", + "div.resultlist", + ] + + for selector in container_selectors: + containers = root.select(selector) + if containers: + logger.debug(f"找到可能的结果容器: {selector}, 数量: {len(containers)}") + result_containers.extend(containers) + + # 如果找到容器，尝试在容器中寻找有价值的链接 + extracted_items = [] + if result_containers: + for container in result_containers: + # 查找标题元素（h1, h2, h3, h4） + for heading in container.find_all(["h1", "h2", "h3", "h4", "strong", "b"]): + # 如果标题元素包含链接，这很可能是搜索结果的标题 + link = heading.find("a") + if link and link.get("href") and link.text.strip(): + url = link.get("href") + title = link.text.strip() + + # 如果是有效的外部链接 + if ( + not url.startswith("javascript:") + and not url.startswith("#") + and not any(x in url for x in ["bing.com/search", "bing.com/images"]) + ): + # 查找摘要：尝试找到相邻的段落元素 + abstract = "" + # 尝试在标题后面查找摘要 + next_elem = heading.next_sibling + while next_elem and not abstract: + if hasattr(next_elem, "name") and next_elem.name in ["p", "div", "span"]: + abstract = next_elem.text.strip() + break + next_elem = next_elem.next_sibling + + # 如果没找到，尝试在父元素内查找其他段落 + if not abstract: + parent = heading.parent + for p in parent.find_all( + ["p", "div"], + class_=lambda c: c + and any( + x in str(c) for x in ["desc", "abstract", "snippet", "caption", "summary"] + ), + ): + if p != heading: + abstract = p.text.strip() + break + + # 创建结果项 + extracted_items.append( + { + "title": title, + "url": url, + "abstract": abstract, + } + ) + logger.debug(f"提取到搜索结果: {title}") + + # 如果找到了结果，添加到列表 + if extracted_items: + for rank, item in enumerate(extracted_items, start=rank_start + 1): + # 裁剪摘要长度 + abstract = item["abstract"] + if ABSTRACT_MAX_LENGTH and len(abstract) > ABSTRACT_MAX_LENGTH: + abstract = abstract[:ABSTRACT_MAX_LENGTH] + + list_data.append({"title": item["title"], "abstract": abstract, "url": item["url"], "rank": rank}) + logger.debug(f"从容器中提取了 {len(list_data)} 个搜索结果") + if list_data: + return list_data, None + + # 如果上面的方法没有找到结果，尝试通用链接提取 + valid_links = [] + for link in all_links: + href = link.get("href", "") + text = link.text.strip() + + # 有效的搜索结果链接通常有这些特点 + if ( + href + and text + and len(text) > 10 # 标题通常比较长 + and not href.startswith("javascript:") + and not href.startswith("#") + and not any( + x in href + for x in [ + "bing.com/search", + "bing.com/images", + "bing.com/videos", + "bing.com/maps", + "bing.com/news", + "login", + "account", + "javascript", + "about.html", + "help.html", + "microsoft", + ] + ) + and "http" in href + ): # 必须是有效URL + valid_links.append(link) + + # 按文本长度排序，更长的文本更可能是搜索结果标题 + valid_links.sort(key=lambda x: len(x.text.strip()), reverse=True) + + if valid_links: + logger.debug(f"找到 {len(valid_links)} 个可能的搜索结果链接") + + # 提取前10个作为搜索结果 + for rank, link in enumerate(valid_links[:10], start=rank_start + 1): + href = link.get("href", "") + text = link.text.strip() + + # 获取摘要 + abstract = "" + # 尝试获取父元素的文本作为摘要 + parent = link.parent + if parent and parent.text: + full_text = parent.text.strip() + if len(full_text) > len(text): + abstract = full_text.replace(text, "", 1).strip() + + # 如果没有找到好的摘要，尝试查找相邻元素 + if len(abstract) < 20: + next_elem = link.next_sibling + while next_elem and len(abstract) < 20: + if hasattr(next_elem, "text") and next_elem.text.strip(): + abstract = next_elem.text.strip() + break + next_elem = next_elem.next_sibling + + # 裁剪摘要长度 + if ABSTRACT_MAX_LENGTH and len(abstract) > ABSTRACT_MAX_LENGTH: + abstract = abstract[:ABSTRACT_MAX_LENGTH] + + list_data.append({"title": text, "abstract": abstract, "url": href, "rank": rank}) + logger.debug(f"提取到备选搜索结果 #{rank}: {text}") + + # 如果找到了结果，返回 + if list_data: + logger.debug(f"通过备选方法提取了 {len(list_data)} 个搜索结果") + return list_data, None + + # 检查是否有错误消息 + error_msg = root.find("div", class_="b_searcherrmsg") + if error_msg: + logger.error(f"必应搜索返回错误: {error_msg.text.strip()}") + + # 找到下一页按钮 (尝试多种可能的选择器) + next_url = None + + # 方式1: 标准下一页按钮 + pagination_classes = ["b_widePag sb_bp", "b_pag"] + for cls in pagination_classes: + next_page = root.find("a", class_=cls) + if next_page and any(txt in next_page.text for txt in ["下一页", "Next", "下页"]): + next_url = next_page.get("href", "") + if next_url and not next_url.startswith("http"): + next_url = (cn_bing_host_url if is_cn_bing else bing_host_url) + next_url + break + + # 方式2: 备用下一页按钮 + if not next_url: + pagination = root.find_all("a", class_="sb_pagN") + if pagination: + next_url = pagination[0].get("href", "") + if next_url and not next_url.startswith("http"): + next_url = (cn_bing_host_url if is_cn_bing else bing_host_url) + next_url + + # 方式3: 通用导航元素 + if not next_url: + nav_links = root.find_all("a") + for link in nav_links: + if link.text.strip() in ["下一页", "Next", "下页", "»", ">>"]: + next_url = link.get("href", "") + if next_url and not next_url.startswith("http"): + next_url = (cn_bing_host_url if is_cn_bing else bing_host_url) + next_url + break + + logger.debug(f"已解析 {len(list_data)} 个结果，下一页链接: {next_url}") + return list_data, next_url + + except Exception as e: + logger.error(f"解析页面时出错: {str(e)}") + logger.debug(traceback.format_exc()) + return None, None diff --git a/src/plugins/built_in/core_actions/anti_injector_manager.py b/src/plugins/built_in/core_actions/anti_injector_manager.py index 4ed9223eb..a9417102d 100644 --- a/src/plugins/built_in/core_actions/anti_injector_manager.py +++ b/src/plugins/built_in/core_actions/anti_injector_manager.py @@ -12,8 +12,7 @@ from src.plugin_system.base import BaseCommand from src.chat.antipromptinjector import get_anti_injector from src.chat.antipromptinjector.processors.command_skip_list import ( - get_skip_patterns_info, - skip_list_manager + get_skip_patterns_info ) from src.common.logger import get_logger diff --git a/src/plugins/built_in/maizone_refactored/services/qzone_service.py b/src/plugins/built_in/maizone_refactored/services/qzone_service.py index 2b40083d8..f1c4ac5d5 100644 --- a/src/plugins/built_in/maizone_refactored/services/qzone_service.py +++ b/src/plugins/built_in/maizone_refactored/services/qzone_service.py @@ -246,7 +246,7 @@ class QZoneService: config_image_number = int(config_image_number) except (ValueError, TypeError): config_image_number = 1 - logger.warning(f"配置项 image_number 值无效，使用默认值 1") + logger.warning("配置项 image_number 值无效，使用默认值 1") max_images = min(min(config_image_number, 9), len(all_files)) # 最多9张，最少1张 selected_count = max(1, max_images) # 确保至少选择1张 diff --git a/tests/test_wakeup_system.py b/tests/test_wakeup_system.py index 43a78015d..bc340adcf 100644 --- a/tests/test_wakeup_system.py +++ b/tests/test_wakeup_system.py @@ -1,7 +1,6 @@ import pytest -import asyncio import time -from unittest.mock import Mock, patch, MagicMock +from unittest.mock import Mock, patch import sys import os