mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-21 19:51:58 +00:00
全栈安全加固、性能提速与架构演进:连接池与沙箱止血、双路混合检索、多版本归档及前端分包治理
- 第一批(安全加固与生命周期止血):隔离测试宿主机密钥与 .env 泄漏;修复 SQLite 取消查询挂死、:memory: 连接池报错与 EngineCache 世代竞态;补齐运行与评测删除时的 Checkpointer 线程、Artifact 磁盘文件与无主附件回收;加固三套沙箱路径越界、进程组清理与 Seatbelt 数据目录隔离,封堵 SSRF IPv4-mapped IPv6 元数据绕过与响应体 OOM;修复推理模型多轮 reasoning_content、结构化输出 Token 漏计与缓存折扣计费 - 第二批(数据库/集群/问数提速与首屏分包):补齐核心表索引与 SQLite WAL 调优,列表接口按需 defer 大列,收敛启动扫描并打通跨进程 slot 槽位唤醒;优化跨源全局选表、哈希桶数字绑定、流式 CSV 导入及多方言分析算子;剥离首屏静态引入的 @xyflow/react 与全局样式(首屏主包降至 461.59 kB),补充流式 rAF 攒批、Store 精细订阅与表单无障碍绑定 - 第三批(架构演进与工程自动化闭环):记录库超挂接阈值历史版本自动增量归档至单库多表(解除 SQLite 10 库 ATTACH 硬上限);重构知识库为词面 BM25 与全集合归一化向量矩阵真·双路独立召回并支持游标分批重建;升级多方言感知 SQL 模板词法分析(E'...' / $$...$$ / q'[...]' / # / 嵌套注释)与 Decimal / bool / NaN 参数校验,消除 ledger 层对 api 路由层的反向依赖;拆分 3101 行 CaliberDrafts 页面为 7 个领域子模块,消除检查脚本本机路径硬编码并新增 GitHub Actions CI 门禁与三批回归测试套件
This commit is contained in:
@@ -175,11 +175,23 @@ def _usage_of(message: BaseMessage, model_id: str) -> dict[str, Any]:
|
||||
meta = getattr(message, "usage_metadata", None) or {}
|
||||
inp = int(meta.get("input_tokens") or 0)
|
||||
out = int(meta.get("output_tokens") or 0)
|
||||
details = meta.get("input_token_details") or {}
|
||||
cache_read = int(details.get("cache_read") or 0) if isinstance(details, dict) else 0
|
||||
cache_create = int(details.get("cache_creation") or 0) if isinstance(details, dict) else 0
|
||||
if cache_read > 0 or cache_create > 0:
|
||||
try:
|
||||
cost = catalog.estimate_cost(
|
||||
model_id, inp, out, cache_read_tokens=cache_read, cache_creation_tokens=cache_create
|
||||
)
|
||||
except TypeError:
|
||||
cost = catalog.estimate_cost(model_id, inp, out)
|
||||
else:
|
||||
cost = catalog.estimate_cost(model_id, inp, out)
|
||||
return {
|
||||
"input_tokens": inp,
|
||||
"output_tokens": out,
|
||||
"total_tokens": inp + out,
|
||||
"cost_usd": round(catalog.estimate_cost(model_id, inp, out), 6),
|
||||
"cost_usd": round(cost, 6),
|
||||
"calls": 1,
|
||||
}
|
||||
|
||||
@@ -213,14 +225,31 @@ def explain_model_error(exc: Exception, model_id: str) -> str:
|
||||
"请稍后重试;如持续失败,请到「设置 → 模型接入」测试该模型")
|
||||
|
||||
|
||||
def _non_retriable_stream_error(exc: Exception) -> bool:
|
||||
"""鉴权失败、模型不存在、额度用尽、频率限制、上下文超长、输出额度被拒:非流式重发也必然因为同一原因失败,直接上报。"""
|
||||
from langchain_core.exceptions import ContextOverflowError
|
||||
|
||||
from app.providers.budget import budget_refused
|
||||
|
||||
if isinstance(exc, ContextOverflowError) or budget_refused(exc):
|
||||
return True
|
||||
status = getattr(exc, "status_code", None)
|
||||
if status in (401, 403, 413, 429):
|
||||
return True
|
||||
low = str(exc).lower()
|
||||
return any(k in low for k in (
|
||||
"invalid_model", "model does not exist", "insufficient", "quota",
|
||||
"rate limit", "unauthorized", "invalid api key",
|
||||
))
|
||||
|
||||
|
||||
async def _invoke_streaming(
|
||||
model: Any, messages: list[BaseMessage], ctx: NodeContext, model_id: str = ""
|
||||
) -> AIMessage:
|
||||
"""流式调用并把 token 实时推给前端。
|
||||
|
||||
失败时回退到非流式 —— 有些兼容网关不支持 SSE,不该因此让整个节点挂掉。
|
||||
但回退也失败的话,两次都是同一个原因,不能只把原始异常往上抛:用户看到的
|
||||
会是两段一模一样的供应商报错,而里面既没有模型名也没有下一步该干什么。
|
||||
但鉴权、模型不存在、限流、上下文超长这类请求本身就不成立的报错直接抛出,不再白发第二次请求。
|
||||
"""
|
||||
# 模型 id 要跟着 llm.start 走。以前这条事件只有 message_count,于是调用失败时
|
||||
# 整条轨迹里**没有任何地方**记着试的是哪个模型——排查只能靠翻配置猜。
|
||||
@@ -240,6 +269,8 @@ async def _invoke_streaming(
|
||||
except NotImplementedError:
|
||||
response = await model.ainvoke(messages)
|
||||
except Exception as e: # noqa: BLE001
|
||||
if _non_retriable_stream_error(e):
|
||||
raise NodeError(ctx.node.id, explain_model_error(e, model_id)) from e
|
||||
ctx.emit(EventType.LOG, level="warn",
|
||||
message=f"流式输出失败,已改用非流式调用:{explain_model_error(e, model_id)}",
|
||||
code="stream_fallback")
|
||||
@@ -290,15 +321,24 @@ async def run_llm(state: GraphState, ctx: NodeContext) -> dict[str, Any]:
|
||||
spent: list[dict[str, Any]] = []
|
||||
|
||||
if schema:
|
||||
# 要结构化结果就走原生 structured output,这条路径拿不到 token 流
|
||||
# 要结构化结果就走原生 structured output,带上 include_raw=True 把真实 token 用量一起拿回来
|
||||
ctx.emit(EventType.LLM_START, model=model_id, structured=True,
|
||||
message_count=len(messages))
|
||||
try:
|
||||
# langchain 靠 "title" 识别裸 JSON Schema dict,缺了会抛 Unsupported function
|
||||
if isinstance(schema, dict) and "title" not in schema:
|
||||
schema = {"title": "output", **schema}
|
||||
structured = model.with_structured_output(schema)
|
||||
value = await structured.ainvoke(messages)
|
||||
try:
|
||||
structured = model.with_structured_output(schema, include_raw=True)
|
||||
except TypeError:
|
||||
structured = model.with_structured_output(schema)
|
||||
got = await structured.ainvoke(messages)
|
||||
if isinstance(got, dict) and got.get("parsing_error"):
|
||||
err = got["parsing_error"]
|
||||
raise err if isinstance(err, BaseException) else ValueError(str(err))
|
||||
raw_msg, value = _split_structured(got)
|
||||
if value is None:
|
||||
raise ValueError("模型返回的结构化结果为空")
|
||||
except Exception as e: # noqa: BLE001
|
||||
# 模型压根不存在也会走到这里,那不是"结构化输出失败"
|
||||
if "invalid_model" in str(e) or "model does not exist" in str(e).lower():
|
||||
@@ -310,8 +350,12 @@ async def run_llm(state: GraphState, ctx: NodeContext) -> dict[str, Any]:
|
||||
) from e
|
||||
payload = value if isinstance(value, (dict, list)) else getattr(value, "model_dump", lambda: value)()
|
||||
output = {"data": payload, "text": json.dumps(payload, ensure_ascii=False, indent=2)}
|
||||
response: BaseMessage = AIMessage(content=output["text"])
|
||||
spent.append(_report_call(ctx, response, model_id, started))
|
||||
response = AIMessage(
|
||||
content=output["text"],
|
||||
usage_metadata=getattr(raw_msg, "usage_metadata", None),
|
||||
response_metadata=dict(getattr(raw_msg, "response_metadata", None) or {}),
|
||||
)
|
||||
spent.append(_report_call(ctx, raw_msg if raw_msg is not None else response, model_id, started))
|
||||
else:
|
||||
response = await _invoke_streaming(model, messages, ctx, model_id)
|
||||
spent.append(_report_call(ctx, response, model_id, started))
|
||||
|
||||
Reference in New Issue
Block a user