feat: correct data analysis errors using fileService.
This commit is contained in:
@@ -58,6 +58,7 @@ type agentService struct {
|
||||
duckdb *sql.DB
|
||||
webSearchStateService interfaces.WebSearchStateService
|
||||
wikiPageService interfaces.WikiPageService
|
||||
tenantService interfaces.TenantService
|
||||
}
|
||||
|
||||
// NewAgentService creates a new agent service
|
||||
@@ -76,6 +77,7 @@ func NewAgentService(
|
||||
duckdb *sql.DB,
|
||||
webSearchStateService interfaces.WebSearchStateService,
|
||||
wikiPageService interfaces.WikiPageService,
|
||||
tenantService interfaces.TenantService,
|
||||
) interfaces.AgentService {
|
||||
return &agentService{
|
||||
cfg: cfg,
|
||||
@@ -92,6 +94,7 @@ func NewAgentService(
|
||||
duckdb: duckdb,
|
||||
webSearchStateService: webSearchStateService,
|
||||
wikiPageService: wikiPageService,
|
||||
tenantService: tenantService,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -544,7 +547,7 @@ func (s *agentService) registerTools(
|
||||
logger.Infof(ctx, "Registered web_fetch tool for session: %s", sessionID)
|
||||
|
||||
case tools.ToolDataAnalysis:
|
||||
toolToRegister = tools.NewDataAnalysisTool(s.knowledgeService, s.fileService, s.duckdb, sessionID)
|
||||
toolToRegister = tools.NewDataAnalysisTool(s.knowledgeBaseService, s.knowledgeService, s.tenantService, s.fileService, s.duckdb, sessionID)
|
||||
logger.Infof(ctx, "Registered data_analysis tool for session: %s", sessionID)
|
||||
|
||||
case tools.ToolDataSchema:
|
||||
|
||||
@@ -17,27 +17,33 @@ import (
|
||||
)
|
||||
|
||||
type PluginDataAnalysis struct {
|
||||
modelService interfaces.ModelService
|
||||
knowledgeService interfaces.KnowledgeService
|
||||
fileService interfaces.FileService
|
||||
chunkRepo interfaces.ChunkRepository
|
||||
db *sql.DB
|
||||
modelService interfaces.ModelService
|
||||
knowledgeBaseService interfaces.KnowledgeBaseService
|
||||
knowledgeService interfaces.KnowledgeService
|
||||
fileService interfaces.FileService
|
||||
chunkRepo interfaces.ChunkRepository
|
||||
tenantService interfaces.TenantService
|
||||
db *sql.DB
|
||||
}
|
||||
|
||||
func NewPluginDataAnalysis(
|
||||
eventManager *EventManager,
|
||||
modelService interfaces.ModelService,
|
||||
knowledgeBaseService interfaces.KnowledgeBaseService,
|
||||
knowledgeService interfaces.KnowledgeService,
|
||||
fileService interfaces.FileService,
|
||||
chunkRepo interfaces.ChunkRepository,
|
||||
tenantService interfaces.TenantService,
|
||||
db *sql.DB,
|
||||
) *PluginDataAnalysis {
|
||||
p := &PluginDataAnalysis{
|
||||
modelService: modelService,
|
||||
knowledgeService: knowledgeService,
|
||||
fileService: fileService,
|
||||
chunkRepo: chunkRepo,
|
||||
db: db,
|
||||
modelService: modelService,
|
||||
knowledgeBaseService: knowledgeBaseService,
|
||||
knowledgeService: knowledgeService,
|
||||
fileService: fileService,
|
||||
chunkRepo: chunkRepo,
|
||||
tenantService: tenantService,
|
||||
db: db,
|
||||
}
|
||||
eventManager.Register(p)
|
||||
return p
|
||||
@@ -83,7 +89,7 @@ func (p *PluginDataAnalysis) OnEvent(
|
||||
}
|
||||
|
||||
// Initialize DataAnalysisTool
|
||||
tool := tools.NewDataAnalysisTool(p.knowledgeService, p.fileService, p.db, chatManage.SessionID)
|
||||
tool := tools.NewDataAnalysisTool(p.knowledgeBaseService, p.knowledgeService, p.tenantService, p.fileService, p.db, chatManage.SessionID)
|
||||
defer tool.Cleanup(ctx)
|
||||
|
||||
// Load data into DuckDB
|
||||
@@ -136,11 +142,11 @@ Return your response in the specified JSON format.`, chatManage.Query, knowledge
|
||||
// 5. Store result
|
||||
// Create a new SearchResult for the analysis output
|
||||
analysisResult := &types.SearchResult{
|
||||
ID: "analysis_" + knowledge.ID,
|
||||
Content: toolResult.Output,
|
||||
Score: 1.0,
|
||||
MatchType: types.MatchTypeDataAnalysis,
|
||||
KnowledgeID: knowledge.ID,
|
||||
ID: "analysis_" + knowledge.ID,
|
||||
Content: toolResult.Output,
|
||||
Score: 1.0,
|
||||
MatchType: types.MatchTypeDataAnalysis,
|
||||
KnowledgeID: knowledge.ID,
|
||||
KnowledgeTitle: knowledge.Title,
|
||||
KnowledgeFilename: knowledge.FileName,
|
||||
KnowledgeDescription: knowledge.Description,
|
||||
|
||||
@@ -9,8 +9,8 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/agent/tools"
|
||||
filesvc "github.com/Tencent/WeKnora/internal/application/service/file"
|
||||
chatpipeline "github.com/Tencent/WeKnora/internal/application/service/chat_pipeline"
|
||||
filesvc "github.com/Tencent/WeKnora/internal/application/service/file"
|
||||
"github.com/Tencent/WeKnora/internal/application/service/retriever"
|
||||
"github.com/Tencent/WeKnora/internal/config"
|
||||
"github.com/Tencent/WeKnora/internal/logger"
|
||||
@@ -252,18 +252,20 @@ type DataTableSummaryPayload struct {
|
||||
|
||||
// DataTableSummaryService is a service for extracting tables
|
||||
type DataTableSummaryService struct {
|
||||
modelService interfaces.ModelService
|
||||
knowledgeService interfaces.KnowledgeService
|
||||
fileService interfaces.FileService
|
||||
chunkService interfaces.ChunkService
|
||||
tenantService interfaces.TenantService
|
||||
retrieveEngine interfaces.RetrieveEngineRegistry
|
||||
sqlDB *sql.DB
|
||||
modelService interfaces.ModelService
|
||||
knowledgeBaseService interfaces.KnowledgeBaseService
|
||||
knowledgeService interfaces.KnowledgeService
|
||||
fileService interfaces.FileService
|
||||
chunkService interfaces.ChunkService
|
||||
tenantService interfaces.TenantService
|
||||
retrieveEngine interfaces.RetrieveEngineRegistry
|
||||
sqlDB *sql.DB
|
||||
}
|
||||
|
||||
// NewDataTableSummaryService creates a new DataTableSummaryService
|
||||
func NewDataTableSummaryService(
|
||||
modelService interfaces.ModelService,
|
||||
knowledgeBaseService interfaces.KnowledgeBaseService,
|
||||
knowledgeService interfaces.KnowledgeService,
|
||||
fileService interfaces.FileService,
|
||||
chunkService interfaces.ChunkService,
|
||||
@@ -272,13 +274,14 @@ func NewDataTableSummaryService(
|
||||
sqlDB *sql.DB,
|
||||
) interfaces.TaskHandler {
|
||||
return &DataTableSummaryService{
|
||||
modelService: modelService,
|
||||
knowledgeService: knowledgeService,
|
||||
fileService: fileService,
|
||||
chunkService: chunkService,
|
||||
tenantService: tenantService,
|
||||
retrieveEngine: retrieveEngine,
|
||||
sqlDB: sqlDB,
|
||||
modelService: modelService,
|
||||
knowledgeBaseService: knowledgeBaseService,
|
||||
knowledgeService: knowledgeService,
|
||||
fileService: fileService,
|
||||
chunkService: chunkService,
|
||||
tenantService: tenantService,
|
||||
retrieveEngine: retrieveEngine,
|
||||
sqlDB: sqlDB,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -421,7 +424,7 @@ func (s *DataTableSummaryService) processTableData(ctx context.Context, resource
|
||||
// 创建DuckDB会话并加载数据
|
||||
sessionID := fmt.Sprintf("table_summary_%s", resources.knowledge.ID)
|
||||
fileSvc := s.resolveFileServiceForKnowledge(ctx, resources)
|
||||
duckdbTool := tools.NewDataAnalysisTool(s.knowledgeService, fileSvc, s.sqlDB, sessionID)
|
||||
duckdbTool := tools.NewDataAnalysisTool(s.knowledgeBaseService, s.knowledgeService, s.tenantService, fileSvc, s.sqlDB, sessionID)
|
||||
defer duckdbTool.Cleanup(ctx)
|
||||
|
||||
// 使用knowledge.ID作为表名,根据文件类型自动加载数据
|
||||
|
||||
Reference in New Issue
Block a user