feat: 支持在消息流中展示@的知识库和文件

This commit is contained in:
wizardchen
2025-12-22 11:49:58 +08:00
committed by lyingbug
parent 3c83cf9873
commit 58ae0d8350
10 changed files with 219 additions and 26 deletions
+5 -1
View File
@@ -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,
+8 -1
View File
@@ -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();
}
+105 -4
View File
@@ -1,20 +1,121 @@
<template>
<div class="user_msg">
{{ content }}
<div class="user_msg_container">
<!-- 显示@的知识库和文件 -->
<div v-if="mentioned_items && mentioned_items.length > 0" class="mentioned_items">
<span
v-for="item in mentioned_items"
:key="item.id"
class="mentioned_tag"
:class="[
item.type === 'kb' ? (item.kb_type === 'faq' ? 'faq-tag' : 'kb-tag') : 'file-tag'
]"
>
<span class="tag_icon">
<t-icon v-if="item.type === 'kb'" :name="item.kb_type === 'faq' ? 'chat-bubble-help' : 'folder'" />
<t-icon v-else name="file" />
</span>
<span class="tag_name">{{ item.name }}</span>
</span>
</div>
<div class="user_msg">
{{ content }}
</div>
</div>
</template>
<script setup>
import { ref, defineProps } from "vue";
import { defineProps } from "vue";
const props = defineProps({
// 必填项
content: {
type: String,
required: false
},
// @提及的知识库和文件
mentioned_items: {
type: Array,
required: false,
default: () => []
}
});
</script>
<style scoped lang="less">
.user_msg_container {
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 6px;
width: 100%;
}
.mentioned_items {
display: flex;
flex-wrap: wrap;
gap: 6px;
justify-content: flex-end;
max-width: 100%;
margin-bottom: 2px;
}
.mentioned_tag {
display: inline-flex;
align-items: center;
gap: 4px;
padding: 4px 8px;
border-radius: 6px;
font-size: 12px;
font-weight: 500;
max-width: 200px;
cursor: default;
transition: all 0.15s;
background: var(--td-bg-color-secondarycontainer, #f3f3f3);
border: 1px solid transparent;
color: var(--td-text-color-primary, #333);
/* KB - Document (Greenish tint) */
&.kb-tag {
background: rgba(16, 185, 129, 0.08);
color: #059669;
.tag_icon {
color: #10b981;
}
}
/* KB - FAQ (Blueish tint) */
&.faq-tag {
background: rgba(0, 82, 217, 0.08);
color: #0052d9;
.tag_icon {
color: #0052d9;
}
}
/* File (Orange tint) */
&.file-tag {
background: rgba(237, 123, 47, 0.08);
color: #e65100;
.tag_icon {
color: #ed7b2f;
}
}
.tag_icon {
font-size: 14px;
display: flex;
align-items: center;
}
.tag_name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: currentColor;
}
}
.user_msg {
width: max-content;
max-width: 776px;
@@ -35,4 +136,4 @@ const props = defineProps({
max-width: 100%;
box-sizing: border-box;
}
</style>
</style>
+6 -4
View File
@@ -4,7 +4,7 @@
<div class="msg_list">
<div v-for="(session, id) in messagesList" :key='id'>
<div v-if="session.role == 'user'">
<usermsg :content="session.content"></usermsg>
<usermsg :content="session.content" :mentioned_items="session.mentioned_items"></usermsg>
</div>
<div v-if="session.role == 'assistant'">
<botmsg :content="session.content" :session="session" :user-query="getUserQuery(id)" @scroll-bottom="scrollToBottom"
@@ -23,7 +23,7 @@
</div>
<div style="min-height: 115px; margin: 16px auto 4px;width: 100%;max-width: 800px;">
<InputField
@send-msg="(query, modelId) => sendMsg(query, modelId)"
@send-msg="(query, modelId, mentionedItems) => sendMsg(query, modelId, mentionedItems)"
@stop-generation="handleStopGeneration"
:isReplying="isReplying"
:sessionId="session_id"
@@ -296,11 +296,12 @@ const handleStopGeneration = () => {
// 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
+25 -7
View File
@@ -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
}
+6 -3
View File
@@ -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
}
+15 -6
View File
@@ -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
+39
View File
@@ -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
}
@@ -0,0 +1,3 @@
-- Remove mentioned_items column from messages table
ALTER TABLE messages DROP COLUMN IF EXISTS mentioned_items;
@@ -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';