Version: 0.7.1.dev.260321
feat(agent): ✨ 重构智能排程分流与双通道交付,补齐周级预算并接入连续微调复用 - 🔀 通用路由升级为 action 分流(chat/quick_note_create/task_query/schedule_plan),路由失败直接返回内部错误,不再回落聊天 - 🧭 智能排程链路重构:统一图编排与节点职责,完善日级/周级调优协作与提示词约束 - 📊 周级预算改为“有效周保底 + 负载加权分配”,避免有效周零预算并提升资源利用率 - ⚙️ 日级并发优化细化:按天拆分 DayGroup 并发执行,低收益天(suggested<=2)跳过,单天失败仅回退该天结果并继续全局 - 🧵 周级并发优化细化:按周并发 worker 执行,单周“单步动作”循环(每轮仅 1 个 Move/Swap 或 done),失败周保留原方案不影响其它周 - 🛰️ 新增排程预览双通道:聊天主链路输出终审文本,结构化 candidate_plans 通过 /api/v1/agent/schedule-preview 拉取 - 🗃️ 增补 Redis 预览缓存读写与清理逻辑,新增对应 API、路由、模型与错误码支持 - ♻️ 接入连续对话微调复用:命中同会话历史预览时复用上轮 HybridEntries,避免每轮重跑粗排 - 🛡️ 增加复用保护:仅当本轮与上轮 task_class_ids 集合一致才复用;不一致回退全量粗排 - 🧰 扩展预览缓存字段(task_class_ids/hybrid_entries/allocated_items),支撑微调承接链路 - 🗺️ 更新 README 5.4 Mermaid(总分流图 + 智能排程流转图)并补充决策文档 - ⚠️ 新增“连续微调复用”链路我尚未完成测试,且文档状态目前较为混乱,待连续对话微调功能真正测试完成后再统一更新
This commit is contained in:
@@ -89,6 +89,16 @@ type RoutingDecision struct {
|
||||
Action Action
|
||||
TrustRoute bool
|
||||
Detail string
|
||||
// RouteFailed 标记“控制码路由是否失败”。
|
||||
//
|
||||
// 语义:
|
||||
// 1. true:路由阶段发生异常(模型调用失败、控制码解析失败等);
|
||||
// 2. false:路由阶段正常完成(无论最终 action 是 chat 还是其它分支)。
|
||||
//
|
||||
// 说明:
|
||||
// 1. 该字段用于让上层决定“是否直接报错而不是回落聊天”;
|
||||
// 2. 历史行为是失败回落 chat,本字段用于支持新的“失败即报错”策略。
|
||||
RouteFailed bool
|
||||
}
|
||||
|
||||
// DecideActionRouting 通过“模型控制码”决定本次请求走向。
|
||||
@@ -97,21 +107,22 @@ type RoutingDecision struct {
|
||||
// 1. Action=quick_note_create:进入随口记写入图;
|
||||
// 2. Action=task_query:进入任务查询 tool-calling;
|
||||
// 3. Action=chat:进入普通聊天流;
|
||||
// 4. 路由失败时回落 chat,保证可用性优先。
|
||||
// 4. 路由失败时会标记 RouteFailed=true,由上层直接返回内部错误。
|
||||
func DecideActionRouting(ctx context.Context, selectedModel *ark.ChatModel, userMessage string) RoutingDecision {
|
||||
decision, err := routeByModelControlTag(ctx, selectedModel, userMessage)
|
||||
if err != nil {
|
||||
if deadline, ok := ctx.Deadline(); ok {
|
||||
log.Printf("通用分流控制码失败,回落 chat: err=%v parent_deadline_in_ms=%d route_timeout_ms=%d",
|
||||
log.Printf("通用分流控制码失败,标记路由失败并等待上层报错: err=%v parent_deadline_in_ms=%d route_timeout_ms=%d",
|
||||
err, time.Until(deadline).Milliseconds(), ControlTimeout.Milliseconds())
|
||||
} else {
|
||||
log.Printf("通用分流控制码失败,回落 chat: err=%v parent_deadline=none route_timeout_ms=%d",
|
||||
log.Printf("通用分流控制码失败,标记路由失败并等待上层报错: err=%v parent_deadline=none route_timeout_ms=%d",
|
||||
err, ControlTimeout.Milliseconds())
|
||||
}
|
||||
return RoutingDecision{
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
RouteFailed: true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,9 +133,10 @@ func DecideActionRouting(ctx context.Context, selectedModel *ark.ChatModel, user
|
||||
reason = "识别到新增任务请求,准备执行随口记流程。"
|
||||
}
|
||||
return RoutingDecision{
|
||||
Action: ActionQuickNoteCreate,
|
||||
TrustRoute: true,
|
||||
Detail: reason,
|
||||
Action: ActionQuickNoteCreate,
|
||||
TrustRoute: true,
|
||||
Detail: reason,
|
||||
RouteFailed: false,
|
||||
}
|
||||
case ActionTaskQuery:
|
||||
reason := strings.TrimSpace(decision.Reason)
|
||||
@@ -132,9 +144,10 @@ func DecideActionRouting(ctx context.Context, selectedModel *ark.ChatModel, user
|
||||
reason = "识别到任务查询请求,准备调用任务查询工具。"
|
||||
}
|
||||
return RoutingDecision{
|
||||
Action: ActionTaskQuery,
|
||||
TrustRoute: true,
|
||||
Detail: reason,
|
||||
Action: ActionTaskQuery,
|
||||
TrustRoute: true,
|
||||
Detail: reason,
|
||||
RouteFailed: false,
|
||||
}
|
||||
case ActionSchedulePlan:
|
||||
reason := strings.TrimSpace(decision.Reason)
|
||||
@@ -142,23 +155,26 @@ func DecideActionRouting(ctx context.Context, selectedModel *ark.ChatModel, user
|
||||
reason = "识别到排程请求,准备执行智能排程流程。"
|
||||
}
|
||||
return RoutingDecision{
|
||||
Action: ActionSchedulePlan,
|
||||
TrustRoute: true,
|
||||
Detail: reason,
|
||||
Action: ActionSchedulePlan,
|
||||
TrustRoute: true,
|
||||
Detail: reason,
|
||||
RouteFailed: false,
|
||||
}
|
||||
case ActionChat:
|
||||
return RoutingDecision{
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
RouteFailed: false,
|
||||
}
|
||||
default:
|
||||
// 兜底:未知动作一律回落 chat,避免误入错误分支。
|
||||
log.Printf("通用分流出现未知动作,回落 chat: action=%s raw=%s", decision.Action, decision.Raw)
|
||||
// 兜底:未知动作视为路由异常,标记 RouteFailed 让上层统一报错。
|
||||
log.Printf("通用分流出现未知动作,标记路由失败并等待上层报错: action=%s raw=%s", decision.Action, decision.Raw)
|
||||
return RoutingDecision{
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
RouteFailed: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -273,9 +289,10 @@ func DecideQuickNoteRouting(ctx context.Context, selectedModel *ark.ChatModel, u
|
||||
return decision
|
||||
}
|
||||
return RoutingDecision{
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
Action: ActionChat,
|
||||
TrustRoute: false,
|
||||
Detail: "",
|
||||
RouteFailed: decision.RouteFailed,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user