后端: 1.粗排链路收口(按 task_class_ids 精确加载 ScheduleState + 规划窗口抗脏数据) - 更新conv/schedule_provider.go:新增 LoadScheduleStateForTaskClasses;优先按本轮任务类加载窗口;buildWindowFromTaskClasses 改为逐条过滤坏日期,避免 DayMapping 被全量任务类污染 - 更新model/state_store.go:新增 ScopedScheduleStateProvider 可选接口 - 更新model/graph_run_state.go:EnsureScheduleState 首次加载时优先走 scoped provider,再做 scope 裁剪 2.粗排建议态语义统一(pending/existing → pending/suggested/existing) - 新建tools/status.go:统一 IsPendingTask / IsSuggestedTask / IsExistingTask / scope 过滤逻辑 - 更新node/rough_build.go:粗排回写后任务显式转 suggested;pending 统计仅看“真实 pending” - 更新tools/state.go:ScheduleTask.Status/Slots/Duration 注释补齐 suggested 语义 - 更新tools/read_helpers.go + read_tools.go:overview/list_tasks/task_info 支持 suggested 展示;占用计算按“已落位任务”统一处理 - 更新tools/write_helpers.go + write_tools.go:place/move/swap/unplace 全量切到 suggested/existing/pending 新语义 - 更新tools/registry.go + SCHEDULE_TOOLS.md:工具描述、参数枚举、文档口径同步到 suggested 语义 - 更新conv/schedule_preview.go:预览层统一通过 IsSuggestedTask 输出 suggested,兼容旧快照 - 更新service/agentsvc/agent_newagent.go:预览 debug 摘要改为 pending/suggested/existing 三态统计 3.粗排调试增强 - 更新node/rough_build.go:新增 applied/day_mapping_miss/task_item_match_miss 统计及样本日志,便于排查 placement 未落回 state 的根因 前端:无 仓库:无
136 lines
4.9 KiB
Go
136 lines
4.9 KiB
Go
package newagenttools
|
||
|
||
// DayMapping maps a day_index to a real (week, day_of_week) coordinate.
|
||
type DayMapping struct {
|
||
DayIndex int `json:"day_index"`
|
||
Week int `json:"week"`
|
||
DayOfWeek int `json:"day_of_week"`
|
||
}
|
||
|
||
// ScheduleWindow defines the planning window.
|
||
type ScheduleWindow struct {
|
||
TotalDays int `json:"total_days"`
|
||
DayMapping []DayMapping `json:"day_mapping"`
|
||
}
|
||
|
||
// TaskSlot is a compressed time slot using day_index and section range.
|
||
type TaskSlot struct {
|
||
Day int `json:"day"`
|
||
SlotStart int `json:"slot_start"`
|
||
SlotEnd int `json:"slot_end"`
|
||
}
|
||
|
||
// TaskClassMeta 是任务类级别的调度约束,供 LLM 在排课时参考。
|
||
// 只记录影响排课决策的字段,不暴露数据库内部细节。
|
||
type TaskClassMeta struct {
|
||
ID int `json:"id"`
|
||
Name string `json:"name"`
|
||
Strategy string `json:"strategy"` // "steady"=均匀分布 | "rapid"=集中突击
|
||
TotalSlots int `json:"total_slots"` // 该任务类总时段预算
|
||
AllowFillerCourse bool `json:"allow_filler_course"` // 是否允许嵌入水课时段
|
||
ExcludedSlots []int `json:"excluded_slots"` // 排除的半天时段索引(空=无限制)
|
||
StartDate string `json:"start_date,omitempty"` // 排程起始日期(YYYY-MM-DD)
|
||
EndDate string `json:"end_date,omitempty"` // 排程截止日期(YYYY-MM-DD)
|
||
}
|
||
|
||
// ScheduleTask is a unified task representation in the tool state.
|
||
// It merges existing schedules (from schedule_events) and pending tasks (from task_items)
|
||
// into one flat list that the tool layer operates on.
|
||
type ScheduleTask struct {
|
||
StateID int `json:"state_id"`
|
||
Source string `json:"source"` // "event" | "task_item"
|
||
SourceID int `json:"source_id"` // ScheduleEvent.ID or TaskClassItem.ID
|
||
Name string `json:"name"`
|
||
Category string `json:"category"` // e.g. "课程", "学习", "作业"
|
||
Status string `json:"status"` // "existing" | "suggested" | "pending"
|
||
Locked bool `json:"locked"`
|
||
|
||
// Existing / suggested task: compressed slot ranges. Pending task: nil until placed.
|
||
Slots []TaskSlot `json:"slots,omitempty"`
|
||
// Pending / suggested task: required consecutive slot count.
|
||
Duration int `json:"duration,omitempty"`
|
||
// source=task_item only: TaskClass.ID,用于反查任务类约束。
|
||
TaskClassID int `json:"task_class_id,omitempty"`
|
||
// source=task_item only: TaskClass.ID for category lookup (internal alias).
|
||
CategoryID int `json:"category_id,omitempty"`
|
||
// source=event only: whether this slot allows embedding other tasks.
|
||
CanEmbed bool `json:"can_embed,omitempty"`
|
||
|
||
// Embed relationships (resolved after all tasks are loaded).
|
||
EmbeddedBy *int `json:"embedded_by,omitempty"` // host: which state_id is embedded into me
|
||
EmbedHost *int `json:"embed_host,omitempty"` // guest: which state_id's slot I'm embedded into
|
||
|
||
// Internal: not exposed to LLM, used for flush/diff logic.
|
||
EventType string `json:"event_type,omitempty"` // "course" | "task" (source=event only)
|
||
}
|
||
|
||
// ScheduleState is the full tool operation state.
|
||
type ScheduleState struct {
|
||
Window ScheduleWindow `json:"window"`
|
||
Tasks []ScheduleTask `json:"tasks"`
|
||
TaskClasses []TaskClassMeta `json:"task_classes,omitempty"` // 任务类约束元数据,供 LLM 排课参考
|
||
}
|
||
|
||
// DayToWeekDay converts day_index to (week, day_of_week).
|
||
func (s *ScheduleState) DayToWeekDay(day int) (week, dayOfWeek int, ok bool) {
|
||
for _, m := range s.Window.DayMapping {
|
||
if m.DayIndex == day {
|
||
return m.Week, m.DayOfWeek, true
|
||
}
|
||
}
|
||
return 0, 0, false
|
||
}
|
||
|
||
// WeekDayToDay converts (week, day_of_week) to day_index.
|
||
func (s *ScheduleState) WeekDayToDay(week, dayOfWeek int) (day int, ok bool) {
|
||
for _, m := range s.Window.DayMapping {
|
||
if m.Week == week && m.DayOfWeek == dayOfWeek {
|
||
return m.DayIndex, true
|
||
}
|
||
}
|
||
return 0, false
|
||
}
|
||
|
||
// TaskByStateID finds a task by state_id. Returns nil if not found.
|
||
func (s *ScheduleState) TaskByStateID(stateID int) *ScheduleTask {
|
||
for i := range s.Tasks {
|
||
if s.Tasks[i].StateID == stateID {
|
||
return &s.Tasks[i]
|
||
}
|
||
}
|
||
return nil
|
||
}
|
||
|
||
// Clone returns a deep copy of the ScheduleState.
|
||
func (s *ScheduleState) Clone() *ScheduleState {
|
||
if s == nil {
|
||
return nil
|
||
}
|
||
clone := &ScheduleState{
|
||
Window: ScheduleWindow{
|
||
TotalDays: s.Window.TotalDays,
|
||
DayMapping: make([]DayMapping, len(s.Window.DayMapping)),
|
||
},
|
||
Tasks: make([]ScheduleTask, len(s.Tasks)),
|
||
TaskClasses: make([]TaskClassMeta, len(s.TaskClasses)),
|
||
}
|
||
copy(clone.Window.DayMapping, s.Window.DayMapping)
|
||
copy(clone.TaskClasses, s.TaskClasses)
|
||
for i, t := range s.Tasks {
|
||
clone.Tasks[i] = t
|
||
if t.Slots != nil {
|
||
clone.Tasks[i].Slots = make([]TaskSlot, len(t.Slots))
|
||
copy(clone.Tasks[i].Slots, t.Slots)
|
||
}
|
||
if t.EmbeddedBy != nil {
|
||
v := *t.EmbeddedBy
|
||
clone.Tasks[i].EmbeddedBy = &v
|
||
}
|
||
if t.EmbedHost != nil {
|
||
v := *t.EmbedHost
|
||
clone.Tasks[i].EmbedHost = &v
|
||
}
|
||
}
|
||
return clone
|
||
}
|