chore: 恢复PR改动并适配官方最新版本
在官方更新到4936a6d后,选择性恢复PR中的功能改动: Maizone插件修复(6个文件): - 优化成功/失败反馈机制(直接反馈,不使用AI生成) - 实现QQ空间Cookie失效自动重试机制 - 修复评论回复被分割导致标点符号丢失的问题 - 修复QQ空间转发内容提取错误 - 改进maizone图片识别模型配置,支持自动fallback - 优化maizone说说生成规则 适配器响应处理(bot.py): - 添加adapter_response消息处理逻辑 - 适配新的DatabaseMessages架构 - 在message_process早期阶段优先处理adapter_response Web搜索引擎扩展: - 添加Serper搜索引擎支持 LLM成本计算修复: - 修复LLM使用统计中成本计算错误的bug - 调整LLM相关日志级别为DEBUG 其他优化: - 优化NapCat adapter响应处理 - 优化person_info关系推理逻辑 注:本次恢复已跳过与官方冲突的部分,保留官方的新架构改进 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -534,7 +534,7 @@ class _RequestExecutor:
|
||||
model_name = model_info.name
|
||||
retry_interval = api_provider.retry_interval
|
||||
|
||||
if isinstance(e, NetworkConnectionError | ReqAbortException):
|
||||
if isinstance(e, (NetworkConnectionError, ReqAbortException)):
|
||||
return await self._check_retry(remain_try, retry_interval, "连接异常", model_name)
|
||||
elif isinstance(e, RespNotOkException):
|
||||
return await self._handle_resp_not_ok(e, model_info, api_provider, remain_try, messages_info)
|
||||
@@ -1009,15 +1009,12 @@ class LLMRequest:
|
||||
# 步骤1: 更新内存中的统计数据,用于负载均衡
|
||||
stats = self.model_usage[model_info.name]
|
||||
|
||||
# 安全地获取 token 使用量, embedding 模型可能不返回 completion_tokens
|
||||
total_tokens = getattr(usage, "total_tokens", 0)
|
||||
|
||||
# 计算新的平均延迟
|
||||
new_request_count = stats.request_count + 1
|
||||
new_avg_latency = (stats.avg_latency * stats.request_count + time_cost) / new_request_count
|
||||
|
||||
self.model_usage[model_info.name] = stats._replace(
|
||||
total_tokens=stats.total_tokens + total_tokens,
|
||||
total_tokens=stats.total_tokens + usage.total_tokens,
|
||||
avg_latency=new_avg_latency,
|
||||
request_count=new_request_count,
|
||||
)
|
||||
@@ -1064,8 +1061,7 @@ class LLMRequest:
|
||||
# 遍历工具的参数
|
||||
for param in tool.get("parameters", []):
|
||||
# 严格验证参数格式是否为包含5个元素的元组
|
||||
assert isinstance(param, tuple), "参数必须是元组"
|
||||
assert len(param) == 5, "参数必须包含5个元素"
|
||||
assert isinstance(param, tuple) and len(param) == 5, "参数必须是包含5个元素的元组"
|
||||
builder.add_param(
|
||||
name=param[0],
|
||||
param_type=param[1],
|
||||
|
||||
Reference in New Issue
Block a user