refactor(terminology): rename user-facing tenant labels to workspace

Align product copy, API docs, Swagger descriptions, and i18n strings
with workspace terminology while keeping internal tenant identifiers
and headers unchanged for API compatibility.
This commit is contained in:
wizardchen
2026-07-14 16:13:49 +08:00
committed by lyingbug
parent e1572b71b9
commit 41975abcc5
161 changed files with 1865 additions and 1770 deletions
@@ -293,8 +293,8 @@ func (s *embedChannelService) chunkAllowedForEmbed(
if chunk == nil || chunk.KnowledgeBaseID == "" {
return false
}
// 显式重校验租户:GetChunkByIDOnly 无租户过滤,且 KBSelectionMode=="all"/默认
// 分支会无条件放行,必须在此挡住跨租户 chunk id 撞库读取他人知识库正文。
// 显式重校验空间:GetChunkByIDOnly 无空间过滤,且 KBSelectionMode=="all"/默认
// 分支会无条件放行,必须在此挡住跨空间 chunk id 撞库读取他人知识库正文。
if ch == nil || chunk.TenantID != ch.TenantID {
return false
}
+1 -1
View File
@@ -498,7 +498,7 @@ func (s *DataTableSummaryService) prepareResources(ctx context.Context, payload
return nil, fmt.Errorf("unsupported file type: %s", fileType)
}
// 获取租户信息
// 获取空间信息
tenantInfo, err := s.tenantService.GetTenantByID(ctx, payload.TenantID)
if err != nil {
logger.Errorf(ctx, "failed to get tenant: %v", err)
+6 -6
View File
@@ -414,11 +414,11 @@ func (s *knowledgeService) isKnowledgeAborted(
// checkStorageEngineConfigured verifies that the knowledge base has a storage engine configured
// (either at the KB level or via the tenant default).
//
// 内部版兜底语义:当 KB 与租户都未配置 storage provider 时,如果服务实例持有
// 内部版兜底语义:当 KB 与空间都未配置 storage provider 时,如果服务实例持有
// 全局 FileService(由容器按 STORAGE_TYPE 注入,默认 local),允许直接落到该
// 全局 fileSvc 上,不再硬性阻断。这与 resolveFileService / resolveFileServiceForPath
// 在 provider 为空时回退到 s.fileSvc 的行为保持一致,避免上层闸门和下游解析口径不一。
// 仅当 KB/租户/全局三处都拿不到任何可用 FileService 时才报错。
// 仅当 KB/空间/全局三处都拿不到任何可用 FileService 时才报错。
func (s *knowledgeService) checkStorageEngineConfigured(ctx context.Context, kb *types.KnowledgeBase) error {
provider := kb.GetStorageProvider()
if provider == "" {
@@ -498,7 +498,7 @@ func (s *knowledgeService) GetOwningKBCreatorID(ctx context.Context, knowledgeID
// minimal and tenant-scoped.
tenantID, ok := ctx.Value(types.TenantIDContextKey).(uint64)
if !ok {
return "", werrors.NewUnauthorizedError("Tenant ID not found in context")
return "", werrors.NewUnauthorizedError("Workspace ID not found in context")
}
knowledge, err := s.repo.GetKnowledgeByID(ctx, tenantID, knowledgeID)
if err != nil {
@@ -791,11 +791,11 @@ func (s *knowledgeService) UpdateKnowledgeTagBatch(ctx context.Context, authoriz
}
tenantIDVal := ctx.Value(types.TenantIDContextKey)
if tenantIDVal == nil {
return werrors.NewUnauthorizedError("tenant ID not found in context")
return werrors.NewUnauthorizedError("workspace ID not found in context")
}
tenantID, ok := tenantIDVal.(uint64)
if !ok {
return werrors.NewUnauthorizedError("invalid tenant ID in context")
return werrors.NewUnauthorizedError("invalid workspace ID in context")
}
// Get all knowledge items in batch
@@ -882,7 +882,7 @@ func (s *knowledgeService) UpdateKnowledgeTagBatch(ctx context.Context, authoriz
func (s *knowledgeService) SearchKnowledge(ctx context.Context, keyword string, offset, limit int, fileTypes []string) ([]*types.Knowledge, bool, int64, error) {
tenantID, ok := ctx.Value(types.TenantIDContextKey).(uint64)
if !ok {
return nil, false, 0, werrors.NewUnauthorizedError("Tenant ID not found in context")
return nil, false, 0, werrors.NewUnauthorizedError("Workspace ID not found in context")
}
scopes := make([]types.KnowledgeSearchScope, 0)
@@ -1899,7 +1899,7 @@ func (s *knowledgeService) UpdateLastFAQImportResultDisplayStatus(ctx context.Co
return werrors.NewBadRequestError("invalid display status, must be 'open' or 'close'")
}
// 获取当前租户ID
// 获取当前空间ID
tenantID := ctx.Value(types.TenantIDContextKey).(uint64)
// 查找FAQ类型的knowledge
+4 -4
View File
@@ -167,8 +167,8 @@ func (s *messageService) GetRecentMessagesBySession(ctx context.Context,
tenantID, ok := sessionTenantIDForLookup(ctx)
if !ok {
logger.Error(ctx, "Tenant ID not found in context for session lookup")
return nil, errors.New("tenant ID not found in context")
logger.Error(ctx, "Workspace ID not found in context for session lookup")
return nil, errors.New("workspace ID not found in context")
}
logger.Infof(ctx, "Checking if session exists, tenant ID: %d", tenantID)
_, err := s.sessionRepo.Get(ctx, tenantID, sessionUserIDForLookup(ctx), sessionID)
@@ -200,8 +200,8 @@ func (s *messageService) GetMessagesBySessionBeforeTime(ctx context.Context,
tenantID, ok := sessionTenantIDForLookup(ctx)
if !ok {
logger.Error(ctx, "Tenant ID not found in context for session lookup")
return nil, errors.New("tenant ID not found in context")
logger.Error(ctx, "Workspace ID not found in context for session lookup")
return nil, errors.New("workspace ID not found in context")
}
logger.Infof(ctx, "Checking if session exists, tenant ID: %d", tenantID)
_, err := s.sessionRepo.Get(ctx, tenantID, sessionUserIDForLookup(ctx), sessionID)
+1 -1
View File
@@ -64,7 +64,7 @@ func (s *modelService) decryptAppSecret(encrypted string) string {
}
// resolveWeKnoraCloudCredentials 为 WeKnoraCloud 厂商模型补全 AppID/AppSecret。
// 当模型自身参数中未存储凭证时,自动从租户配置中获取(SaveCredentials 保存的凭证)。
// 当模型自身参数中未存储凭证时,自动从空间配置中获取(SaveCredentials 保存的凭证)。
func (s *modelService) resolveWeKnoraCloudCredentials(ctx context.Context, params *types.ModelParameters) (appID, appSecret string) {
appID = params.AppID
appSecret = s.decryptAppSecret(params.AppSecret)
+1 -1
View File
@@ -142,7 +142,7 @@ func (s *sessionService) GetSessionByID(ctx context.Context, tenantID uint64, id
return nil, stderrors.New("session id is required")
}
if tenantID == 0 {
return nil, stderrors.New("tenant id is required")
return nil, stderrors.New("workspace id is required")
}
return s.sessionRepo.GetByID(ctx, tenantID, id)
}
@@ -800,7 +800,7 @@ func (s *sessionService) SearchKnowledge(ctx context.Context,
tenantID, ok := types.TenantIDFromContext(ctx)
if !ok {
logger.Error(ctx, "Failed to get tenant ID from context")
return nil, fmt.Errorf("tenant ID not found in context")
return nil, fmt.Errorf("workspace ID not found in context")
}
// Build unified search targets (computed once, used throughout pipeline)
+10 -10
View File
@@ -141,8 +141,8 @@ var registry = map[string]settingSpec{
Default: "create_personal",
Enum: []string{"create_personal", "tenantless"},
Category: "auth",
Description: "公开注册成功后的默认租户策略。create_personal = 自动创建个人租户并设为 Owner;" +
"tenantless = 仅创建用户,等待接受邀请或主动创建租户。修改后只影响新注册用户。",
Description: "公开注册成功后的默认空间策略。create_personal = 自动创建个人空间并设为 Owner;" +
"tenantless = 仅创建用户,等待接受邀请或主动创建空间。修改后只影响新注册用户。",
},
// tenant.max_owned_per_user caps how many tenants a single non-superuser
// can create (and Own) via self-service POST /tenants. Read on every
@@ -156,7 +156,7 @@ var registry = map[string]settingSpec{
EnvName: "WEKNORA_TENANT_MAX_OWNED_PER_USER",
Default: int64(10),
Category: "tenant",
Description: "每个非超管用户通过自助创建可拥有的最大租户数。每次创建租户时实时读取," +
Description: "每个非超管用户通过自助创建可拥有的最大空间数。每次创建空间时实时读取," +
"修改后立即生效。0 表示使用内置默认值 10;负数表示完全关闭限制(不建议在公开部署使用)。",
},
"tenant.self_service_creation_enabled": {
@@ -164,8 +164,8 @@ var registry = map[string]settingSpec{
EnvName: "WEKNORA_TENANT_SELF_SERVICE_CREATION_ENABLED",
Default: true,
Category: "tenant",
Description: "是否允许非超管用户主动创建租户。关闭后,普通用户只能通过邀请加入已有租户;" +
"跨租户超管仍可创建。修改后立即生效。",
Description: "是否允许非超管用户主动创建空间。关闭后,普通用户只能通过邀请加入已有空间;" +
"跨空间超管仍可创建。修改后立即生效。",
},
// tenant.default_storage_quota_gb is the default storage quota (in GB)
// applied to a newly-created tenant when the caller doesn't specify
@@ -179,8 +179,8 @@ var registry = map[string]settingSpec{
EnvName: "WEKNORA_TENANT_DEFAULT_STORAGE_QUOTA_GB",
Default: int64(10),
Category: "tenant",
Description: "新建租户时默认分配的存储配额(GB),包含向量、原文、文本、索引等。" +
"仅在创建时读取,修改后只对之后新建的租户生效,不会回写已存在的租户。" +
Description: "新建空间时默认分配的存储配额(GB),包含向量、原文、文本、索引等。" +
"仅在创建时读取,修改后只对之后新建的空间生效,不会回写已存在的空间。" +
"0 或负数表示使用内置默认值 10GB。",
},
// tenant.auto_create_api_key restores the legacy behaviour where creating
@@ -196,9 +196,9 @@ var registry = map[string]settingSpec{
EnvName: "WEKNORA_TENANT_AUTO_CREATE_API_KEY",
Default: false,
Category: "tenant",
Description: "创建租户时是否自动生成一个全量权限(full_access)的 API Key,并在创建接口的响应中返回其明文 token。" +
"用于兼容旧版本「创建租户即下发默认 API Key」的行为(属于破坏性变更的回退开关)。" +
"每次创建租户时实时读取,修改后立即生效。默认 false(不自动创建,需通过 API Key 管理显式创建)。",
Description: "创建空间时是否自动生成一个全量权限(full_access)的 API Key,并在创建接口的响应中返回其明文 token。" +
"用于兼容旧版本「创建空间即下发默认 API Key」的行为(属于破坏性变更的回退开关)。" +
"每次创建空间时实时读取,修改后立即生效。默认 false(不自动创建,需通过 API Key 管理显式创建)。",
},
"asynq.core_concurrency": {
Type: "int",
+7 -7
View File
@@ -34,8 +34,8 @@ func (s *tenantService) CreateTenant(ctx context.Context, tenant *types.Tenant)
logger.Info(ctx, "Start creating tenant")
if tenant.Name == "" {
logger.Error(ctx, "Tenant name cannot be empty")
return nil, errors.New("tenant name cannot be empty")
logger.Error(ctx, "Workspace name cannot be empty")
return nil, errors.New("workspace name cannot be empty")
}
logger.Infof(ctx, "Creating tenant, name: %s", tenant.Name)
@@ -68,7 +68,7 @@ func (s *tenantService) CreateTenant(ctx context.Context, tenant *types.Tenant)
// GetTenantByID retrieves a tenant by their ID
func (s *tenantService) GetTenantByID(ctx context.Context, id uint64) (*types.Tenant, error) {
if id == 0 {
logger.Error(ctx, "Tenant ID cannot be 0")
logger.Error(ctx, "Workspace ID cannot be 0")
return nil, errors.New("tenant ID cannot be 0")
}
@@ -103,7 +103,7 @@ func (s *tenantService) ListTenants(ctx context.Context) ([]*types.Tenant, error
// UpdateTenant updates an existing tenant's information
func (s *tenantService) UpdateTenant(ctx context.Context, tenant *types.Tenant) (*types.Tenant, error) {
if tenant.ID == 0 {
logger.Error(ctx, "Tenant ID cannot be 0")
logger.Error(ctx, "Workspace ID cannot be 0")
return nil, errors.New("tenant ID cannot be 0")
}
@@ -135,7 +135,7 @@ func (s *tenantService) DeleteTenant(ctx context.Context, id uint64) error {
logger.Info(ctx, "Start deleting tenant")
if id == 0 {
logger.Error(ctx, "Tenant ID cannot be 0")
logger.Error(ctx, "Workspace ID cannot be 0")
return errors.New("tenant ID cannot be 0")
}
@@ -164,7 +164,7 @@ func (s *tenantService) DeleteTenant(ctx context.Context, id uint64) error {
return err
}
logger.Infof(ctx, "Tenant deleted successfully, ID: %d", id)
logger.Infof(ctx, "Workspace deleted successfully, ID: %d", id)
return nil
}
@@ -324,7 +324,7 @@ func (s *tenantService) validateStorageBucketUniqueness(ctx context.Context, ten
oldB := oldBuckets[p]
if b != oldB { // User is trying to change their bucket name or set a new one
if usedByOthers[p] != nil && usedByOthers[p][b] {
return werrors.NewBadRequestError("存储桶名称「" + b + "」已被其他租户使用,为保证数据隔离,请使用其他名称")
return werrors.NewBadRequestError("存储桶名称「" + b + "」已被其他空间使用,为保证数据隔离,请使用其他名称")
}
}
}
+5 -5
View File
@@ -154,7 +154,7 @@ func (s *userService) Register(ctx context.Context, req *types.RegisterRequest)
createdTenant, err = s.tenantService.CreateTenant(ctx, tenant)
if err != nil {
logger.Errorf(ctx, "Failed to create tenant")
logger.Errorf(ctx, "Failed to create workspace")
return nil, errors.New("failed to create workspace")
}
}
@@ -931,14 +931,14 @@ func (s *userService) SwitchTenant(
return nil, errors.New("user is required")
}
if targetTenantID == 0 {
return nil, errors.New("target tenant ID is required")
return nil, errors.New("target workspace ID is required")
}
// Verify membership unless the caller is a cross-tenant superuser
// switching outside their home tenant.
if !user.CanAccessAllTenants || targetTenantID == user.TenantID {
if s.memberService == nil {
return nil, errors.New("tenant membership service unavailable")
return nil, errors.New("workspace membership service unavailable")
}
member, err := s.memberService.GetMembership(ctx, user.ID, targetTenantID)
if err != nil {
@@ -951,7 +951,7 @@ func (s *userService) SwitchTenant(
tenant, err := s.tenantService.GetTenantByID(ctx, targetTenantID)
if err != nil {
return nil, fmt.Errorf("load target tenant: %w", err)
return nil, fmt.Errorf("load target workspace: %w", err)
}
accessToken, refreshToken, err := s.generateTokensForTenant(ctx, user, targetTenantID)
@@ -972,7 +972,7 @@ func (s *userService) SwitchTenant(
return &types.LoginResponse{
Success: true,
Message: "Tenant switched",
Message: "Workspace switched",
User: user,
ActiveTenant: tenant,
Memberships: memberships,
+1 -1
View File
@@ -94,7 +94,7 @@ func (s *WebSearchService) resolveProvider(
if providerID != "" {
tenantID, ok := types.TenantIDFromContext(ctx)
if !ok {
return nil, fmt.Errorf("tenant ID not found in context")
return nil, fmt.Errorf("workspace ID not found in context")
}
entity, err := s.providerRepo.GetByID(ctx, tenantID, providerID)
+1 -1
View File
@@ -116,7 +116,7 @@ func (s *weKnoraCloudService) CheckStatus(ctx context.Context) (*types.WeKnoraCl
return &types.WeKnoraCloudStatusResult{HasModels: true, NeedsReinit: false}, nil
}
// updateTenantCredentials 更新租户的 WeKnoraCloud 凭证
// updateTenantCredentials 更新空间的 WeKnoraCloud 凭证
func (s *weKnoraCloudService) updateTenantCredentials(ctx context.Context, tenantID uint64, appID, appSecret string) error {
if s.tenantRepo == nil {
return fmt.Errorf("tenant repository is required")