feat: support multi-tag for document knowledge (#1790)
* feat: support multi-tag for document knowledge - Add knowledge_tag_relations join table for many-to-many tag-knowledge mapping - Migrate existing single tag_id data to the new table - Update Knowledge struct, filter, payload types (TagID -> Tags/TagIDs) - Rewrite repository layer: SetKnowledgeTags, GetKnowledgeTags, ListIDsByTagIDs - Update tag count references to query knowledge_tag_relations - Update service/handler layers for multi-tag create/list/batch-update - Frontend: multi-select tag sidebar, multi-tag chip display, tag toggle in popup - FAQ tags remain single-tag model (unchanged) * feat(knowledge): tag edit dialog with dynamic overflow and inline creation - Add TagEditDialog component with search, multi-select, and confirm - Replace inline t-popup tag selector with dialog-based editing - Tags overflow with +N badge, visible count adapts to container width via ResizeObserver - Date/card layout: fixed date width, tags flex to fill remaining space - Add persistent new-tag input bar in dialog (Enter to create, auto-select) - Tag creation emits callback to refresh parent tag list immediately - Apply same overflow + dialog trigger to both card view and list view - Add i18n keys: tagEditDialogTitle, tagEditSearch, tagSelectedCount, tagOverflowTip, tagNewPlaceholder * fix: exclude soft-deleted knowledge from tag reference counts CountReferences, BatchCountReferences, and DeleteUnusedTags now JOIN with knowledges table to filter out soft-deleted records when counting knowledge_tag_relations. Previously they queried knowledge_tag_relations directly without the deleted_at check, causing stale tag counts after knowledge deletion. * fix: refresh tag counts after async knowledge deletion completes Add a second delayed tag list refresh (2.5s) after tag deletion to capture updated reference counts for remaining tags. The original immediate refresh handles removing the deleted tag from the list, while this delayed refresh ensures other tags' counts are correct after the async deletion finishes. --------- Co-authored-by: lyingbug <xiayula2014@gmail.com>
This commit is contained in:
@@ -98,8 +98,11 @@ func (r *knowledgeRepository) ListKnowledgeByKnowledgeBaseID(
|
||||
// KnowledgeListFilter to a GORM query. Tenant / knowledge base scoping must be
|
||||
// applied by the caller before invoking this helper.
|
||||
func applyKnowledgeListFilter(query *gorm.DB, filter types.KnowledgeListFilter) *gorm.DB {
|
||||
if filter.TagID != "" {
|
||||
query = query.Where("tag_id = ?", filter.TagID)
|
||||
if len(filter.TagIDs) > 0 {
|
||||
query = query.Where(
|
||||
"knowledges.id IN (SELECT knowledge_id FROM knowledge_tag_relations WHERE tag_id IN (?))",
|
||||
filter.TagIDs,
|
||||
)
|
||||
}
|
||||
if filter.Keyword != "" {
|
||||
escaped := escapeLikeKeyword(filter.Keyword)
|
||||
@@ -729,15 +732,22 @@ func (r *knowledgeRepository) SearchKnowledgeInScopes(
|
||||
return knowledges, hasMore, nil
|
||||
}
|
||||
|
||||
// ListIDsByTagID returns all knowledge IDs that have the specified tag ID
|
||||
func (r *knowledgeRepository) ListIDsByTagID(
|
||||
// ListIDsByTagIDs returns all knowledge IDs that have any of the specified tag IDs (OR semantics)
|
||||
func (r *knowledgeRepository) ListIDsByTagIDs(
|
||||
ctx context.Context,
|
||||
tenantID uint64,
|
||||
kbID, tagID string,
|
||||
kbID string,
|
||||
tagIDs []string,
|
||||
) ([]string, error) {
|
||||
if len(tagIDs) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
var ids []string
|
||||
err := r.db.WithContext(ctx).Model(&types.Knowledge{}).
|
||||
Where("tenant_id = ? AND knowledge_base_id = ? AND tag_id = ?", tenantID, kbID, tagID).
|
||||
Pluck("id", &ids).Error
|
||||
Joins("JOIN knowledge_tag_relations ktr ON knowledges.id = ktr.knowledge_id").
|
||||
Where("knowledges.tenant_id = ? AND knowledges.knowledge_base_id = ? AND ktr.tag_id IN (?)",
|
||||
tenantID, kbID, tagIDs).
|
||||
Distinct("knowledges.id").
|
||||
Pluck("knowledges.id", &ids).Error
|
||||
return ids, err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/types"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// SetKnowledgeTags replaces all tags for a single knowledge entry.
|
||||
// It deletes existing relations and inserts new ones in a transaction.
|
||||
func (r *knowledgeRepository) SetKnowledgeTags(
|
||||
ctx context.Context,
|
||||
knowledgeID string,
|
||||
tagIDs []string,
|
||||
) error {
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
// Delete all existing tag relations for this knowledge
|
||||
if err := tx.Where("knowledge_id = ?", knowledgeID).
|
||||
Delete(&types.KnowledgeTagRelation{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
// Insert new relations
|
||||
if len(tagIDs) == 0 {
|
||||
return nil
|
||||
}
|
||||
now := time.Now()
|
||||
relations := make([]types.KnowledgeTagRelation, 0, len(tagIDs))
|
||||
for _, tagID := range tagIDs {
|
||||
if tagID == "" {
|
||||
continue
|
||||
}
|
||||
relations = append(relations, types.KnowledgeTagRelation{
|
||||
KnowledgeID: knowledgeID,
|
||||
TagID: tagID,
|
||||
CreatedAt: now,
|
||||
})
|
||||
}
|
||||
if len(relations) == 0 {
|
||||
return nil
|
||||
}
|
||||
return tx.Create(&relations).Error
|
||||
})
|
||||
}
|
||||
|
||||
// GetKnowledgeTags returns tags for multiple knowledge IDs.
|
||||
// The result is a map from knowledge ID to its tag list.
|
||||
func (r *knowledgeRepository) GetKnowledgeTags(
|
||||
ctx context.Context,
|
||||
knowledgeIDs []string,
|
||||
) (map[string][]*types.KnowledgeTag, error) {
|
||||
result := make(map[string][]*types.KnowledgeTag)
|
||||
if len(knowledgeIDs) == 0 {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// Query relations and join with knowledge_tags to get full tag info
|
||||
type relationWithTag struct {
|
||||
KnowledgeID string `gorm:"column:knowledge_id"`
|
||||
types.KnowledgeTag
|
||||
}
|
||||
var rows []relationWithTag
|
||||
if err := r.db.WithContext(ctx).
|
||||
Table("knowledge_tag_relations AS ktr").
|
||||
Select("ktr.knowledge_id, kt.id, kt.seq_id, kt.tenant_id, kt.knowledge_base_id, kt.name, kt.color, kt.sort_order, kt.created_at, kt.updated_at").
|
||||
Joins("JOIN knowledge_tags AS kt ON ktr.tag_id = kt.id").
|
||||
Where("ktr.knowledge_id IN (?)", knowledgeIDs).
|
||||
Find(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, row := range rows {
|
||||
tag := row.KnowledgeTag
|
||||
result[row.KnowledgeID] = append(result[row.KnowledgeID], &tag)
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// DeleteKnowledgeTagRelations deletes all tag relations for a knowledge entry.
|
||||
func (r *knowledgeRepository) DeleteKnowledgeTagRelations(
|
||||
ctx context.Context,
|
||||
knowledgeID string,
|
||||
) error {
|
||||
return r.db.WithContext(ctx).
|
||||
Where("knowledge_id = ?", knowledgeID).
|
||||
Delete(&types.KnowledgeTagRelation{}).Error
|
||||
}
|
||||
@@ -150,8 +150,9 @@ func (r *knowledgeTagRepository) CountReferences(
|
||||
tagID string,
|
||||
) (knowledgeCount int64, chunkCount int64, err error) {
|
||||
if err = r.db.WithContext(ctx).
|
||||
Model(&types.Knowledge{}).
|
||||
Where("tenant_id = ? AND knowledge_base_id = ? AND tag_id = ?", tenantID, kbID, tagID).
|
||||
Table("knowledge_tag_relations AS ktr").
|
||||
Joins("JOIN knowledges AS k ON ktr.knowledge_id = k.id AND k.deleted_at IS NULL").
|
||||
Where("ktr.tag_id = ?", tagID).
|
||||
Count(&knowledgeCount).Error; err != nil {
|
||||
return
|
||||
}
|
||||
@@ -190,10 +191,11 @@ func (r *knowledgeTagRepository) BatchCountReferences(
|
||||
// Count knowledge references in a single query
|
||||
var knowledgeCounts []tagCountResult
|
||||
if err := r.db.WithContext(ctx).
|
||||
Model(&types.Knowledge{}).
|
||||
Select("tag_id, COUNT(*) as count").
|
||||
Where("tenant_id = ? AND knowledge_base_id = ? AND tag_id IN (?)", tenantID, kbID, tagIDs).
|
||||
Group("tag_id").
|
||||
Table("knowledge_tag_relations AS ktr").
|
||||
Select("ktr.tag_id, COUNT(*) as count").
|
||||
Joins("JOIN knowledges AS k ON ktr.knowledge_id = k.id AND k.deleted_at IS NULL").
|
||||
Where("ktr.tag_id IN (?)", tagIDs).
|
||||
Group("ktr.tag_id").
|
||||
Find(&knowledgeCounts).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -228,7 +230,7 @@ func (r *knowledgeTagRepository) DeleteUnusedTags(ctx context.Context, tenantID
|
||||
// Delete tags that have no references in both knowledges and chunks tables (excluding soft-deleted records)
|
||||
result := r.db.WithContext(ctx).
|
||||
Where("tenant_id = ? AND knowledge_base_id = ?", tenantID, kbID).
|
||||
Where("id NOT IN (SELECT DISTINCT tag_id FROM knowledges WHERE tenant_id = ? AND knowledge_base_id = ? AND tag_id IS NOT NULL AND tag_id != '' AND deleted_at IS NULL)", tenantID, kbID).
|
||||
Where("id NOT IN (SELECT DISTINCT ktr.tag_id FROM knowledge_tag_relations ktr JOIN knowledges k ON ktr.knowledge_id = k.id AND k.deleted_at IS NULL)").
|
||||
Where("id NOT IN (SELECT DISTINCT tag_id FROM chunks WHERE tenant_id = ? AND knowledge_base_id = ? AND tag_id IS NOT NULL AND tag_id != '' AND deleted_at IS NULL)", tenantID, kbID).
|
||||
Delete(&types.KnowledgeTag{})
|
||||
return result.RowsAffected, result.Error
|
||||
|
||||
@@ -696,13 +696,13 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e
|
||||
ctx = context.WithValue(ctx, types.TenantInfoContextKey, tenant)
|
||||
|
||||
// Auto-tag: find or create a tag for this data source so synced items are easily identifiable
|
||||
autoTagID := ""
|
||||
autoTagIDs := []string{}
|
||||
autoTagName := ds.Name
|
||||
if autoTag, tagErr := s.tagService.FindOrCreateTagByName(ctx, ds.KnowledgeBaseID, autoTagName); tagErr != nil {
|
||||
logger.Warnf(ctx, "failed to find/create auto-tag %q: %v (proceeding without tag)", autoTagName, tagErr)
|
||||
} else if autoTag != nil {
|
||||
autoTagID = autoTag.ID
|
||||
logger.Infof(ctx, "using auto-tag %q (id=%s) for data source sync", autoTagName, autoTagID)
|
||||
autoTagIDs = append(autoTagIDs, autoTag.ID)
|
||||
logger.Infof(ctx, "using auto-tag %q (id=%s) for data source sync", autoTagName, autoTag.ID)
|
||||
}
|
||||
|
||||
for _, item := range items {
|
||||
@@ -729,7 +729,7 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e
|
||||
continue
|
||||
}
|
||||
|
||||
isUpdate, err := s.ingestItem(ctx, ds, &item, autoTagID)
|
||||
isUpdate, err := s.ingestItem(ctx, ds, &item, autoTagIDs)
|
||||
if err != nil {
|
||||
// Duplicate file/URL is not a failure — count as skipped
|
||||
var dupErr *types.DuplicateKnowledgeError
|
||||
@@ -886,7 +886,7 @@ func (s *DataSourceService) validateDataSourceConfig(ctx context.Context, ds *ty
|
||||
// - Has URL only → CreateKnowledgeFromURL (让 WeKnora 下载并解析)
|
||||
//
|
||||
// Returns (isUpdate, error) — isUpdate is true when an existing item was replaced.
|
||||
func (s *DataSourceService) ingestItem(ctx context.Context, ds *types.DataSource, item *types.FetchedItem, tagID string) (bool, error) {
|
||||
func (s *DataSourceService) ingestItem(ctx context.Context, ds *types.DataSource, item *types.FetchedItem, tagIDs []string) (bool, error) {
|
||||
channel := ds.Type // e.g. "feishu", "notion"
|
||||
|
||||
metadata := map[string]string{
|
||||
@@ -929,7 +929,7 @@ func (s *DataSourceService) ingestItem(ctx context.Context, ds *types.DataSource
|
||||
metadata,
|
||||
nil, // use KB default for multimodal
|
||||
item.FileName, // customFileName — must include extension for file-type validation
|
||||
tagID, // auto-tag from data source
|
||||
tagIDs, // auto-tag from data source
|
||||
channel,
|
||||
nil,
|
||||
)
|
||||
@@ -946,7 +946,7 @@ func (s *DataSourceService) ingestItem(ctx context.Context, ds *types.DataSource
|
||||
"", // auto-detect file type
|
||||
nil, // use KB default for multimodal
|
||||
item.Title,
|
||||
tagID, // auto-tag from data source
|
||||
tagIDs, // auto-tag from data source
|
||||
channel,
|
||||
nil,
|
||||
)
|
||||
|
||||
@@ -463,6 +463,14 @@ func (s *knowledgeService) GetKnowledgeByID(ctx context.Context, id string) (*ty
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Load tags for this knowledge
|
||||
tagMap, err := s.repo.GetKnowledgeTags(ctx, []string{knowledge.ID})
|
||||
if err != nil {
|
||||
logger.Warnf(ctx, "Failed to load tags for knowledge %s: %v", knowledge.ID, err)
|
||||
} else if tags, ok := tagMap[knowledge.ID]; ok {
|
||||
knowledge.Tags = tags
|
||||
}
|
||||
|
||||
logger.Infof(ctx, "Knowledge retrieved successfully, ID: %s, type: %s", knowledge.ID, knowledge.Type)
|
||||
return knowledge, nil
|
||||
}
|
||||
@@ -512,6 +520,25 @@ func (s *knowledgeService) ListPagedKnowledgeByKnowledgeBaseID(ctx context.Conte
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Batch load tags for all knowledge entries
|
||||
if len(knowledges) > 0 {
|
||||
ids := make([]string, len(knowledges))
|
||||
for i, k := range knowledges {
|
||||
ids[i] = k.ID
|
||||
}
|
||||
tagMap, err := s.repo.GetKnowledgeTags(ctx, ids)
|
||||
if err != nil {
|
||||
logger.Errorf(ctx, "Failed to load tags for knowledge list: %v", err)
|
||||
// Non-fatal: continue without tags
|
||||
} else {
|
||||
for _, k := range knowledges {
|
||||
if tags, ok := tagMap[k.ID]; ok {
|
||||
k.Tags = tags
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return types.NewPageResult(total, page, knowledges), nil
|
||||
}
|
||||
|
||||
@@ -629,34 +656,44 @@ func (s *knowledgeService) GetKnowledgeBatchWithSharedAccess(ctx context.Context
|
||||
return ownList, nil
|
||||
}
|
||||
|
||||
// UpdateKnowledgeTag updates the tag assigned to a knowledge document.
|
||||
func (s *knowledgeService) UpdateKnowledgeTag(ctx context.Context, knowledgeID string, tagID *string) error {
|
||||
// SetKnowledgeTags replaces all tags for a single knowledge entry.
|
||||
func (s *knowledgeService) SetKnowledgeTags(ctx context.Context, knowledgeID string, tagIDs []string) error {
|
||||
return s.repo.SetKnowledgeTags(ctx, knowledgeID, tagIDs)
|
||||
}
|
||||
|
||||
// GetKnowledgeTags returns tags for multiple knowledge IDs.
|
||||
func (s *knowledgeService) GetKnowledgeTags(ctx context.Context, knowledgeIDs []string) (map[string][]*types.KnowledgeTag, error) {
|
||||
return s.repo.GetKnowledgeTags(ctx, knowledgeIDs)
|
||||
}
|
||||
|
||||
// UpdateKnowledgeTag updates the tags assigned to a knowledge document.
|
||||
func (s *knowledgeService) UpdateKnowledgeTag(ctx context.Context, knowledgeID string, tagIDs []string) error {
|
||||
tenantID := ctx.Value(types.TenantIDContextKey).(uint64)
|
||||
knowledge, err := s.repo.GetKnowledgeByID(ctx, tenantID, knowledgeID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resolvedTagID string
|
||||
if tagID != nil && *tagID != "" {
|
||||
tag, err := s.tagRepo.GetByID(ctx, tenantID, *tagID)
|
||||
if err != nil {
|
||||
return err
|
||||
// Validate all tag IDs
|
||||
if len(tagIDs) > 0 {
|
||||
for _, tagID := range tagIDs {
|
||||
tag, err := s.tagRepo.GetByID(ctx, tenantID, tagID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if tag.KnowledgeBaseID != knowledge.KnowledgeBaseID {
|
||||
return werrors.NewBadRequestError("标签不属于当前知识库")
|
||||
}
|
||||
}
|
||||
if tag.KnowledgeBaseID != knowledge.KnowledgeBaseID {
|
||||
return werrors.NewBadRequestError("标签不属于当前知识库")
|
||||
}
|
||||
resolvedTagID = tag.ID
|
||||
}
|
||||
|
||||
knowledge.TagID = resolvedTagID
|
||||
return s.repo.UpdateKnowledge(ctx, knowledge)
|
||||
return s.repo.SetKnowledgeTags(ctx, knowledgeID, tagIDs)
|
||||
}
|
||||
|
||||
// UpdateKnowledgeTagBatch updates tags for document knowledge items in batch.
|
||||
// authorizedKBID restricts all updates to knowledge items belonging to this KB;
|
||||
// pass empty string to skip the check (caller must ensure authorization by other means).
|
||||
func (s *knowledgeService) UpdateKnowledgeTagBatch(ctx context.Context, authorizedKBID string, updates map[string]*string) error {
|
||||
func (s *knowledgeService) UpdateKnowledgeTagBatch(ctx context.Context, authorizedKBID string, updates map[string][]string) error {
|
||||
if len(updates) == 0 {
|
||||
return nil
|
||||
}
|
||||
@@ -692,22 +729,24 @@ func (s *knowledgeService) UpdateKnowledgeTagBatch(ctx context.Context, authoriz
|
||||
}
|
||||
}
|
||||
|
||||
// Build tag ID map for validation
|
||||
// Collect all unique tag IDs for validation
|
||||
tagIDSet := make(map[string]bool)
|
||||
for _, tagID := range updates {
|
||||
if tagID != nil && *tagID != "" {
|
||||
tagIDSet[*tagID] = true
|
||||
for _, tagIDs := range updates {
|
||||
for _, tagID := range tagIDs {
|
||||
if tagID != "" {
|
||||
tagIDSet[tagID] = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Validate all tags in batch
|
||||
// Validate all tags exist and belong to the correct KB
|
||||
tagMap := make(map[string]*types.KnowledgeTag)
|
||||
if len(tagIDSet) > 0 {
|
||||
tagIDs := make([]string, 0, len(tagIDSet))
|
||||
tagIDList := make([]string, 0, len(tagIDSet))
|
||||
for tagID := range tagIDSet {
|
||||
tagIDs = append(tagIDs, tagID)
|
||||
tagIDList = append(tagIDList, tagID)
|
||||
}
|
||||
for _, tagID := range tagIDs {
|
||||
for _, tagID := range tagIDList {
|
||||
tag, err := s.tagRepo.GetByID(ctx, tenantID, tagID)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -716,32 +755,31 @@ func (s *knowledgeService) UpdateKnowledgeTagBatch(ctx context.Context, authoriz
|
||||
}
|
||||
}
|
||||
|
||||
// Update knowledge items
|
||||
knowledgeToUpdate := make([]*types.Knowledge, 0)
|
||||
// Validate tag ownership per knowledge
|
||||
for _, knowledge := range knowledgeList {
|
||||
tagID, exists := updates[knowledge.ID]
|
||||
tagIDs, exists := updates[knowledge.ID]
|
||||
if !exists {
|
||||
continue
|
||||
}
|
||||
|
||||
var resolvedTagID string
|
||||
if tagID != nil && *tagID != "" {
|
||||
tag, ok := tagMap[*tagID]
|
||||
for _, tagID := range tagIDs {
|
||||
if tagID == "" {
|
||||
continue
|
||||
}
|
||||
tag, ok := tagMap[tagID]
|
||||
if !ok {
|
||||
return werrors.NewBadRequestError(fmt.Sprintf("标签 %s 不存在", *tagID))
|
||||
return werrors.NewBadRequestError(fmt.Sprintf("标签 %s 不存在", tagID))
|
||||
}
|
||||
if tag.KnowledgeBaseID != knowledge.KnowledgeBaseID {
|
||||
return werrors.NewBadRequestError(fmt.Sprintf("标签 %s 不属于知识库 %s", *tagID, knowledge.KnowledgeBaseID))
|
||||
return werrors.NewBadRequestError(fmt.Sprintf("标签 %s 不属于知识库 %s", tagID, knowledge.KnowledgeBaseID))
|
||||
}
|
||||
resolvedTagID = tag.ID
|
||||
}
|
||||
|
||||
knowledge.TagID = resolvedTagID
|
||||
knowledgeToUpdate = append(knowledgeToUpdate, knowledge)
|
||||
}
|
||||
|
||||
if len(knowledgeToUpdate) > 0 {
|
||||
return s.repo.UpdateKnowledgeBatch(ctx, knowledgeToUpdate)
|
||||
// Set tags for each knowledge
|
||||
for knowledgeID, tagIDs := range updates {
|
||||
if err := s.repo.SetKnowledgeTags(ctx, knowledgeID, tagIDs); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -1100,7 +1100,6 @@ func (s *knowledgeService) moveKnowledgeReuseVectors(
|
||||
|
||||
// 4. Update knowledge record
|
||||
knowledge.KnowledgeBaseID = targetKB.ID
|
||||
knowledge.TagID = "" // Clear tag since tags are KB-scoped
|
||||
knowledge.ParseStatus = types.ParseStatusCompleted
|
||||
knowledge.UpdatedAt = time.Now()
|
||||
if err := s.repo.UpdateKnowledge(ctx, knowledge); err != nil {
|
||||
@@ -1127,7 +1126,6 @@ func (s *knowledgeService) moveKnowledgeReparse(
|
||||
// 2. Update knowledge to belong to target KB
|
||||
knowledge.KnowledgeBaseID = targetKB.ID
|
||||
knowledge.EmbeddingModelID = targetKB.EmbeddingModelID
|
||||
knowledge.TagID = "" // Clear tag since tags are KB-scoped
|
||||
knowledge.ParseStatus = types.ParseStatusPending
|
||||
knowledge.EnableStatus = "disabled"
|
||||
knowledge.Description = ""
|
||||
|
||||
@@ -25,7 +25,7 @@ import (
|
||||
|
||||
// CreateKnowledgeFromFile creates a knowledge entry from an uploaded file
|
||||
func (s *knowledgeService) CreateKnowledgeFromFile(ctx context.Context,
|
||||
kbID string, file *multipart.FileHeader, metadata map[string]string, enableMultimodel *bool, customFileName string, tagID string, channel string,
|
||||
kbID string, file *multipart.FileHeader, metadata map[string]string, enableMultimodel *bool, customFileName string, tagIDs []string, channel string,
|
||||
processOverrides *types.KnowledgeProcessOverrides,
|
||||
) (*types.Knowledge, error) {
|
||||
logger.Info(ctx, "Start creating knowledge from file")
|
||||
@@ -188,7 +188,6 @@ func (s *knowledgeService) CreateKnowledgeFromFile(ctx context.Context,
|
||||
ID: uuid.New().String(),
|
||||
TenantID: tenantID,
|
||||
KnowledgeBaseID: kbID,
|
||||
TagID: tagID, // 设置分类ID,用于知识分类管理
|
||||
Type: "file",
|
||||
Channel: defaultChannel(channel),
|
||||
Title: safeFilename,
|
||||
@@ -231,6 +230,14 @@ func (s *knowledgeService) CreateKnowledgeFromFile(ctx context.Context,
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Set tag relations
|
||||
if len(tagIDs) > 0 {
|
||||
if err := s.repo.SetKnowledgeTags(ctx, knowledge.ID, tagIDs); err != nil {
|
||||
logger.Errorf(ctx, "Failed to set knowledge tags, knowledge ID: %s, error: %v", knowledge.ID, err)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// Enqueue document processing task to Asynq
|
||||
logger.Info(ctx, "Enqueuing document processing task to Asynq")
|
||||
enableMultimodelValue := eff.EnableMultimodel
|
||||
@@ -307,7 +314,7 @@ func isFileURL(rawURL, fileName, fileType string) bool {
|
||||
}
|
||||
|
||||
func (s *knowledgeService) CreateKnowledgeFromURL(ctx context.Context,
|
||||
kbID string, rawURL string, fileName string, fileType string, enableMultimodel *bool, title string, tagID string, channel string,
|
||||
kbID string, rawURL string, fileName string, fileType string, enableMultimodel *bool, title string, tagIDs []string, channel string,
|
||||
processOverrides *types.KnowledgeProcessOverrides,
|
||||
) (*types.Knowledge, error) {
|
||||
logger.Info(ctx, "Start creating knowledge from URL")
|
||||
@@ -316,7 +323,7 @@ func (s *knowledgeService) CreateKnowledgeFromURL(ctx context.Context,
|
||||
// Route to file_url logic when the URL points to a downloadable file
|
||||
if isFileURL(rawURL, fileName, fileType) {
|
||||
return s.createKnowledgeFromFileURL(
|
||||
ctx, kbID, rawURL, fileName, fileType, enableMultimodel, title, tagID, channel, processOverrides,
|
||||
ctx, kbID, rawURL, fileName, fileType, enableMultimodel, title, tagIDs, channel, processOverrides,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -396,7 +403,6 @@ func (s *knowledgeService) CreateKnowledgeFromURL(ctx context.Context,
|
||||
CreatedAt: time.Now(),
|
||||
UpdatedAt: time.Now(),
|
||||
EmbeddingModelID: kb.EmbeddingModelID,
|
||||
TagID: tagID, // 设置分类ID,用于知识分类管理
|
||||
}
|
||||
|
||||
// Save knowledge record
|
||||
@@ -411,6 +417,14 @@ func (s *knowledgeService) CreateKnowledgeFromURL(ctx context.Context,
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Set tag relations
|
||||
if len(tagIDs) > 0 {
|
||||
if err := s.repo.SetKnowledgeTags(ctx, knowledge.ID, tagIDs); err != nil {
|
||||
logger.Errorf(ctx, "Failed to set knowledge tags, knowledge ID: %s, error: %v", knowledge.ID, err)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// Enqueue URL processing task to Asynq
|
||||
logger.Info(ctx, "Enqueuing URL processing task to Asynq")
|
||||
enableMultimodelValue := eff.EnableMultimodel
|
||||
@@ -512,7 +526,7 @@ func (s *knowledgeService) createKnowledgeFromFileURL(
|
||||
fileType string,
|
||||
enableMultimodel *bool,
|
||||
title string,
|
||||
tagID string,
|
||||
tagIDs []string,
|
||||
channel string,
|
||||
processOverrides *types.KnowledgeProcessOverrides,
|
||||
) (*types.Knowledge, error) {
|
||||
@@ -618,7 +632,6 @@ func (s *knowledgeService) createKnowledgeFromFileURL(
|
||||
CreatedAt: time.Now(),
|
||||
UpdatedAt: time.Now(),
|
||||
EmbeddingModelID: kb.EmbeddingModelID,
|
||||
TagID: tagID,
|
||||
}
|
||||
if knowledge.Title == "" {
|
||||
knowledge.Title = displayName
|
||||
@@ -644,6 +657,14 @@ func (s *knowledgeService) createKnowledgeFromFileURL(
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Set tag relations
|
||||
if len(tagIDs) > 0 {
|
||||
if err := s.repo.SetKnowledgeTags(ctx, knowledge.ID, tagIDs); err != nil {
|
||||
logger.Errorf(ctx, "Failed to set knowledge tags, knowledge ID: %s, error: %v", knowledge.ID, err)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// Build async task payload
|
||||
enableMultimodelValue := eff.EnableMultimodel
|
||||
enableQuestionGeneration := eff.QuestionGenerationConfig.Enabled
|
||||
@@ -769,7 +790,6 @@ func (s *knowledgeService) CreateKnowledgeFromManual(ctx context.Context,
|
||||
EmbeddingModelID: kb.EmbeddingModelID,
|
||||
FileName: fileName,
|
||||
FileType: types.KnowledgeTypeManual,
|
||||
TagID: payload.TagID, // 设置分类ID,用于知识分类管理
|
||||
}
|
||||
if err := knowledge.SetManualMetadata(meta); err != nil {
|
||||
logger.Errorf(ctx, "Failed to set manual metadata: %v", err)
|
||||
@@ -792,6 +812,14 @@ func (s *knowledgeService) CreateKnowledgeFromManual(ctx context.Context,
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Set tag relations
|
||||
if len(payload.TagIDs) > 0 {
|
||||
if err := s.repo.SetKnowledgeTags(ctx, knowledge.ID, payload.TagIDs); err != nil {
|
||||
logger.Errorf(ctx, "Failed to set knowledge tags, knowledge ID: %s, error: %v", knowledge.ID, err)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
if status == types.ManualKnowledgeStatusPublish {
|
||||
logger.Infof(ctx, "Manual knowledge created, enqueuing async processing task, ID: %s", knowledge.ID)
|
||||
if err := s.enqueueManualProcessing(ctx, knowledge, cleanContent, false); err != nil {
|
||||
|
||||
@@ -274,7 +274,7 @@ func (s *knowledgeTagService) DeleteTag(ctx context.Context, id string, force bo
|
||||
return nil
|
||||
}
|
||||
// Get all knowledge IDs under this tag
|
||||
knowledgeIDs, err := s.knowledgeRepo.ListIDsByTagID(ctx, tenantID, kb.ID, tag.ID)
|
||||
knowledgeIDs, err := s.knowledgeRepo.ListIDsByTagIDs(ctx, tenantID, kb.ID, []string{tag.ID})
|
||||
if err != nil {
|
||||
logger.Errorf(ctx, "Failed to list knowledge IDs by tag ID %s: %v", tag.ID, err)
|
||||
return werrors.NewInternalServerError("获取标签下的文档失败")
|
||||
|
||||
Reference in New Issue
Block a user