From 58ae0d835080df63540b25f7a495754f3d516545 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Mon, 22 Dec 2025 11:49:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=9C=A8=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=B5=81=E4=B8=AD=E5=B1=95=E7=A4=BA@=E7=9A=84?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=92=8C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/chat/streame.ts | 6 +- frontend/src/components/Input-field.vue | 9 +- .../src/views/chat/components/usermsg.vue | 109 +++++++++++++++++- frontend/src/views/chat/index.vue | 10 +- internal/handler/session/helpers.go | 32 +++-- internal/handler/session/qa.go | 9 +- internal/handler/session/types.go | 21 +++- internal/types/message.go | 39 +++++++ .../versioned/000005_mentioned_items.down.sql | 3 + .../versioned/000005_mentioned_items.up.sql | 7 ++ 10 files changed, 219 insertions(+), 26 deletions(-) create mode 100644 migrations/versioned/000005_mentioned_items.down.sql create mode 100644 migrations/versioned/000005_mentioned_items.up.sql diff --git a/frontend/src/api/chat/streame.ts b/frontend/src/api/chat/streame.ts index 4516f87a..4b0ae712 100644 --- a/frontend/src/api/chat/streame.ts +++ b/frontend/src/api/chat/streame.ts @@ -28,7 +28,7 @@ export function useStream() { let renderTimer: number | null = null // 启动流式请求 - const startStream = async (params: { session_id: any; query: any; knowledge_base_ids?: string[]; knowledge_ids?: string[]; agent_enabled?: boolean; web_search_enabled?: boolean; summary_model_id?: string; mcp_service_ids?: string[]; method: string; url: string }) => { + const startStream = async (params: { session_id: any; query: any; knowledge_base_ids?: string[]; knowledge_ids?: string[]; agent_enabled?: boolean; web_search_enabled?: boolean; summary_model_id?: string; mcp_service_ids?: string[]; mentioned_items?: Array<{id: string; name: string; type: string; kb_type?: string}>; method: string; url: string }) => { // 重置状态 output.value = ''; error.value = null; @@ -101,6 +101,10 @@ export function useStream() { if (params.mcp_service_ids !== undefined && params.mcp_service_ids.length > 0) { postBody.mcp_service_ids = params.mcp_service_ids; } + // Include mentioned_items if provided (for displaying @mentions in chat) + if (params.mentioned_items !== undefined && params.mentioned_items.length > 0) { + postBody.mentioned_items = params.mentioned_items; + } await fetchEventSource(url, { method: params.method, diff --git a/frontend/src/components/Input-field.vue b/frontend/src/components/Input-field.vue index 218bc76c..58151851 100644 --- a/frontend/src/components/Input-field.vue +++ b/frontend/src/components/Input-field.vue @@ -816,7 +816,14 @@ const createSession = (val: string) => { if (props.isReplying) { return MessagePlugin.error(t('input.messages.replying')); } - emit('send-msg', val, selectedModelId.value); + // 获取@提及的知识库和文件信息 + const mentionedItems = allSelectedItems.value.map(item => ({ + id: item.id, + name: item.name, + type: item.type, + kb_type: item.type === 'kb' ? (item.kbType || 'document') : undefined + })); + emit('send-msg', val, selectedModelId.value, mentionedItems); clearvalue(); } diff --git a/frontend/src/views/chat/components/usermsg.vue b/frontend/src/views/chat/components/usermsg.vue index fed5d6b6..698c04d3 100644 --- a/frontend/src/views/chat/components/usermsg.vue +++ b/frontend/src/views/chat/components/usermsg.vue @@ -1,20 +1,121 @@ \ No newline at end of file + diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue index 2e2a55d7..3b187e16 100644 --- a/frontend/src/views/chat/index.vue +++ b/frontend/src/views/chat/index.vue @@ -4,7 +4,7 @@
- +
{ // API 调用成功后,后端的 stop 事件会清空它 }; -const sendMsg = async (value, modelId = '') => { +const sendMsg = async (value, modelId = '', mentionedItems = []) => { userquery.value = value; isReplying.value = true; loading.value = true; - messagesList.push({ content: value, role: 'user' }); + // 将@提及的知识库和文件信息存入用户消息 + messagesList.push({ content: value, role: 'user', mentioned_items: mentionedItems }); scrollToBottom(); // Get agent mode status from settings store @@ -329,6 +330,7 @@ const sendMsg = async (value, modelId = '') => { web_search_enabled: webSearchEnabled, summary_model_id: modelId, mcp_service_ids: mcpServiceIds, + mentioned_items: mentionedItems, query: value, method: 'POST', url: endpoint diff --git a/internal/handler/session/helpers.go b/internal/handler/session/helpers.go index ba02758a..f14ebc77 100644 --- a/internal/handler/session/helpers.go +++ b/internal/handler/session/helpers.go @@ -12,6 +12,23 @@ import ( "github.com/gin-gonic/gin" ) +// convertMentionedItems converts MentionedItemRequest slice to types.MentionedItems +func convertMentionedItems(items []MentionedItemRequest) types.MentionedItems { + if len(items) == 0 { + return nil + } + result := make(types.MentionedItems, len(items)) + for i, item := range items { + result[i] = types.MentionedItem{ + ID: item.ID, + Name: item.Name, + Type: item.Type, + KBType: item.KBType, + } + } + return result +} + // setSSEHeaders sets the standard Server-Sent Events headers func setSSEHeaders(c *gin.Context) { c.Header("Content-Type", "text/event-stream") @@ -77,14 +94,15 @@ func createAgentQueryEvent(sessionID, assistantMessageID string) interfaces.Stre } // createUserMessage creates a user message -func (h *Handler) createUserMessage(ctx context.Context, sessionID, query, requestID string) error { +func (h *Handler) createUserMessage(ctx context.Context, sessionID, query, requestID string, mentionedItems types.MentionedItems) error { _, err := h.messageService.CreateMessage(ctx, &types.Message{ - SessionID: sessionID, - Role: "user", - Content: query, - RequestID: requestID, - CreatedAt: time.Now(), - IsCompleted: true, + SessionID: sessionID, + Role: "user", + Content: query, + RequestID: requestID, + CreatedAt: time.Now(), + IsCompleted: true, + MentionedItems: mentionedItems, }) return err } diff --git a/internal/handler/session/qa.go b/internal/handler/session/qa.go index 84e7a571..533ab008 100644 --- a/internal/handler/session/qa.go +++ b/internal/handler/session/qa.go @@ -155,7 +155,8 @@ func (h *Handler) KnowledgeQA(c *gin.Context) { h.handleKnowledgeQARequest(ctx, c, session, secutils.SanitizeForLog(request.Query), secutils.SanitizeForLogArray(knowledgeBaseIDs), secutils.SanitizeForLogArray(request.KnowledgeIds), - assistantMessage, true, secutils.SanitizeForLog(request.SummaryModelID), request.WebSearchEnabled) + assistantMessage, true, secutils.SanitizeForLog(request.SummaryModelID), request.WebSearchEnabled, + convertMentionedItems(request.MentionedItems)) } // AgentQA godoc @@ -386,6 +387,7 @@ func (h *Handler) AgentQA(c *gin.Context) { false, secutils.SanitizeForLog(request.SummaryModelID), request.WebSearchEnabled, + convertMentionedItems(request.MentionedItems), ) return } @@ -410,7 +412,7 @@ func (h *Handler) AgentQA(c *gin.Context) { setSSEHeaders(c) // Create user message - if err := h.createUserMessage(ctx, sessionID, secutils.SanitizeForLog(request.Query), requestID); err != nil { + if err := h.createUserMessage(ctx, sessionID, secutils.SanitizeForLog(request.Query), requestID, convertMentionedItems(request.MentionedItems)); err != nil { c.Error(errors.NewInternalServerError(err.Error())) return } @@ -498,12 +500,13 @@ func (h *Handler) handleKnowledgeQARequest( generateTitle bool, // Whether to generate title if session has no title summaryModelID string, // Optional summary model ID (overrides session default) webSearchEnabled bool, // Whether web search is enabled + mentionedItems types.MentionedItems, // @mentioned knowledge bases and files ) { sessionID := session.ID requestID := getRequestID(c) // Create user message - if err := h.createUserMessage(ctx, sessionID, query, requestID); err != nil { + if err := h.createUserMessage(ctx, sessionID, query, requestID, mentionedItems); err != nil { c.Error(errors.NewInternalServerError(err.Error())) return } diff --git a/internal/handler/session/types.go b/internal/handler/session/types.go index fb0ea153..fce15fc8 100644 --- a/internal/handler/session/types.go +++ b/internal/handler/session/types.go @@ -51,14 +51,23 @@ type GenerateTitleRequest struct { Messages []types.Message `json:"messages" binding:"required"` // Messages to use as context for title generation } +// MentionedItemRequest represents a mentioned item in the request +type MentionedItemRequest struct { + ID string `json:"id"` + Name string `json:"name"` + Type string `json:"type"` // "kb" for knowledge base, "file" for file + KBType string `json:"kb_type"` // "document" or "faq" (only for kb type) +} + // CreateKnowledgeQARequest defines the request structure for knowledge QA type CreateKnowledgeQARequest struct { - Query string `json:"query" binding:"required"` // Query text for knowledge base search - KnowledgeBaseIDs []string `json:"knowledge_base_ids"` // Selected knowledge base ID for this request - KnowledgeIds []string `json:"knowledge_ids"` // Selected knowledge ID for this request - AgentEnabled bool `json:"agent_enabled"` // Whether agent mode is enabled for this request - WebSearchEnabled bool `json:"web_search_enabled"` // Whether web search is enabled for this request - SummaryModelID string `json:"summary_model_id"` // Optional summary model ID for this request (overrides session default) + Query string `json:"query" binding:"required"` // Query text for knowledge base search + KnowledgeBaseIDs []string `json:"knowledge_base_ids"` // Selected knowledge base ID for this request + KnowledgeIds []string `json:"knowledge_ids"` // Selected knowledge ID for this request + AgentEnabled bool `json:"agent_enabled"` // Whether agent mode is enabled for this request + WebSearchEnabled bool `json:"web_search_enabled"` // Whether web search is enabled for this request + SummaryModelID string `json:"summary_model_id"` // Optional summary model ID for this request (overrides session default) + MentionedItems []MentionedItemRequest `json:"mentioned_items"` // @mentioned knowledge bases and files } // SearchKnowledgeRequest defines the request structure for searching knowledge without LLM summarization diff --git a/internal/types/message.go b/internal/types/message.go index 9173c906..ecef2077 100644 --- a/internal/types/message.go +++ b/internal/types/message.go @@ -20,6 +20,39 @@ type History struct { KnowledgeReferences References // Knowledge references used in the answer } +// MentionedItem represents a mentioned knowledge base or file +type MentionedItem struct { + ID string `json:"id"` + Name string `json:"name"` + Type string `json:"type"` // "kb" for knowledge base, "file" for file + KBType string `json:"kb_type"` // "document" or "faq" (only for kb type) +} + +// MentionedItems is a slice of MentionedItem for database storage +type MentionedItems []MentionedItem + +// Value implements the driver.Valuer interface for database serialization +func (m MentionedItems) Value() (driver.Value, error) { + if m == nil { + return json.Marshal([]MentionedItem{}) + } + return json.Marshal(m) +} + +// Scan implements the sql.Scanner interface for database deserialization +func (m *MentionedItems) Scan(value interface{}) error { + if value == nil { + *m = make(MentionedItems, 0) + return nil + } + b, ok := value.([]byte) + if !ok { + *m = make(MentionedItems, 0) + return nil + } + return json.Unmarshal(b, m) +} + // Message represents a conversation message // Each message belongs to a conversation session and can be from either user or system // Messages can contain references to knowledge chunks used to generate responses @@ -40,6 +73,9 @@ type Message struct { // This contains the detailed reasoning process and tool calls made by the agent // Stored for user history display, but NOT included in LLM context to avoid redundancy AgentSteps AgentSteps `json:"agent_steps,omitempty" gorm:"type:jsonb,column:agent_steps"` + // Mentioned knowledge bases and files (for user messages) + // Stores the @mentioned items when user sends a message + MentionedItems MentionedItems `json:"mentioned_items,omitempty" gorm:"type:jsonb,column:mentioned_items"` // Whether message generation is complete IsCompleted bool `json:"is_completed"` // Message creation timestamp @@ -91,5 +127,8 @@ func (m *Message) BeforeCreate(tx *gorm.DB) (err error) { if m.AgentSteps == nil { m.AgentSteps = make(AgentSteps, 0) } + if m.MentionedItems == nil { + m.MentionedItems = make(MentionedItems, 0) + } return nil } diff --git a/migrations/versioned/000005_mentioned_items.down.sql b/migrations/versioned/000005_mentioned_items.down.sql new file mode 100644 index 00000000..c36c7333 --- /dev/null +++ b/migrations/versioned/000005_mentioned_items.down.sql @@ -0,0 +1,3 @@ +-- Remove mentioned_items column from messages table + +ALTER TABLE messages DROP COLUMN IF EXISTS mentioned_items; diff --git a/migrations/versioned/000005_mentioned_items.up.sql b/migrations/versioned/000005_mentioned_items.up.sql new file mode 100644 index 00000000..abb21cb2 --- /dev/null +++ b/migrations/versioned/000005_mentioned_items.up.sql @@ -0,0 +1,7 @@ +-- Add mentioned_items column to messages table +-- This column stores @mentioned knowledge bases and files when user sends a message + +ALTER TABLE messages ADD COLUMN IF NOT EXISTS mentioned_items JSONB DEFAULT '[]'; + +-- Add comment for the column +COMMENT ON COLUMN messages.mentioned_items IS 'Stores @mentioned knowledge bases and files (id, name, type) when user sends a message';