feat: Add web search results handling and enhance knowledge retrieval features

- Introduced a new endpoint to fetch chunks by ID, improving access to specific knowledge base entries.
- Updated tool result types to include web search results, enhancing the display capabilities in the chat component.
- Enhanced the AgentStreamDisplay component to support rendering web search results with improved HTML formatting.
- Implemented logic for managing web search result summaries and citations, ensuring a cohesive user experience.
- Refactored session management to accommodate new web search functionalities, improving overall system integration.
This commit is contained in:
wizardchen
2025-11-11 22:26:59 +08:00
parent d2adc38baf
commit 14d0e663cc
25 changed files with 1317 additions and 650 deletions
+58
View File
@@ -22,6 +22,64 @@ func NewChunkHandler(service interfaces.ChunkService) *ChunkHandler {
return &ChunkHandler{service: service}
}
// GetChunkByIDOnly gets a chunk by its ID only (without requiring knowledge_id)
func (h *ChunkHandler) GetChunkByIDOnly(c *gin.Context) {
ctx := c.Request.Context()
logger.Info(ctx, "Start retrieving chunk by ID only")
chunkID := c.Param("id")
if chunkID == "" {
logger.Error(ctx, "Chunk ID is empty")
c.Error(errors.NewBadRequestError("Chunk ID cannot be empty"))
return
}
// Get tenant ID from context
tenantID, exists := c.Get(types.TenantIDContextKey.String())
if !exists {
logger.Error(ctx, "Failed to get tenant ID")
c.Error(errors.NewUnauthorizedError("Unauthorized"))
return
}
logger.Infof(ctx, "Retrieving chunk by ID, chunk ID: %s, tenant ID: %d", chunkID, tenantID)
// Get chunk by ID
chunk, err := h.service.GetChunkByID(ctx, chunkID)
if err != nil {
if err == service.ErrChunkNotFound {
logger.Warnf(ctx, "Chunk not found, chunk ID: %s", chunkID)
c.Error(errors.NewNotFoundError("Chunk not found"))
return
}
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError(err.Error()))
return
}
// Validate tenant ID
if chunk.TenantID != tenantID.(uint) {
logger.Warnf(
ctx,
"Tenant has no permission to access chunk, chunk ID: %s, req tenant: %d, chunk tenant: %d",
chunkID, tenantID.(uint), chunk.TenantID,
)
c.Error(errors.NewForbiddenError("No permission to access this chunk"))
return
}
// 对 chunk 内容进行安全清理
if chunk.Content != "" {
chunk.Content = secutils.SanitizeForDisplay(chunk.Content)
}
logger.Infof(ctx, "Successfully retrieved chunk by ID, chunk ID: %s", chunkID)
c.JSON(http.StatusOK, gin.H{
"success": true,
"data": chunk,
})
}
// ListKnowledgeChunks lists all chunks for a given knowledge ID
func (h *ChunkHandler) ListKnowledgeChunks(c *gin.Context) {
ctx := c.Request.Context()
-10
View File
@@ -5,7 +5,6 @@ import (
"fmt"
"time"
"github.com/Tencent/WeKnora/internal/errors"
"github.com/Tencent/WeKnora/internal/event"
"github.com/Tencent/WeKnora/internal/logger"
"github.com/Tencent/WeKnora/internal/types"
@@ -139,15 +138,6 @@ func (h *Handler) writeAgentQueryEvent(ctx context.Context, sessionID, assistant
}
}
// validateSessionAndGetID validates and extracts session ID from URL parameter
func validateSessionID(c *gin.Context) (string, error) {
sessionID := c.Param("session_id")
if sessionID == "" {
return "", errors.NewBadRequestError(errors.ErrInvalidSessionID.Error())
}
return sessionID, nil
}
// getRequestID gets the request ID from gin context
func getRequestID(c *gin.Context) string {
return c.GetString(types.RequestIDContextKey.String())
+18 -12
View File
@@ -2,6 +2,7 @@ package session
import (
"context"
"encoding/json"
"fmt"
"net/http"
"runtime"
@@ -143,6 +144,7 @@ func (h *Handler) AgentQA(c *gin.Context) {
c.Error(errors.NewBadRequestError(err.Error()))
return
}
logger.Infof(ctx, "Agent QA request, request: %+v", request)
// Validate query content
if request.Query == "" {
@@ -151,8 +153,6 @@ func (h *Handler) AgentQA(c *gin.Context) {
return
}
logger.Infof(ctx, "Agent QA request, session ID: %s, query: %s", sessionID, request.Query)
tenantInfo := ctx.Value(types.TenantInfoContextKey).(*types.Tenant)
// Get session information first
@@ -162,6 +162,13 @@ func (h *Handler) AgentQA(c *gin.Context) {
c.Error(errors.NewNotFoundError("Session not found"))
return
}
sessionJSON, err := json.Marshal(session)
if err != nil {
logger.Errorf(ctx, "Failed to marshal session, session ID: %s, error: %v", sessionID, err)
c.Error(errors.NewInternalServerError(err.Error()))
return
}
logger.Infof(ctx, "Before AgentQA, Session: %s", string(sessionJSON))
// Create assistant message
assistantMessage := &types.Message{
@@ -212,7 +219,7 @@ func (h *Handler) AgentQA(c *gin.Context) {
logger.Infof(ctx, "Agent mode changed from %v to %v", currentAgentEnabled, request.AgentEnabled)
configChanged = true
}
currentWebSearchEnabled := session.AgentConfig.AgentModeEnabled
currentWebSearchEnabled := session.AgentConfig.WebSearchEnabled
if request.WebSearchEnabled != currentWebSearchEnabled {
logger.Infof(ctx, "Web search mode changed from %v to %v", currentWebSearchEnabled, request.WebSearchEnabled)
configChanged = true
@@ -228,16 +235,15 @@ func (h *Handler) AgentQA(c *gin.Context) {
// If configuration changed, clear context and update session
if configChanged {
logger.Infof(ctx, "Configuration changed, clearing context for session: %s", sessionID)
if knowledgeBasesChanged {
// Clear the LLM context to prevent contamination
if err := h.sessionService.ClearContext(ctx, sessionID); err != nil {
logger.Errorf(ctx, "Failed to clear context for session %s: %v", sessionID, err)
// Continue anyway - this is not a fatal error
}
logger.Warnf(ctx, "Configuration changed, clearing context for session: %s", sessionID)
// Clear the LLM context to prevent contamination
if err := h.sessionService.ClearContext(ctx, sessionID); err != nil {
logger.Errorf(ctx, "Failed to clear context for session %s: %v", sessionID, err)
// Continue anyway - this is not a fatal error
}
if knowledgeBasesChanged {
// todo clear temp kb
if err := h.sessionService.DeleteWebSearchTempKBState(ctx, sessionID); err != nil {
logger.Errorf(ctx, "Failed to delete temp knowledge base for session %s: %v", sessionID, err)
// Continue anyway - this is not a fatal error
}
session.AgentConfig.KnowledgeBases = request.KnowledgeBaseIDs
session.AgentConfig.AgentModeEnabled = request.AgentEnabled
+2 -2
View File
@@ -283,7 +283,7 @@ func (h *TenantHandler) GetTenantAgentConfig(c *gin.Context) {
"temperature": agent.DefaultAgentTemperature,
"thinking_model_id": "",
"rerank_model_id": "",
"system_prompt": agent.DefaultReActSystemPrompt,
"system_prompt": agent.DefaultSystemPromptTemplate,
"available_tools": availableTools,
"available_placeholders": availablePlaceholders,
},
@@ -294,7 +294,7 @@ func (h *TenantHandler) GetTenantAgentConfig(c *gin.Context) {
// Get system prompt, use default if empty
systemPrompt := tenant.AgentConfig.SystemPrompt
if systemPrompt == "" {
systemPrompt = agent.DefaultReActSystemPrompt
systemPrompt = agent.DefaultSystemPromptTemplate
}
logger.Infof(ctx, "Retrieved tenant agent config successfully, Tenant ID: %d", tenant.ID)