feat(storage): add multi-instance storage backends per workspace
Introduce tenant-scoped storage backend registry so workspaces can register multiple storage instances and bind each knowledge base to a specific backend, with migration from legacy tenant-level storage config and new settings UI.
This commit is contained in:
@@ -122,7 +122,8 @@ type DataAnalysisTool struct {
|
||||
// env var at request time can produce a different (or empty) value if the
|
||||
// variable was not exported to the sub-process or was set programmatically
|
||||
// after startup, causing GetFile to look in the wrong directory (#1040).
|
||||
localBaseDir string
|
||||
localBaseDir string
|
||||
storageResolver interfaces.StorageBackendResolver
|
||||
}
|
||||
|
||||
func NewDataAnalysisTool(
|
||||
@@ -132,8 +133,9 @@ func NewDataAnalysisTool(
|
||||
fileService interfaces.FileService,
|
||||
db *sql.DB,
|
||||
sessionID string,
|
||||
storageResolvers ...interfaces.StorageBackendResolver,
|
||||
) *DataAnalysisTool {
|
||||
return &DataAnalysisTool{
|
||||
tool := &DataAnalysisTool{
|
||||
BaseTool: dataAnalysisTool,
|
||||
knowledgeBaseService: knowledgeBaseService,
|
||||
knowledgeService: knowledgeService,
|
||||
@@ -145,8 +147,12 @@ func NewDataAnalysisTool(
|
||||
// call to resolveFileServiceForKnowledge uses the same base path. The
|
||||
// env var is guaranteed to be set (or empty == "/data/files" fallback)
|
||||
// when the application starts and the DI container is assembled.
|
||||
localBaseDir: strings.TrimSpace(os.Getenv("LOCAL_STORAGE_BASE_DIR")),
|
||||
localBaseDir: strings.TrimSpace(os.Getenv("LOCAL_STORAGE_BASE_DIR")),
|
||||
}
|
||||
if len(storageResolvers) > 0 {
|
||||
tool.storageResolver = storageResolvers[0]
|
||||
}
|
||||
return tool
|
||||
}
|
||||
|
||||
// recordCreatedTable records a table name for cleanup, ensuring uniqueness
|
||||
@@ -782,8 +788,12 @@ func (t *DataAnalysisTool) resolveFileServiceForKnowledge(ctx context.Context, k
|
||||
}
|
||||
|
||||
provider := ""
|
||||
backendID, _, _ := types.ParseStorageBackendPath(knowledge.FilePath)
|
||||
if kb != nil {
|
||||
provider = kb.GetStorageProvider()
|
||||
if backendID == "" && kb.StorageBackendID != nil {
|
||||
backendID = strings.TrimSpace(*kb.StorageBackendID)
|
||||
}
|
||||
}
|
||||
tenant, _ := ctx.Value(types.TenantInfoContextKey).(*types.Tenant)
|
||||
if tenant == nil {
|
||||
@@ -809,6 +819,18 @@ func (t *DataAnalysisTool) resolveFileServiceForKnowledge(ctx context.Context, k
|
||||
if provider == "" && tenant != nil && tenant.StorageEngineConfig != nil {
|
||||
provider = strings.ToLower(strings.TrimSpace(tenant.StorageEngineConfig.DefaultProvider))
|
||||
}
|
||||
if t.storageResolver != nil && tenant != nil && (backendID != "" || provider != "") {
|
||||
resolvedSvc, resolvedProvider, err := t.storageResolver.ResolveFileService(
|
||||
ctx, tenant, backendID, provider, t.localBaseDir,
|
||||
)
|
||||
if err == nil {
|
||||
logger.Infof(ctx, "[Tool][DataAnalysis][storage] resolved storage backend: session_id=%s knowledge_id=%s kb_id=%s backend_id=%s provider=%s",
|
||||
t.sessionID, knowledge.ID, kbID, backendID, resolvedProvider)
|
||||
return resolvedSvc
|
||||
}
|
||||
logger.Warnf(ctx, "[Tool][DataAnalysis][storage] resolve storage backend failed, trying legacy config: session_id=%s knowledge_id=%s kb_id=%s backend_id=%s provider=%s err=%v",
|
||||
t.sessionID, knowledge.ID, kbID, backendID, provider, err)
|
||||
}
|
||||
|
||||
if provider == "" || tenant == nil || tenant.StorageEngineConfig == nil {
|
||||
hasTenantStorageConfig := tenant != nil && tenant.StorageEngineConfig != nil
|
||||
|
||||
Reference in New Issue
Block a user