feat: 换到 Gin 主流栈并补齐运维能力
HTTP 用 Gin,配置用 Viper,日志用 zap,数据用 sqlx;保留原有接口与会商行为。 顺带补上就绪探活、请求号、滚动日志、systemd 与 Dockerfile。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
0c45b86d67
commit
bd427b57a1
26 files changed
+1213
-302
No files matched your search
@@ -33,7 +33,7 @@ type ResumeJobRequest struct {
|
||||
}
|
||||
|
||||
type PatchJobPlanRequest struct {
|
||||
ManualIntervention *bool `json:"manualIntervention"`
|
||||
ManualIntervention *bool `json:"manualIntervention"`
|
||||
Model *string `json:"model"`
|
||||
}
|
||||
|
||||
@@ -47,6 +47,11 @@ type JobService struct {
|
||||
Access *AccessService
|
||||
}
|
||||
|
||||
// Create 落一场排队作业,不在这里调模型。Worker 下一拍才会领走。
|
||||
//
|
||||
// 约定:没传 manualIntervention 时默认开人工卡点;编排模式缺省 roundtable。
|
||||
// 席位为空时塞两个联调桩,避免前端漏传 agents 时直接起不来。
|
||||
// 拥有者优先用 body,没有再用请求头里的账号。
|
||||
func (s *JobService) Create(req *CreateJobRequest, caller Caller) (*domain.AnalysisJob, error) {
|
||||
if req == nil {
|
||||
req = &CreateJobRequest{}
|
||||
@@ -64,19 +69,19 @@ func (s *JobService) Create(req *CreateJobRequest, caller Caller) (*domain.Analy
|
||||
mode = "roundtable"
|
||||
}
|
||||
job := &domain.AnalysisJob{
|
||||
ID: "job_" + randHex(8),
|
||||
RequestID: firstNonEmpty(blankToNull(req.RequestID), "req_"+randHex(6)),
|
||||
TaskID: blankToNull(req.TaskID),
|
||||
DraftID: blankToNull(req.DraftID),
|
||||
DraftKey: blankToNull(req.DraftKey),
|
||||
Status: domain.StatusQueued,
|
||||
Phase: "queued",
|
||||
OrchestrationMode: mode,
|
||||
Model: strings.TrimSpace(req.Model),
|
||||
OwnerAccountID: owner,
|
||||
Agents: normalizeAgents(req.Agents),
|
||||
Dialogues: []map[string]interface{}{},
|
||||
Access: orEmptyMap(req.Access),
|
||||
ID: "job_" + randHex(8),
|
||||
RequestID: firstNonEmpty(blankToNull(req.RequestID), "req_"+randHex(6)),
|
||||
TaskID: blankToNull(req.TaskID),
|
||||
DraftID: blankToNull(req.DraftID),
|
||||
DraftKey: blankToNull(req.DraftKey),
|
||||
Status: domain.StatusQueued,
|
||||
Phase: "queued",
|
||||
OrchestrationMode: mode,
|
||||
Model: strings.TrimSpace(req.Model),
|
||||
OwnerAccountID: owner,
|
||||
Agents: normalizeAgents(req.Agents),
|
||||
Dialogues: []map[string]interface{}{},
|
||||
Access: orEmptyMap(req.Access),
|
||||
Plan: map[string]interface{}{
|
||||
"seatIndex": 0,
|
||||
"manualIntervention": manual,
|
||||
@@ -131,6 +136,8 @@ func (s *JobService) GetByTaskID(taskID string, latestOnly bool, caller Caller)
|
||||
return s.Access.ProjectForCaller(job, caller), nil
|
||||
}
|
||||
|
||||
// Cancel 给还在排队、运行、等人中的作业打 cancel_flag,并把状态写成 cancelled。
|
||||
// 已经结束的作业再点取消:不报错,原样返回(前端可以重复点)。
|
||||
func (s *JobService) Cancel(id string, caller Caller) (*domain.AnalysisJob, error) {
|
||||
job, err := s.Repo.FindByID(id)
|
||||
if err != nil || job == nil {
|
||||
@@ -154,6 +161,8 @@ func (s *JobService) Cancel(id string, caller Caller) (*domain.AnalysisJob, erro
|
||||
return s.Access.ProjectForCaller(job, caller), nil
|
||||
}
|
||||
|
||||
// Resume 只接受 awaiting_input。回答会写进用户气泡,并拼进 plan.pendingInject,下一轮派活时带上。
|
||||
// 然后状态回到 queued,等 Worker 重新领走。其它状态拒绝,避免把跑到一半的场子重置。
|
||||
func (s *JobService) Resume(id string, body *ResumeJobRequest, caller Caller) (*domain.AnalysisJob, error) {
|
||||
job, err := s.Repo.FindByID(id)
|
||||
if err != nil || job == nil {
|
||||
@@ -195,6 +204,10 @@ func (s *JobService) Resume(id string, body *ResumeJobRequest, caller Caller) (*
|
||||
return s.Access.ProjectForCaller(fresh, caller), nil
|
||||
}
|
||||
|
||||
// PatchPlan 改模型或人工干预开关。作业已结束则拒绝。
|
||||
//
|
||||
// 关掉人工干预、且当前正停在 manual_continue 时,顺手放行:清掉等待原因并重新排队。
|
||||
// 这样页面上关开关后不用再点一次「继续」。
|
||||
func (s *JobService) PatchPlan(id string, body *PatchJobPlanRequest, caller Caller) (*domain.AnalysisJob, error) {
|
||||
job, err := s.Repo.FindByID(id)
|
||||
if err != nil || job == nil {
|
||||
@@ -253,6 +266,8 @@ func (s *JobService) PatchPlan(id string, body *PatchJobPlanRequest, caller Call
|
||||
return s.Access.ProjectForCaller(fresh, caller), nil
|
||||
}
|
||||
|
||||
// Inject 在会商进行中插入用户补充。空文本拒绝;已结束拒绝。
|
||||
// 正文进对话气泡,同时累加到 plan.pendingInject,下一轮才喂给模型,不打断当前席。
|
||||
func (s *JobService) Inject(id string, body *InjectJobRequest, caller Caller) (*domain.AnalysisJob, error) {
|
||||
job, err := s.Repo.FindByID(id)
|
||||
if err != nil || job == nil {
|
||||
|
||||
Reference in new issue
Block a user