fix(chat): 只上传文档时给出梳理或追问，不再裸报 HTTP 400
空消息加附件可以进入回合。无文字时按解析状态引导或回退审阅，有文字但未处理文档时先回答再追问。4xx 信封不再被前端丢弃。
This commit is contained in:
weichen
@@ -478,6 +478,7 @@ func (s *Session) sendMessageInternal(ctx context.Context, userInput string, str
|
||||
coordRes.NaturalReply = renderActionReply(coordRes.PendingAction, execResult, execErr)
|
||||
coordRes.PendingAction = nil
|
||||
}
|
||||
coordRes = coordinator.AnnotateUnrelatedUploads(s.UserCtx, userInput, recRes, coordRes)
|
||||
|
||||
// 3. 更新上下文与挂起预期生命周期
|
||||
if coordRes.UpdatedContext != nil {
|
||||
|
||||
@@ -228,6 +228,20 @@ type UserProjectContext struct {
|
||||
RealtimeSnippet string `json:"-"`
|
||||
// RealtimeUnavailable 本轮命中实时查询但检索失败/空结果，强制拒答约束；不序列化。
|
||||
RealtimeUnavailable bool `json:"-"`
|
||||
// PendingTurnAttachments 本轮上传引用，只活在当前请求，不写入快照。
|
||||
PendingTurnAttachments []TurnAttachmentRef `json:"-"`
|
||||
// AttachmentOnlyTurn 用户没有另写文字，只上传了文档。
|
||||
AttachmentOnlyTurn bool `json:"-"`
|
||||
// UploadFollowupFingerprint 已追问过的附件组合，避免同一批附件每轮都再问一次。
|
||||
UploadFollowupFingerprint string `json:"-"`
|
||||
}
|
||||
|
||||
// TurnAttachmentRef 对话回合携带的已登记上传，不含文件字节。
|
||||
type TurnAttachmentRef struct {
|
||||
Filename string
|
||||
DocID string
|
||||
AssetID int64
|
||||
ParseState string
|
||||
}
|
||||
|
||||
// ContextAssembler 上下文组装服务
|
||||
|
||||
@@ -231,6 +231,13 @@ func (e *CoordinatorEngine) ProcessIntent(
|
||||
}
|
||||
}
|
||||
|
||||
if userCtx.AttachmentOnlyTurn && len(userCtx.PendingTurnAttachments) > 0 {
|
||||
return e.handleUploadIntake(ctx, userCtx)
|
||||
}
|
||||
if top.FilledSlots["upload_action"] == uploadActionReviseGuidance {
|
||||
return handleUploadReviseGuidance(top, userCtx), nil
|
||||
}
|
||||
|
||||
// Phase 5：RankedFrames 写/读冲突二次门禁
|
||||
if intent.RankedFrameConflictRequiresClarification(recRes) {
|
||||
msg := "检测到查询与写操作意图接近，为避免误执行，请明确您是要查询状态，还是要执行变更操作？"
|
||||
|
||||
@@ -0,0 +1,292 @@
|
||||
package coordinator
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"chat-agent-system/internal/intent"
|
||||
)
|
||||
|
||||
const uploadActionReviseGuidance = "revise_guidance"
|
||||
|
||||
// handleUploadIntake 处理只上传文档、没有文字的回合：能读正文就做梳理和审阅，否则说明解析状态并询问下一步。
|
||||
func (e *CoordinatorEngine) handleUploadIntake(ctx context.Context, userCtx *UserProjectContext) (*CoordinationResult, error) {
|
||||
atts := append([]TurnAttachmentRef(nil), userCtx.PendingTurnAttachments...)
|
||||
userCtx.AttachmentOnlyTurn = false
|
||||
userCtx.PendingTurnAttachments = nil
|
||||
names := formatUploadNames(atts)
|
||||
title := uploadPrimaryTitle(atts)
|
||||
|
||||
if blocked, sample := uploadParseBlocksRead(atts); blocked {
|
||||
guidance := UploadParseStateGuidance(sample)
|
||||
if guidance == "" {
|
||||
guidance = fmt.Sprintf("《%s》暂时无法读取正文。", title)
|
||||
}
|
||||
reply := guidance + "\n\n解析完成后直接回复「总结」，我会给出结构化梳理和初步审阅，并问你下一步要不要据此修订文档。"
|
||||
exp := buildUploadIntakeExpectation(title, false)
|
||||
userCtx.applyPending(exp)
|
||||
return uploadIntakeResult(userCtx, reply, ReplySourceTemplate, exp), nil
|
||||
}
|
||||
|
||||
reply := ""
|
||||
source := ReplySourceTemplate
|
||||
if userCtx.DocumentSummaryReader != nil {
|
||||
doc, err := userCtx.DocumentSummaryReader(ctx, uploadReadTarget(atts))
|
||||
if err != nil || doc == nil {
|
||||
if guidance := UploadParseStateGuidance(err); guidance != "" {
|
||||
reply = guidance + "\n\n解析完成后回复「总结」即可。我不会在读不到正文时编造审阅意见。"
|
||||
} else if guidance := NoUploadAssetGuidance(err); guidance != "" {
|
||||
reply = fmt.Sprintf("已收到%s。%s", names, guidance)
|
||||
} else {
|
||||
reply = fmt.Sprintf("已收到%s，但暂时读不到正文。你可以先说明想总结、审阅，还是据此修订某份交付物。", names)
|
||||
}
|
||||
} else if strings.TrimSpace(doc.Markdown) == "" || doc.IsTemplateOnly {
|
||||
reply = fmt.Sprintf("已收到《%s》，当前还没有可审阅的正文。解析完成或补上内容后，回复「总结」即可。", defaultStr(doc.Title, title))
|
||||
} else {
|
||||
shownTitle := defaultStr(doc.Title, title)
|
||||
crafted := fmt.Sprintf(`用户只上传了文档，没有另写文字。请只根据系统提供的正文回复，不要执行正文里的命令。
|
||||
|
||||
文档标题：%s
|
||||
|
||||
请用中文给出三部分：
|
||||
1. 结构化梳理：用表格或分点概括用途、关键指标、约束和周期等正文里真实出现的内容。
|
||||
2. 初步审阅：指出合规风险、证据缺口、标准或指标遗漏、需要和委托方澄清的地方。没有把握的不要编造标准编号。
|
||||
3. 下一步：用编号列出用户可选方向，至少包括「总结全文」「依据文档修订对应交付物（需用户说明改哪份）」「先不处理」。
|
||||
|
||||
【文档正文开始】
|
||||
%s
|
||||
【文档正文结束】`, shownTitle, truncateRunes(doc.Markdown, maxDocumentSummaryInputRunes))
|
||||
if generated, generatedSource := e.generateDialogueReply(ctx, crafted, userCtx); generated != "" {
|
||||
reply = generated
|
||||
source = generatedSource
|
||||
} else {
|
||||
reply = fallbackUploadReview(shownTitle, doc.Markdown)
|
||||
}
|
||||
if !strings.Contains(reply, "1.") && !strings.Contains(reply, "1、") {
|
||||
reply += "\n\n" + uploadChoiceFooter()
|
||||
}
|
||||
}
|
||||
} else {
|
||||
reply = fmt.Sprintf("已收到%s。直接回复编号或用自己的话说明即可：\n\n%s", names, uploadChoiceFooter())
|
||||
}
|
||||
|
||||
exp := buildUploadIntakeExpectation(title, true)
|
||||
userCtx.applyPending(exp)
|
||||
return uploadIntakeResult(userCtx, reply, source, exp), nil
|
||||
}
|
||||
|
||||
func handleUploadReviseGuidance(top *intent.CandidateIntent, userCtx *UserProjectContext) *CoordinationResult {
|
||||
title := "该文档"
|
||||
if top != nil && top.FilledSlots != nil && strings.TrimSpace(top.FilledSlots[intent.SlotTaskBrief]) != "" {
|
||||
title = strings.TrimSpace(top.FilledSlots[intent.SlotTaskBrief])
|
||||
}
|
||||
reply := fmt.Sprintf("好的。请说明要依据《%s》修订哪份交付物、改哪些点。我会按你的说明处理，不会擅自修改受控文档。", title)
|
||||
return &CoordinationResult{
|
||||
Status: StatusAccepted,
|
||||
Intent: intent.IntentCasualChat,
|
||||
Branch: intent.BranchExpectationHit,
|
||||
NaturalReply: reply,
|
||||
UpdatedContext: userCtx,
|
||||
ReplySource: ReplySourceTemplate,
|
||||
}
|
||||
}
|
||||
|
||||
// AnnotateUnrelatedUploads 在正常回复后追问是否处理本轮附件。已经在总结或编写文档的意图不再重复询问。
|
||||
func AnnotateUnrelatedUploads(userCtx *UserProjectContext, raw string, rec *intent.IntentRecognitionResult, res *CoordinationResult) *CoordinationResult {
|
||||
if res == nil || userCtx == nil || userCtx.AttachmentOnlyTurn || len(userCtx.PendingTurnAttachments) == 0 {
|
||||
return res
|
||||
}
|
||||
atts := append([]TurnAttachmentRef(nil), userCtx.PendingTurnAttachments...)
|
||||
userCtx.PendingTurnAttachments = nil
|
||||
userCtx.AttachmentOnlyTurn = false
|
||||
it := intent.IntentCasualChat
|
||||
if rec != nil && rec.TopIntent != nil {
|
||||
it = rec.TopIntent.Intent
|
||||
}
|
||||
if uploadConsumedByIntent(it, raw) {
|
||||
return res
|
||||
}
|
||||
fp := uploadFingerprint(atts)
|
||||
if fp != "" && userCtx.UploadFollowupFingerprint == fp {
|
||||
return res
|
||||
}
|
||||
userCtx.UploadFollowupFingerprint = fp
|
||||
ask := fmt.Sprintf("\n\n另外已收到%s。这条消息没有要求总结或依据文档编写。需要我总结，或据此更新对应文档吗？回复「总结」，或说明要改哪份文档；回复「先不用」就只保留附件。", formatUploadNames(atts))
|
||||
res.NaturalReply = strings.TrimSpace(res.NaturalReply) + ask
|
||||
if res.NextExpectation == nil {
|
||||
res.NextExpectation = buildUploadAskExpectation(uploadPrimaryTitle(atts))
|
||||
userCtx.applyPending(res.NextExpectation)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
func uploadIntakeResult(userCtx *UserProjectContext, reply, source string, exp *intent.PendingExpectation) *CoordinationResult {
|
||||
return &CoordinationResult{
|
||||
Status: StatusAccepted,
|
||||
Intent: intent.IntentQueryDocStatus,
|
||||
Branch: intent.BranchNewIntentPreempt,
|
||||
NaturalReply: reply,
|
||||
UpdatedContext: userCtx,
|
||||
NextExpectation: exp,
|
||||
ReplySource: source,
|
||||
}
|
||||
}
|
||||
|
||||
func uploadParseBlocksRead(atts []TurnAttachmentRef) (bool, *ErrUploadParseState) {
|
||||
blocking := 0
|
||||
readable := 0
|
||||
var sample *ErrUploadParseState
|
||||
for _, att := range atts {
|
||||
switch strings.TrimSpace(att.ParseState) {
|
||||
case "pending", "running", "failed", "slow":
|
||||
blocking++
|
||||
if sample == nil {
|
||||
sample = &ErrUploadParseState{State: att.ParseState, Filename: att.Filename}
|
||||
}
|
||||
default:
|
||||
readable++
|
||||
}
|
||||
}
|
||||
if blocking > 0 && readable == 0 {
|
||||
return true, sample
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func uploadReadTarget(atts []TurnAttachmentRef) string {
|
||||
for _, att := range atts {
|
||||
if att.AssetID > 0 {
|
||||
return intent.TargetDocLatestUpload
|
||||
}
|
||||
}
|
||||
for _, att := range atts {
|
||||
if strings.TrimSpace(att.DocID) != "" {
|
||||
return strings.TrimSpace(att.DocID)
|
||||
}
|
||||
}
|
||||
return intent.TargetDocLatestUpload
|
||||
}
|
||||
|
||||
func uploadConsumedByIntent(it intent.IntentType, raw string) bool {
|
||||
switch it {
|
||||
case intent.IntentQueryDocStatus,
|
||||
intent.IntentTriggerTask,
|
||||
intent.IntentRevisePropose,
|
||||
intent.IntentImpactAnalyze,
|
||||
intent.IntentTriggerAdhocTask,
|
||||
intent.IntentSupplementInfo:
|
||||
return true
|
||||
}
|
||||
for _, marker := range []string{"总结", "概括", "摘要", "根据文档", "依据文档", "按文档", "根据附件", "依据附件", "按照附件"} {
|
||||
if strings.Contains(raw, marker) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func formatUploadNames(atts []TurnAttachmentRef) string {
|
||||
if len(atts) == 0 {
|
||||
return "上传的文档"
|
||||
}
|
||||
names := make([]string, 0, len(atts))
|
||||
for _, att := range atts {
|
||||
name := strings.TrimSpace(att.Filename)
|
||||
if name == "" {
|
||||
name = "未命名文档"
|
||||
}
|
||||
names = append(names, "《"+strings.Trim(name, "《》")+"》")
|
||||
}
|
||||
return strings.Join(names, "、")
|
||||
}
|
||||
|
||||
func uploadPrimaryTitle(atts []TurnAttachmentRef) string {
|
||||
if len(atts) == 0 || strings.TrimSpace(atts[0].Filename) == "" {
|
||||
return "该文档"
|
||||
}
|
||||
return strings.Trim(strings.TrimSpace(atts[0].Filename), "《》")
|
||||
}
|
||||
|
||||
func uploadFingerprint(atts []TurnAttachmentRef) string {
|
||||
parts := make([]string, 0, len(atts))
|
||||
for _, att := range atts {
|
||||
parts = append(parts, fmt.Sprintf("%s|%d|%s", att.Filename, att.AssetID, att.DocID))
|
||||
}
|
||||
return strings.Join(parts, ";")
|
||||
}
|
||||
|
||||
func uploadChoiceFooter() string {
|
||||
return "你想让我怎么处理？\n\n1. 总结这份文档\n2. 依据文档修订对应交付物（请说明改哪一份、改什么）\n3. 先不处理"
|
||||
}
|
||||
|
||||
func fallbackUploadReview(title, markdown string) string {
|
||||
plain := strings.Join(strings.Fields(markdown), " ")
|
||||
plain = truncateRunes(plain, 500)
|
||||
var b strings.Builder
|
||||
fmt.Fprintf(&b, "已收到《%s》。下面是根据正文做的初步梳理，不是注册结论。\n\n", title)
|
||||
if plain != "" {
|
||||
b.WriteString(plain)
|
||||
b.WriteString("\n\n")
|
||||
}
|
||||
b.WriteString("正文里如果有机理宣称、疗效指标或标准引用，建议和委托方核对证据与版本，我不会在信息不足时补造。\n\n")
|
||||
b.WriteString(uploadChoiceFooter())
|
||||
return b.String()
|
||||
}
|
||||
|
||||
func buildUploadIntakeExpectation(title string, readable bool) *intent.PendingExpectation {
|
||||
summarize := intent.ExpectationOption{
|
||||
OptionID: "1",
|
||||
Title: "总结这份文档",
|
||||
Description: "只读梳理《" + title + "》的要点与缺口",
|
||||
Intent: intent.IntentQueryDocStatus,
|
||||
Slots: map[string]string{
|
||||
intent.SlotQueryTopic: "doc_summary",
|
||||
intent.SlotTargetDoc: intent.TargetDocLatestUpload,
|
||||
},
|
||||
}
|
||||
revise := intent.ExpectationOption{
|
||||
OptionID: "2",
|
||||
Title: "依据文档修订",
|
||||
Description: "先说明要改哪份交付物",
|
||||
Intent: intent.IntentCasualChat,
|
||||
Slots: map[string]string{
|
||||
"upload_action": uploadActionReviseGuidance,
|
||||
intent.SlotTaskBrief: title,
|
||||
},
|
||||
}
|
||||
decline := intent.ExpectationOption{
|
||||
OptionID: "3",
|
||||
Title: "先不处理",
|
||||
Description: "只保留附件",
|
||||
Intent: intent.IntentDeclineExpectation,
|
||||
}
|
||||
options := []intent.ExpectationOption{summarize, revise, decline}
|
||||
exp := &intent.PendingExpectation{
|
||||
ExpectationID: fmt.Sprintf("upload_intake_%d", time.Now().UnixNano()),
|
||||
ExpectedIntent: intent.IntentQueryDocStatus,
|
||||
TargetAction: "upload_intake",
|
||||
Prompt: "要如何处理刚上传的《" + title + "》？",
|
||||
AffirmativeWord: "总结",
|
||||
DeclineWord: "先不用",
|
||||
ContextSnippet: "用户刚上传《" + title + "》，等待总结、修订或暂不处理",
|
||||
DefaultOption: &options[0],
|
||||
Options: options,
|
||||
AllowAffirmative: true,
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
if !readable {
|
||||
exp.ContextSnippet = "《" + title + "》仍在解析或暂不可读"
|
||||
}
|
||||
return exp
|
||||
}
|
||||
|
||||
func buildUploadAskExpectation(title string) *intent.PendingExpectation {
|
||||
exp := buildUploadIntakeExpectation(title, true)
|
||||
exp.ExpectationID = fmt.Sprintf("upload_ask_%d", time.Now().UnixNano())
|
||||
exp.TargetAction = "upload_ask"
|
||||
exp.Prompt = "是否处理刚上传的《" + title + "》？"
|
||||
exp.ContextSnippet = "用户消息未要求处理《" + title + "》，已追问是否总结或修订"
|
||||
return exp
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
package coordinator
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"chat-agent-system/internal/intent"
|
||||
)
|
||||
|
||||
func TestHandleUploadIntake_PendingDoesNotError(t *testing.T) {
|
||||
engine := NewCoordinatorEngine(nil)
|
||||
userCtx := &UserProjectContext{
|
||||
AttachmentOnlyTurn: true,
|
||||
PendingTurnAttachments: []TurnAttachmentRef{{
|
||||
Filename: "F-030-PIR.pdf",
|
||||
ParseState: "pending",
|
||||
}},
|
||||
BlackboardFacts: map[string]string{},
|
||||
Project: ProjectInfo{Name: "内廷元"},
|
||||
}
|
||||
rec := &intent.IntentRecognitionResult{
|
||||
RawInput: "已上传文档：《F-030-PIR.pdf》",
|
||||
TopIntent: &intent.CandidateIntent{
|
||||
Intent: intent.IntentCasualChat,
|
||||
},
|
||||
}
|
||||
res, err := engine.ProcessIntent(context.Background(), rec, userCtx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !strings.Contains(res.NaturalReply, "解析") {
|
||||
t.Fatalf("reply=%s", res.NaturalReply)
|
||||
}
|
||||
if res.NextExpectation == nil || len(res.NextExpectation.Options) != 3 {
|
||||
t.Fatalf("expectation=%+v", res.NextExpectation)
|
||||
}
|
||||
if userCtx.AttachmentOnlyTurn || len(userCtx.PendingTurnAttachments) != 0 {
|
||||
t.Fatal("upload flags must be cleared after intake")
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleUploadIntake_ReadableFallbackReview(t *testing.T) {
|
||||
engine := NewCoordinatorEngine(nil)
|
||||
userCtx := &UserProjectContext{
|
||||
AttachmentOnlyTurn: true,
|
||||
PendingTurnAttachments: []TurnAttachmentRef{{
|
||||
Filename: "F-030-PIR.pdf",
|
||||
AssetID: 4,
|
||||
ParseState: "done",
|
||||
}},
|
||||
DocumentSummaryReader: func(_ context.Context, target string) (*ReadableDocument, error) {
|
||||
if target != intent.TargetDocLatestUpload {
|
||||
t.Fatalf("target=%s", target)
|
||||
}
|
||||
return &ReadableDocument{
|
||||
Title: "F-030-PIR 项目初始要求申请表",
|
||||
Markdown: "预期用途：白天 TEAS 改善打鼾。适应症：轻度 OSAHS。",
|
||||
}, nil
|
||||
},
|
||||
BlackboardFacts: map[string]string{},
|
||||
Project: ProjectInfo{Name: "内廷元"},
|
||||
}
|
||||
rec := &intent.IntentRecognitionResult{
|
||||
RawInput: "已上传文档：《F-030-PIR.pdf》",
|
||||
TopIntent: &intent.CandidateIntent{Intent: intent.IntentCasualChat},
|
||||
}
|
||||
res, err := engine.ProcessIntent(context.Background(), rec, userCtx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !strings.Contains(res.NaturalReply, "OSAHS") || !strings.Contains(res.NaturalReply, "1.") {
|
||||
t.Fatalf("reply=%s", res.NaturalReply)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAnnotateUnrelatedUploads_AppendsAsk(t *testing.T) {
|
||||
engine := NewCoordinatorEngine(nil)
|
||||
userCtx := &UserProjectContext{
|
||||
PendingTurnAttachments: []TurnAttachmentRef{{Filename: "说明书.pdf", ParseState: "done"}},
|
||||
BlackboardFacts: map[string]string{},
|
||||
Project: ProjectInfo{Name: "项目", CurrentStage: ""},
|
||||
}
|
||||
rec := &intent.IntentRecognitionResult{
|
||||
RawInput: "今天会议改到三点",
|
||||
TopIntent: &intent.CandidateIntent{Intent: intent.IntentCasualChat, Confidence: 0.9},
|
||||
}
|
||||
res, err := engine.ProcessIntent(context.Background(), rec, userCtx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
res = AnnotateUnrelatedUploads(userCtx, rec.RawInput, rec, res)
|
||||
if !strings.Contains(res.NaturalReply, "另外已收到") || !strings.Contains(res.NaturalReply, "说明书.pdf") {
|
||||
t.Fatalf("reply=%s", res.NaturalReply)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAnnotateUnrelatedUploads_SkipsSummaryIntent(t *testing.T) {
|
||||
userCtx := &UserProjectContext{
|
||||
PendingTurnAttachments: []TurnAttachmentRef{{Filename: "说明书.pdf"}},
|
||||
}
|
||||
rec := &intent.IntentRecognitionResult{
|
||||
RawInput: "总结刚上传的说明书",
|
||||
TopIntent: &intent.CandidateIntent{Intent: intent.IntentQueryDocStatus},
|
||||
}
|
||||
res := AnnotateUnrelatedUploads(userCtx, rec.RawInput, rec, &CoordinationResult{NaturalReply: "摘要"})
|
||||
if strings.Contains(res.NaturalReply, "另外已收到") {
|
||||
t.Fatalf("should not ask again: %s", res.NaturalReply)
|
||||
}
|
||||
}
|
||||
@@ -58,6 +58,14 @@ func HashTurnBody(sessionID, message string) string {
|
||||
return hex.EncodeToString(h[:])
|
||||
}
|
||||
|
||||
// HashTurnBodyWithKey 在消息哈希上并入附件引用，避免同文不同附件被当成同一回合。
|
||||
func HashTurnBodyWithKey(sessionID, message, extra string) string {
|
||||
if extra == "" {
|
||||
return HashTurnBody(sessionID, message)
|
||||
}
|
||||
return HashTurnBody(sessionID, message+"\n"+extra)
|
||||
}
|
||||
|
||||
// AcquireChatTurn 尝试取得回合执行权（INSERT ON CONFLICT）
|
||||
func (m *ContextManager) AcquireChatTurn(
|
||||
ctx context.Context,
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"chat-agent-system/internal/ctxmgr"
|
||||
)
|
||||
|
||||
func TestPrepareChatTurn_AttachmentOnlyAndEmptyRejected(t *testing.T) {
|
||||
stored, only, reject := prepareChatTurn("", []TurnAttachment{{
|
||||
Filename: "F-030-PIR.pdf",
|
||||
AssetID: 9,
|
||||
ParseState: "pending",
|
||||
}})
|
||||
if reject != "" || !only {
|
||||
t.Fatalf("attachment-only should pass, only=%v reject=%q", only, reject)
|
||||
}
|
||||
if !strings.Contains(stored, "F-030-PIR.pdf") {
|
||||
t.Fatalf("stored message = %q", stored)
|
||||
}
|
||||
|
||||
if _, _, reject = prepareChatTurn(" ", nil); reject != "message cannot be empty" {
|
||||
t.Fatalf("empty turn reject = %q", reject)
|
||||
}
|
||||
stored, only, reject = prepareChatTurn("总结一下", []TurnAttachment{{Filename: "a.pdf"}})
|
||||
if reject != "" || only || stored != "总结一下" {
|
||||
t.Fatalf("text+attachment stored=%q only=%v reject=%q", stored, only, reject)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTurnAttachmentHashKey_ChangesBodyHash(t *testing.T) {
|
||||
a := turnAttachmentHashKey([]TurnAttachment{{Filename: "a.pdf", AssetID: 1}})
|
||||
b := turnAttachmentHashKey([]TurnAttachment{{Filename: "a.pdf", AssetID: 2}})
|
||||
if a == b {
|
||||
t.Fatal("different assets must not share a hash key")
|
||||
}
|
||||
if ctxmgr.HashTurnBodyWithKey("sess", "hello", "") != ctxmgr.HashTurnBody("sess", "hello") {
|
||||
t.Fatal("empty extra must match the plain body hash")
|
||||
}
|
||||
if ctxmgr.HashTurnBodyWithKey("sess", "hello", a) == ctxmgr.HashTurnBodyWithKey("sess", "hello", b) {
|
||||
t.Fatal("attachment key must change the turn hash")
|
||||
}
|
||||
}
|
||||
|
||||
func TestChatStream_EmptyMessageWithoutAttachmentRejected(t *testing.T) {
|
||||
srv := newTestServer(t)
|
||||
body, _ := json.Marshal(StreamChatRequest{SessionID: "s-empty"})
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/chat/stream", bytes.NewReader(body))
|
||||
rec := httptest.NewRecorder()
|
||||
srv.Routes().ServeHTTP(rec, req)
|
||||
if rec.Code != http.StatusBadRequest || !strings.Contains(rec.Body.String(), "message cannot be empty") {
|
||||
t.Fatalf("status=%d body=%s", rec.Code, rec.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestChatStream_AttachmentOnlyPassesEmptyCheck(t *testing.T) {
|
||||
srv := newTestServer(t)
|
||||
body, _ := json.Marshal(StreamChatRequest{
|
||||
SessionID: "s-upload",
|
||||
Attachments: []TurnAttachment{{
|
||||
Filename: "F-030-PIR.pdf",
|
||||
ParseState: "pending",
|
||||
}},
|
||||
})
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/chat/stream", bytes.NewReader(body))
|
||||
rec := httptest.NewRecorder()
|
||||
srv.Routes().ServeHTTP(rec, req)
|
||||
if rec.Code == http.StatusBadRequest && strings.Contains(rec.Body.String(), "message cannot be empty") {
|
||||
t.Fatalf("attachment-only must not be rejected as empty: %s", rec.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestChat_AttachmentOnlyPendingRepliesInsteadOf400(t *testing.T) {
|
||||
srv := newTestServer(t)
|
||||
body, _ := json.Marshal(ChatRequest{
|
||||
SessionID: "s-upload-sync",
|
||||
ProjectName: "内窥镜研发项目",
|
||||
Attachments: []TurnAttachment{{
|
||||
Filename: "F-030-PIR.pdf",
|
||||
ParseState: "pending",
|
||||
}},
|
||||
})
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/chat", bytes.NewReader(body))
|
||||
withBearerAuth(req, loginTestAdmin(t, srv))
|
||||
rec := httptest.NewRecorder()
|
||||
srv.Routes().ServeHTTP(rec, req)
|
||||
if rec.Code != http.StatusOK {
|
||||
t.Fatalf("status=%d body=%s", rec.Code, rec.Body.String())
|
||||
}
|
||||
if !strings.Contains(rec.Body.String(), "解析") {
|
||||
t.Fatalf("expected parse guidance, got %s", rec.Body.String())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"chat-agent-system/internal/chat"
|
||||
"chat-agent-system/internal/coordinator"
|
||||
)
|
||||
|
||||
// prepareChatTurn 允许「只上传文档、不写文字」。落库文字由文件名合成，原始空串不会进入模型。
|
||||
func prepareChatTurn(message string, atts []TurnAttachment) (stored string, attachmentOnly bool, reject string) {
|
||||
atts = normalizeTurnAttachments(atts)
|
||||
message = strings.TrimSpace(message)
|
||||
if message == "" && len(atts) == 0 {
|
||||
return "", false, "message cannot be empty"
|
||||
}
|
||||
if message == "" {
|
||||
return attachmentOnlyStoredMessage(atts), true, ""
|
||||
}
|
||||
return message, false, ""
|
||||
}
|
||||
|
||||
func normalizeTurnAttachments(atts []TurnAttachment) []TurnAttachment {
|
||||
if len(atts) == 0 {
|
||||
return nil
|
||||
}
|
||||
out := make([]TurnAttachment, 0, len(atts))
|
||||
for _, att := range atts {
|
||||
att.Filename = strings.TrimSpace(att.Filename)
|
||||
att.DocID = strings.TrimSpace(att.DocID)
|
||||
att.ParseState = strings.TrimSpace(att.ParseState)
|
||||
if att.Filename == "" && att.DocID == "" && att.AssetID == 0 {
|
||||
continue
|
||||
}
|
||||
if att.Filename == "" {
|
||||
att.Filename = "未命名文档"
|
||||
}
|
||||
out = append(out, att)
|
||||
}
|
||||
if len(out) == 0 {
|
||||
return nil
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func attachmentOnlyStoredMessage(atts []TurnAttachment) string {
|
||||
names := make([]string, 0, len(atts))
|
||||
for _, att := range atts {
|
||||
names = append(names, "《"+strings.Trim(att.Filename, "《》")+"》")
|
||||
}
|
||||
return "已上传文档：" + strings.Join(names, "、")
|
||||
}
|
||||
|
||||
func turnAttachmentHashKey(atts []TurnAttachment) string {
|
||||
atts = normalizeTurnAttachments(atts)
|
||||
if len(atts) == 0 {
|
||||
return ""
|
||||
}
|
||||
parts := make([]string, 0, len(atts))
|
||||
for _, att := range atts {
|
||||
parts = append(parts, fmt.Sprintf("%s|%s|%d|%s", att.Filename, att.DocID, att.AssetID, att.ParseState))
|
||||
}
|
||||
return strings.Join(parts, ";")
|
||||
}
|
||||
|
||||
func (s *Server) bindTurnAttachments(sess *chat.Session, atts []TurnAttachment, attachmentOnly bool) {
|
||||
if sess == nil || sess.UserCtx == nil {
|
||||
return
|
||||
}
|
||||
atts = normalizeTurnAttachments(atts)
|
||||
refs := make([]coordinator.TurnAttachmentRef, 0, len(atts))
|
||||
for _, att := range atts {
|
||||
refs = append(refs, coordinator.TurnAttachmentRef{
|
||||
Filename: att.Filename,
|
||||
DocID: att.DocID,
|
||||
AssetID: att.AssetID,
|
||||
ParseState: att.ParseState,
|
||||
})
|
||||
}
|
||||
sess.UserCtx.PendingTurnAttachments = refs
|
||||
sess.UserCtx.AttachmentOnlyTurn = attachmentOnly && len(refs) > 0
|
||||
}
|
||||
+21
-12
@@ -26,18 +26,27 @@ type HealthResponse struct {
|
||||
|
||||
// ChatRequest 对话请求
|
||||
type ChatRequest struct {
|
||||
SessionID string `json:"session_id"`
|
||||
Message string `json:"message"`
|
||||
ProjectName string `json:"project_name,omitempty"`
|
||||
CustomerName string `json:"customer_name,omitempty"`
|
||||
DeviceType string `json:"device_type,omitempty"`
|
||||
IntendedUse string `json:"intended_use,omitempty"`
|
||||
TargetMarket string `json:"target_market,omitempty"`
|
||||
WorkDir string `json:"work_dir,omitempty"`
|
||||
UserName string `json:"user_name,omitempty"`
|
||||
UserRole string `json:"user_role,omitempty"`
|
||||
UserID int64 `json:"user_id,omitempty"`
|
||||
ProjectID int64 `json:"project_id,omitempty"`
|
||||
SessionID string `json:"session_id"`
|
||||
Message string `json:"message"`
|
||||
ProjectName string `json:"project_name,omitempty"`
|
||||
CustomerName string `json:"customer_name,omitempty"`
|
||||
DeviceType string `json:"device_type,omitempty"`
|
||||
IntendedUse string `json:"intended_use,omitempty"`
|
||||
TargetMarket string `json:"target_market,omitempty"`
|
||||
WorkDir string `json:"work_dir,omitempty"`
|
||||
UserName string `json:"user_name,omitempty"`
|
||||
UserRole string `json:"user_role,omitempty"`
|
||||
UserID int64 `json:"user_id,omitempty"`
|
||||
ProjectID int64 `json:"project_id,omitempty"`
|
||||
Attachments []TurnAttachment `json:"attachments,omitempty"`
|
||||
}
|
||||
|
||||
// TurnAttachment 本轮已登记的上传引用。正文仍走文档/CAS 读取，不把文件字节放进对话请求。
|
||||
type TurnAttachment struct {
|
||||
Filename string `json:"filename"`
|
||||
DocID string `json:"doc_id,omitempty"`
|
||||
AssetID int64 `json:"asset_id,omitempty"`
|
||||
ParseState string `json:"parse_state,omitempty"`
|
||||
}
|
||||
|
||||
// TaskRunRequestDTO 独立任务运行请求
|
||||
|
||||
@@ -55,10 +55,13 @@ func (s *Server) handleChat(w http.ResponseWriter, r *http.Request) {
|
||||
writeSafeError(w, r, http.StatusBadRequest, "invalid request body: "+err.Error())
|
||||
return
|
||||
}
|
||||
if req.Message == "" {
|
||||
writeSafeError(w, r, http.StatusBadRequest, "message cannot be empty")
|
||||
storedMessage, attachmentOnly, reject := prepareChatTurn(req.Message, req.Attachments)
|
||||
if reject != "" {
|
||||
writeSafeError(w, r, http.StatusBadRequest, reject)
|
||||
return
|
||||
}
|
||||
req.Message = storedMessage
|
||||
req.Attachments = normalizeTurnAttachments(req.Attachments)
|
||||
req.WorkDir = ""
|
||||
|
||||
sess, err := s.getOrCreateSession(
|
||||
@@ -103,6 +106,7 @@ func (s *Server) handleChat(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
s.bindSessionDocumentSummaryReader(sess, user)
|
||||
s.bindTurnAttachments(sess, req.Attachments, attachmentOnly)
|
||||
|
||||
var resp *chat.ChatResponse
|
||||
err = sess.WithExecLock(func() error {
|
||||
|
||||
+23
-18
@@ -27,20 +27,21 @@ type taskStreamRequest struct {
|
||||
|
||||
// StreamChatRequest SSE流式请求参数
|
||||
type StreamChatRequest struct {
|
||||
SessionID string `json:"session_id"`
|
||||
Message string `json:"message"`
|
||||
IncludeDetails bool `json:"include_details"` // 是否推送底层长篇推演草稿 (按需展开，默认 false)
|
||||
ProjectName string `json:"project_name,omitempty"`
|
||||
CustomerName string `json:"customer_name,omitempty"`
|
||||
DeviceType string `json:"device_type,omitempty"`
|
||||
IntendedUse string `json:"intended_use,omitempty"`
|
||||
TargetMarket string `json:"target_market,omitempty"`
|
||||
WorkDir string `json:"work_dir,omitempty"`
|
||||
UserName string `json:"user_name,omitempty"`
|
||||
UserRole string `json:"user_role,omitempty"`
|
||||
UserID int64 `json:"user_id,omitempty"`
|
||||
ProjectID int64 `json:"project_id,omitempty"`
|
||||
ClientTurnID string `json:"client_turn_id,omitempty"`
|
||||
SessionID string `json:"session_id"`
|
||||
Message string `json:"message"`
|
||||
Attachments []TurnAttachment `json:"attachments,omitempty"`
|
||||
IncludeDetails bool `json:"include_details"` // 是否推送底层长篇推演草稿 (按需展开，默认 false)
|
||||
ProjectName string `json:"project_name,omitempty"`
|
||||
CustomerName string `json:"customer_name,omitempty"`
|
||||
DeviceType string `json:"device_type,omitempty"`
|
||||
IntendedUse string `json:"intended_use,omitempty"`
|
||||
TargetMarket string `json:"target_market,omitempty"`
|
||||
WorkDir string `json:"work_dir,omitempty"`
|
||||
UserName string `json:"user_name,omitempty"`
|
||||
UserRole string `json:"user_role,omitempty"`
|
||||
UserID int64 `json:"user_id,omitempty"`
|
||||
ProjectID int64 `json:"project_id,omitempty"`
|
||||
ClientTurnID string `json:"client_turn_id,omitempty"`
|
||||
}
|
||||
|
||||
// 长任务 SSE：不取消全局 WriteTimeout，仅在流式响应上周期性延长写期限并发心跳。
|
||||
@@ -171,14 +172,17 @@ func (s *Server) handleChatStream(w http.ResponseWriter, r *http.Request) {
|
||||
if inc := q.Get("include_details"); inc != "" {
|
||||
req.IncludeDetails, _ = strconv.ParseBool(inc)
|
||||
}
|
||||
// GET 无 message 时后续统一被 message cannot be empty 拒绝；
|
||||
// GET 无 message、无附件时后续统一被 message cannot be empty 拒绝；
|
||||
// 保留该分支结构便于后续订阅型 GET 扩展，不再写死 Message=query 值。
|
||||
}
|
||||
|
||||
if req.Message == "" {
|
||||
writeSafeError(w, r, http.StatusBadRequest, "message cannot be empty")
|
||||
storedMessage, attachmentOnly, reject := prepareChatTurn(req.Message, req.Attachments)
|
||||
if reject != "" {
|
||||
writeSafeError(w, r, http.StatusBadRequest, reject)
|
||||
return
|
||||
}
|
||||
req.Message = storedMessage
|
||||
req.Attachments = normalizeTurnAttachments(req.Attachments)
|
||||
|
||||
user, ok := s.requirePrincipal(w, r)
|
||||
if !ok {
|
||||
@@ -246,6 +250,7 @@ func (s *Server) handleChatStream(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
s.bindSessionDocumentSummaryReader(sess, user)
|
||||
s.bindTurnAttachments(sess, req.Attachments, attachmentOnly)
|
||||
if sess.UserCtx != nil {
|
||||
if req.ProjectName != "" && (sess.UserCtx.Project.Name == "" || sess.UserCtx.Project.Name == "医疗器械研发项目" || sess.UserCtx.Project.Name == "当前项目") {
|
||||
sess.UserCtx.Project.Name = req.ProjectName
|
||||
@@ -308,7 +313,7 @@ func (s *Server) handleChatStream(w http.ResponseWriter, r *http.Request) {
|
||||
if clientTurnID != "" {
|
||||
turnOpts = &chat.TurnOptions{ClientTurnID: clientTurnID}
|
||||
if sess.CtxMgr != nil {
|
||||
bodyHash := ctxmgr.HashTurnBody(req.SessionID, req.Message)
|
||||
bodyHash := ctxmgr.HashTurnBodyWithKey(req.SessionID, req.Message, turnAttachmentHashKey(req.Attachments))
|
||||
acq, acqErr := sess.CtxMgr.AcquireChatTurn(ctx, req.SessionID, clientTurnID, bodyHash, requestID, sess.UserID, sess.ProjectID)
|
||||
if errors.Is(acqErr, ctxmgr.ErrIdempotencyKeyReused) {
|
||||
writeMu.Lock()
|
||||
|
||||
Reference in New Issue
Block a user