From 48381fbaf59dba0c289c240b8d45ab7781dc51e5 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Fri, 29 May 2026 13:36:06 +0800 Subject: [PATCH] feat: implement tenant default storage provider handling in Knowledge Base creation This commit introduces functionality to utilize the tenant's default storage provider when creating a Knowledge Base. It includes updates to the frontend to load the default provider from settings and apply it during Knowledge Base initialization. Additionally, the backend has been enhanced to ensure that the storage provider is set correctly based on tenant configuration, improving consistency across the application. Tests have been added to verify the correct application of the default storage provider in various scenarios. --- .../knowledge/KnowledgeBaseEditorModal.vue | 34 +++++++++++++++---- .../knowledge/settings/KBStorageSettings.vue | 16 ++++++--- internal/application/service/knowledgebase.go | 19 +++++++++++ .../service/knowledgebase_pr3_test.go | 27 +++++++++++++++ 4 files changed, 86 insertions(+), 10 deletions(-) diff --git a/frontend/src/views/knowledge/KnowledgeBaseEditorModal.vue b/frontend/src/views/knowledge/KnowledgeBaseEditorModal.vue index 50ba6fc4..6f075b05 100644 --- a/frontend/src/views/knowledge/KnowledgeBaseEditorModal.vue +++ b/frontend/src/views/knowledge/KnowledgeBaseEditorModal.vue @@ -387,6 +387,7 @@ import { MessagePlugin, DialogPlugin } from 'tdesign-vue-next' import { createKnowledgeBase, getKnowledgeBaseById, listKnowledgeFiles, updateKnowledgeBase, rebuildKBIndex } from '@/api/knowledge-base' import { updateKBConfig, type KBModelConfigRequest } from '@/api/initialization' import { listModels } from '@/api/model' +import { getStorageEngineConfig } from '@/api/system' import { useUIStore } from '@/stores/ui' import { useAuthStore } from '@/stores/auth' import KBModelConfig from './settings/KBModelConfig.vue' @@ -449,6 +450,8 @@ const loading = ref(false) const allModels = ref([]) const hasFiles = ref(false) const initialStorageProvider = ref('') +/** Tenant-wide default from Settings → Storage engine (used when creating a KB). */ +const tenantDefaultStorageProvider = ref('local') const initialIndexingStrategy = ref(null) const dsCount = ref(0) // Identifier of the user who created this KB. Empty for older rows @@ -870,10 +873,26 @@ const handleAddWikiModel = () => { const handleStorageProviderUpdate = (value: string) => { if (formData.value) { - formData.value.storageProvider = value || 'local' + formData.value.storageProvider = value || tenantDefaultStorageProvider.value || 'local' } } +async function loadTenantDefaultStorageProvider() { + try { + const res = await getStorageEngineConfig() + tenantDefaultStorageProvider.value = res?.data?.default_provider || 'local' + } catch { + tenantDefaultStorageProvider.value = 'local' + } +} + +/** Resolved storage provider for create payload (never silently default to local before tenant config loads). */ +function resolvedStorageProvider(): string { + const explicit = formData.value?.storageProvider?.trim() + if (explicit) return explicit + return tenantDefaultStorageProvider.value || 'local' +} + const handleVectorStoreIdUpdate = (id: string) => { if (formData.value) { // Empty string here means "use system default" (env-store fallback). @@ -1005,11 +1024,12 @@ const buildSubmitData = () => { // 存储引擎:仅传 provider,参数从全局设置读取 // Write to storage_provider_config (authoritative) + storage_config (legacy dual-write) + const storageProvider = resolvedStorageProvider() data.storage_provider_config = { - provider: formData.value.storageProvider || 'local' + provider: storageProvider } data.storage_config = { - provider: formData.value.storageProvider || 'local' + provider: storageProvider } // 添加知识图谱配置 — now synced via indexingStrategy.graphEnabled @@ -1258,6 +1278,7 @@ const resetState = () => { formData.value = null hasFiles.value = false initialStorageProvider.value = '' + tenantDefaultStorageProvider.value = 'local' initialIndexingStrategy.value = null saving.value = false loading.value = false @@ -1284,15 +1305,16 @@ watch(() => props.visible, async (newVal) => { currentSection.value = uiStore.kbEditorInitialSection } - // 加载模型列表 - await loadAllModels() + // 加载模型列表与租户默认存储引擎(创建 KB 时即使用,不依赖是否打开「存储引擎」Tab) + await Promise.all([loadAllModels(), loadTenantDefaultStorageProvider()]) // 根据模式加载数据 if (props.mode === 'edit' && props.kbId) { await loadKBData() } else { - // 创建模式:初始化空表单 + // 创建模式:初始化空表单,并预填租户默认存储引擎 formData.value = initFormData(props.initialType || 'document') + formData.value.storageProvider = tenantDefaultStorageProvider.value hasFiles.value = false } } else { diff --git a/frontend/src/views/knowledge/settings/KBStorageSettings.vue b/frontend/src/views/knowledge/settings/KBStorageSettings.vue index 406b926a..45dd7fcd 100644 --- a/frontend/src/views/knowledge/settings/KBStorageSettings.vue +++ b/frontend/src/views/knowledge/settings/KBStorageSettings.vue @@ -68,7 +68,8 @@ const emit = defineEmits<{ }>() const uiStore = useUIStore() -const localProvider = ref(props.storageProvider || 'local') +// Keep empty until tenant default_provider is loaded — do not pre-fill 'local'. +const localProvider = ref(props.storageProvider) const loading = ref(true) const engineStatus = ref([]) const defaultProvider = ref('local') @@ -188,9 +189,12 @@ async function load() { defaultProvider.value = configRes?.data?.default_provider || 'local' const d = configRes?.data hasAnyConfig.value = !!(d?.local?.path_prefix || d?.minio?.bucket_name || d?.cos?.bucket_name || d?.tos?.bucket_name || d?.s3?.bucket_name || d?.oss?.bucket_name || d?.ks3?.bucket_name || d?.obs?.bucket_name) - if (!localProvider.value || localProvider.value === '') { + const parentUnset = !props.storageProvider + if (parentUnset) { localProvider.value = defaultProvider.value emit('update:storageProvider', localProvider.value) + } else { + localProvider.value = props.storageProvider } ensureAllowedProvider() } catch { @@ -200,9 +204,13 @@ async function load() { } } +// Sync only when parent sets an explicit provider (edit mode). Create mode leaves +// storageProvider empty until load() applies tenant default_provider. watch(() => props.storageProvider, (v) => { - localProvider.value = v || defaultProvider.value || 'local' -}, { immediate: true }) + if (v) { + localProvider.value = v + } +}) onMounted(load) diff --git a/internal/application/service/knowledgebase.go b/internal/application/service/knowledgebase.go index 71f61299..13371a04 100644 --- a/internal/application/service/knowledgebase.go +++ b/internal/application/service/knowledgebase.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "sort" + "strings" "time" "github.com/Tencent/WeKnora/internal/application/service/retriever" @@ -105,6 +106,7 @@ func (s *knowledgeBaseService) CreateKnowledgeBase(ctx context.Context, kb.CreatorID = uid } kb.EnsureDefaults() + applyTenantDefaultStorageProvider(ctx, kb) // Fold empty-string vector_store_id into nil so this path and the // retrieve-engine factory's pre-condition share a single representation. @@ -136,6 +138,23 @@ func (s *knowledgeBaseService) CreateKnowledgeBase(ctx context.Context, return kb, nil } +// applyTenantDefaultStorageProvider fills an empty KB storage provider from the +// tenant's global default (Settings → Storage engine). Frontend should send the +// same value; this keeps API clients and legacy UIs consistent. +func applyTenantDefaultStorageProvider(ctx context.Context, kb *types.KnowledgeBase) { + if kb == nil || strings.TrimSpace(kb.GetStorageProvider()) != "" { + return + } + tenant, _ := ctx.Value(types.TenantInfoContextKey).(*types.Tenant) + provider := "local" + if tenant != nil && tenant.StorageEngineConfig != nil { + if p := strings.ToLower(strings.TrimSpace(tenant.StorageEngineConfig.DefaultProvider)); p != "" { + provider = p + } + } + kb.SetStorageProvider(provider) +} + // validateVectorStoreBinding routes through retriever.VerifyBinding so the // ownership + registry sentinel hierarchy stays the single source of truth. // The service layer's responsibility is to: diff --git a/internal/application/service/knowledgebase_pr3_test.go b/internal/application/service/knowledgebase_pr3_test.go index 939a65ae..dac79e99 100644 --- a/internal/application/service/knowledgebase_pr3_test.go +++ b/internal/application/service/knowledgebase_pr3_test.go @@ -131,6 +131,33 @@ func ctxWithTenant(tenantID uint64) context.Context { return context.WithValue(context.Background(), types.TenantIDContextKey, tenantID) } +func ctxWithTenantStorage(tenantID uint64, defaultProvider string) context.Context { + ctx := ctxWithTenant(tenantID) + tenant := &types.Tenant{ + ID: tenantID, + StorageEngineConfig: &types.StorageEngineConfig{ + DefaultProvider: defaultProvider, + }, + } + return context.WithValue(ctx, types.TenantInfoContextKey, tenant) +} + +func TestCreateKnowledgeBase_DefaultStorageProviderFromTenant(t *testing.T) { + repo := newFakeKBRepo() + svc := newPR3KBService(repo, &fakeRegistry{registered: map[string]struct{}{}}, &fakeOwnership{}) + + kb, err := svc.CreateKnowledgeBase(ctxWithTenantStorage(1, "minio"), &types.KnowledgeBase{Name: "kb"}) + require.NoError(t, err) + assert.Equal(t, "minio", kb.GetStorageProvider()) + + kbExplicit, err := svc.CreateKnowledgeBase(ctxWithTenantStorage(1, "minio"), &types.KnowledgeBase{ + Name: "kb2", + StorageProviderConfig: &types.StorageProviderConfig{Provider: "cos"}, + }) + require.NoError(t, err) + assert.Equal(t, "cos", kbExplicit.GetStorageProvider()) +} + // --------------------------------------------------------------------------- // CreateKnowledgeBase — vector_store_id binding validation matrix // ---------------------------------------------------------------------------