feat: Add tag management and FAQ management APIs, enhance knowledge base functionality with keyword search and custom file naming support

This commit is contained in:
wizardchen
2025-12-02 20:39:59 +08:00
parent cdf576eb18
commit 845d990a48
29 changed files with 1471 additions and 394 deletions
+19 -11
View File
@@ -3,6 +3,7 @@ package repository
import (
"context"
"errors"
"strings"
"github.com/Tencent/WeKnora/internal/common"
"github.com/Tencent/WeKnora/internal/types"
@@ -76,30 +77,37 @@ func (r *chunkRepository) ListPagedChunksByKnowledgeID(
page *types.Pagination,
chunkType []types.ChunkType,
tagID string,
keyword string,
) ([]*types.Chunk, int64, error) {
var chunks []*types.Chunk
var total int64
keyword = strings.TrimSpace(keyword)
query := r.db.WithContext(ctx).Model(&types.Chunk{}).
Where("tenant_id = ? AND knowledge_id = ? AND chunk_type IN (?) AND status in (?)",
baseFilter := func(db *gorm.DB) *gorm.DB {
db = db.Where("tenant_id = ? AND knowledge_id = ? AND chunk_type IN (?) AND status in (?)",
tenantID, knowledgeID, chunkType, []types.ChunkStatus{types.ChunkStatusIndexed, types.ChunkStatusDefault})
if tagID != "" {
query = query.Where("tag_id = ?", tagID)
if tagID != "" {
db = db.Where("tag_id = ?", tagID)
}
if keyword != "" {
like := "%" + keyword + "%"
db = db.Where("(content LIKE ? OR metadata::text LIKE ?)", like, like)
}
return db
}
query := baseFilter(r.db.WithContext(ctx).Model(&types.Chunk{}))
// First query the total count
if err := query.Count(&total).Error; err != nil {
return nil, 0, err
}
// Then query the paginated data
dataQuery := r.db.WithContext(ctx).
Select("id, content, knowledge_id, knowledge_base_id, start_at, end_at, chunk_index, is_enabled, chunk_type, parent_chunk_id, image_info, metadata, tag_id")
dataQuery = dataQuery.Where("tenant_id = ? AND knowledge_id = ? AND chunk_type IN (?) AND status in (?)",
tenantID, knowledgeID, chunkType, []types.ChunkStatus{types.ChunkStatusIndexed, types.ChunkStatusDefault})
if tagID != "" {
dataQuery = dataQuery.Where("tag_id = ?", tagID)
}
dataQuery := baseFilter(
r.db.WithContext(ctx).
Select("id, content, knowledge_id, knowledge_base_id, start_at, end_at, chunk_index, is_enabled, chunk_type, parent_chunk_id, image_info, metadata, tag_id"),
)
if err := dataQuery.
Order("chunk_index ASC").
+36 -9
View File
@@ -2,6 +2,7 @@ package repository
import (
"context"
"strings"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
@@ -39,20 +40,46 @@ func (r *knowledgeTagRepository) GetByID(ctx context.Context, tenantID uint64, i
return &tag, nil
}
// ListByKB lists knowledge tags by knowledge base ID
// ListByKB lists knowledge tags by knowledge base ID with pagination and optional keyword filtering.
func (r *knowledgeTagRepository) ListByKB(
ctx context.Context,
tenantID uint64,
kbID string,
) ([]*types.KnowledgeTag, error) {
var tags []*types.KnowledgeTag
if err := r.db.WithContext(ctx).
Where("tenant_id = ? AND knowledge_base_id = ?", tenantID, kbID).
Order("sort_order ASC, created_at ASC").
Find(&tags).Error; err != nil {
return nil, err
page *types.Pagination,
keyword string,
) ([]*types.KnowledgeTag, int64, error) {
if page == nil {
page = &types.Pagination{}
}
return tags, nil
keyword = strings.TrimSpace(keyword)
var total int64
baseQuery := r.db.WithContext(ctx).Model(&types.KnowledgeTag{}).
Where("tenant_id = ? AND knowledge_base_id = ?", tenantID, kbID)
if keyword != "" {
baseQuery = baseQuery.Where("name LIKE ?", "%"+keyword+"%")
}
if err := baseQuery.Count(&total).Error; err != nil {
return nil, 0, err
}
dataQuery := r.db.WithContext(ctx).
Where("tenant_id = ? AND knowledge_base_id = ?", tenantID, kbID)
if keyword != "" {
dataQuery = dataQuery.Where("name LIKE ?", "%"+keyword+"%")
}
var tags []*types.KnowledgeTag
if err := dataQuery.
Order("sort_order ASC, created_at ASC").
Offset(page.Offset()).
Limit(page.Limit()).
Find(&tags).Error; err != nil {
return nil, 0, err
}
return tags, total, nil
}
// Delete deletes a knowledge tag
@@ -300,7 +300,7 @@ func (s *agentService) getKnowledgeBaseInfos(ctx context.Context, kbIDs []string
pageResult, err := s.knowledgeService.ListFAQEntries(ctx, kbID, &types.Pagination{
Page: 1,
PageSize: 10,
}, "")
}, "", "")
if err == nil && pageResult != nil {
docCount = int(pageResult.Total)
if entries, ok := pageResult.Data.([]*types.FAQEntry); ok {
+1
View File
@@ -145,6 +145,7 @@ func (s *chunkService) ListPagedChunksByKnowledgeID(ctx context.Context,
page,
chunkType,
"",
"",
)
if err != nil {
logger.ErrorWithFields(ctx, err, map[string]interface{}{
+4 -2
View File
@@ -1875,6 +1875,7 @@ func (s *knowledgeService) CloneChunk(ctx context.Context, src, dst *types.Knowl
},
chunkType,
"",
"",
)
chunkPage++
if err != nil {
@@ -1949,11 +1950,12 @@ func (s *knowledgeService) CloneChunk(ctx context.Context, src, dst *types.Knowl
// ListFAQEntries lists FAQ entries under a FAQ knowledge base.
func (s *knowledgeService) ListFAQEntries(ctx context.Context,
kbID string, page *types.Pagination, tagID string,
kbID string, page *types.Pagination, tagID string, keyword string,
) (*types.PageResult, error) {
if page == nil {
page = &types.Pagination{}
}
keyword = strings.TrimSpace(keyword)
kb, err := s.validateFAQKnowledgeBase(ctx, kbID)
if err != nil {
return nil, err
@@ -1968,7 +1970,7 @@ func (s *knowledgeService) ListFAQEntries(ctx context.Context,
}
chunkType := []types.ChunkType{types.ChunkTypeFAQ}
chunks, total, err := s.chunkRepo.ListPagedChunksByKnowledgeID(
ctx, tenantID, faqKnowledge.ID, page, chunkType, tagID,
ctx, tenantID, faqKnowledge.ID, page, chunkType, tagID, keyword,
)
if err != nil {
return nil, err
+12 -3
View File
@@ -30,10 +30,19 @@ func NewKnowledgeTagService(
}
// ListTags lists all tags for a knowledge base with usage stats.
func (s *knowledgeTagService) ListTags(ctx context.Context, kbID string) ([]*types.KnowledgeTagWithStats, error) {
func (s *knowledgeTagService) ListTags(
ctx context.Context,
kbID string,
page *types.Pagination,
keyword string,
) (*types.PageResult, error) {
if kbID == "" {
return nil, werrors.NewBadRequestError("知识库ID不能为空")
}
if page == nil {
page = &types.Pagination{}
}
keyword = strings.TrimSpace(keyword)
// Ensure KB exists and belongs to current tenant
kb, err := s.kbService.GetKnowledgeBaseByID(ctx, kbID)
if err != nil {
@@ -41,7 +50,7 @@ func (s *knowledgeTagService) ListTags(ctx context.Context, kbID string) ([]*typ
}
tenantID := kb.TenantID
tags, err := s.repo.ListByKB(ctx, tenantID, kbID)
tags, total, err := s.repo.ListByKB(ctx, tenantID, kbID, page, keyword)
if err != nil {
return nil, err
}
@@ -65,7 +74,7 @@ func (s *knowledgeTagService) ListTags(ctx context.Context, kbID string) ([]*typ
ChunkCount: cCount,
})
}
return results, nil
return types.NewPageResult(total, page, results), nil
}
// CreateTag creates a new tag under a KB.