RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
feat: migrate permission schema fields (#21085)
buua4369218cb6d1156
diff --git a/internal/dao/database.go b/internal/dao/database.goindex 3adbd9ffdf..025f03a87b 100644--- a/internal/dao/database.go+++ b/internal/dao/database.go@@ -213,6 +213,7 @@ func InitDB(ctx context.Context, migrateDB bool) error {&entity.CompilationTemplate{},&entity.CompilationTemplateGroup{},}+ dataModels = append(dataModels, permissionDataModelsEE()...)if migrateDB {// Mirror the Python flow, where tools/scripts/run_migrations.sh runs before@@ -226,6 +227,9 @@ func InitDB(ctx context.Context, migrateDB bool) error {if err = migrateIngestionLogRunIdentity(ctx, DB); err != nil {return err}+ if err = migrateUserTenantDuplicates(ctx, DB); err != nil {+ return fmt.Errorf("failed to deduplicate user_tenant memberships: %w", err)+ }common.Info("Migrating database schema...")for _, m := range dataModels {@@ -233,7 +237,6 @@ func InitDB(ctx context.Context, migrateDB bool) error {return fmt.Errorf("failed to migrate model %T: %w", m, err)}}- common.Info("Database schema migrated successfully")// Split the conversation message and reference payloads out of their// parent tables. It has to run after AutoMigrate, which unlike@@ -250,6 +253,10 @@ func InitDB(ctx context.Context, migrateDB bool) error {if err = migrateTenantModelMaxTokens(ctx, DB); err != nil {return fmt.Errorf("failed to backfill tenant model max_tokens: %w", err)}+ if err = migratePermissions(ctx, DB); err != nil {+ return fmt.Errorf("failed to migrate permissions: %w", err)+ }+ common.Info("Database schema migrated successfully")} else {if err = migrateIngestionLogRunIdentity(ctx, DB); err != nil {return errdiff --git a/internal/dao/database_ee.go b/internal/dao/database_ee.gonew file mode 100644index 0000000000..9d1fb8283c--- /dev/null+++ b/internal/dao/database_ee.go@@ -0,0 +1,22 @@+//+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.+//++package dao++// permissionDataModelsEE returns the entities included in the enterprise schema.+func permissionDataModelsEE() []interface{} {+ return nil+}diff --git a/internal/dao/database_test.go b/internal/dao/database_test.goindex 3ef0319ef8..8a9bd67380 100644--- a/internal/dao/database_test.go+++ b/internal/dao/database_test.go@@ -127,14 +127,14 @@ func TestMigrateIngestionTaskPipelineLogID(t *testing.T) {t.Fatalf("create legacy table: %v", err)}migrator := db.Migrator()- if migrator.HasColumn("ingestion_task", "pipeline_log_id") {+ if migrator.HasColumn(&entity.IngestionTask{}, "pipeline_log_id") {t.Fatal("precondition failed: column already present")}if err := migrateIngestionTaskPipelineLogID(ctx, db); err != nil {t.Fatalf("migrateIngestionTaskPipelineLogID: %v", err)}- if !migrator.HasColumn("ingestion_task", "pipeline_log_id") {+ if !migrator.HasColumn(&entity.IngestionTask{}, "pipeline_log_id") {t.Fatal("expected pipeline_log_id to be added")}diff --git a/internal/dao/permission_migration.go b/internal/dao/permission_migration.gonew file mode 100644index 0000000000..ebf06dec15--- /dev/null+++ b/internal/dao/permission_migration.go@@ -0,0 +1,241 @@+//+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.+//++package dao++import (+ "context"+ "fmt"+ "strings"++ "ragflow/internal/entity"++ "gorm.io/gorm"+)++const permissionMigrationTargetVersion = "v1.0.0-rc3.dev1"++// migratePermissions applies the permission schema migration and records its version.+func migratePermissions(ctx context.Context, db *gorm.DB) error {+ version, err := GetDatabaseMigrationVersion(ctx, db)+ if err != nil {+ return fmt.Errorf("read database migration version: %w", err)+ }+ if shouldSkipMigration(version, permissionMigrationTargetVersion) {+ return nil+ }+ if err := migratePermissionDataEE(ctx, db); err != nil {+ return fmt.Errorf("migrate enterprise permission data: %w", err)+ }+ if err := migrateInvitedByNullable(ctx, db); err != nil {+ return err+ }+ if err := migrateTenantModelProviderUserID(ctx, db); err != nil {+ return err+ }+ if err := migrateAPITokenUserID(ctx, db); err != nil {+ return err+ }+ if err := migrateUserCanvasTenantID(ctx, db); err != nil {+ return err+ }+ if err := setDatabaseMigrationVersion(ctx, db, permissionMigrationTargetVersion); err != nil {+ return fmt.Errorf("mark permission migration version: %w", err)+ }+ return nil+}++// migrateUserTenantDuplicates removes duplicate legacy memberships before+// AutoMigrate creates the unique (user_id, tenant_id) index.+func migrateUserTenantDuplicates(ctx context.Context, db *gorm.DB) error {+ scoped := db.WithContext(ctx)+ migrator := scoped.Migrator()+ if !migrator.HasTable(&entity.UserTenant{}) {+ return nil+ }+ hasIndex, err := hasUserTenantUniqueIndex(ctx, scoped)+ if err != nil {+ return fmt.Errorf("inspect user_tenant unique index: %w", err)+ }+ if hasIndex {+ return nil+ }++ return scoped.Transaction(func(tx *gorm.DB) error {+ var duplicateKeys []struct {+ UserID string `gorm:"column:user_id"`+ TenantID string `gorm:"column:tenant_id"`+ }+ if err := tx.Model(&entity.UserTenant{}).+ Select("user_id, tenant_id").+ Group("user_id, tenant_id").+ Having("COUNT(*) > 1").+ Scan(&duplicateKeys).Error; err != nil {+ return fmt.Errorf("find duplicate user_tenant memberships: %w", err)+ }++ for _, key := range duplicateKeys {+ var memberships []entity.UserTenant+ if err := tx.Where("user_id = ? AND tenant_id = ?", key.UserID, key.TenantID).+ Order("CASE WHEN status = '1' THEN 0 ELSE 1 END").+ Order("CASE role WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 WHEN 'normal' THEN 2 WHEN 'invite' THEN 3 ELSE 4 END").+ Order("update_time DESC").+ Order("create_time ASC").+ Order("id ASC").+ Find(&memberships).Error; err != nil {+ return fmt.Errorf("list duplicate user_tenant memberships for user %s in tenant %s: %w", key.UserID, key.TenantID, err)+ }+ if len(memberships) < 2 {+ continue+ }+ keepID := memberships[0].ID+ for _, duplicate := range memberships[1:] {+ if err := remapUserTenantReferences(ctx, tx, duplicate.ID, keepID); err != nil {+ return err+ }+ if err := tx.Where("id = ?", duplicate.ID).Delete(&entity.UserTenant{}).Error; err != nil {+ return fmt.Errorf("delete duplicate user_tenant membership %s: %w", duplicate.ID, err)+ }+ }+ }+ return nil+ })+}++func hasUserTenantUniqueIndex(ctx context.Context, db *gorm.DB) (bool, error) {+ indexes, err := db.WithContext(ctx).Migrator().GetIndexes(&entity.UserTenant{})+ if err != nil {+ return false, err+ }+ for _, index := range indexes {+ unique, known := index.Unique()+ if !known || !unique {+ continue+ }+ columns := index.Columns()+ if len(columns) != 2 {+ continue+ }+ columnSet := map[string]struct{}{"user_id": {}, "tenant_id": {}}+ for _, column := range columns {+ delete(columnSet, strings.ToLower(column))+ }+ if len(columnSet) == 0 {+ return true, nil+ }+ }+ return false, nil+}++func remapUserTenantReferences(ctx context.Context, tx *gorm.DB, oldID, newID string) error {+ references := []struct {+ table string+ column string+ }{+ {table: "group_info", column: "owner_id"},+ {table: "group_member", column: "member_id"},+ {table: "department_member", column: "member_id"},+ {table: "permission", column: "member_id"},+ }+ for _, reference := range references {+ migrator := tx.WithContext(ctx).Migrator()+ if !migrator.HasTable(reference.table) || !migrator.HasColumn(reference.table, reference.column) {+ continue+ }+ if err := tx.WithContext(ctx).Table(reference.table).+ Where(reference.column+" = ?", oldID).+ Update(reference.column, newID).Error; err != nil {+ return fmt.Errorf("remap %s.%s from membership %s to %s: %w", reference.table, reference.column, oldID, newID, err)+ }+ }+ return nil+}++// migrateTenantModelProviderUserID backfills missing model provider owner IDs.+func migrateTenantModelProviderUserID(ctx context.Context, db *gorm.DB) error {+ scoped := db.WithContext(ctx)+ migrator := scoped.Migrator()+ if !migrator.HasTable(&entity.TenantModelProvider{}) {+ return nil+ }+ if !migrator.HasColumn(&entity.TenantModelProvider{}, "UserID") {+ return fmt.Errorf("tenant_model_provider.user_id is missing after GORM migration")+ }+ if err := scoped.Model(&entity.TenantModelProvider{}).+ Where("user_id IS NULL OR user_id = ''").+ UpdateColumn("user_id", gorm.Expr("tenant_id")).Error; err != nil {+ return fmt.Errorf("backfill tenant_model_provider.user_id from tenant_id: %w", err)+ }+ return nil+}++// migrateUserCanvasTenantID backfills tenant IDs for existing canvases.+func migrateUserCanvasTenantID(ctx context.Context, db *gorm.DB) error {+ migrator := db.WithContext(ctx).Migrator()+ if !migrator.HasTable(&entity.UserCanvas{}) {+ return nil+ }+ if !migrator.HasColumn(&entity.UserCanvas{}, "TenantID") {+ return fmt.Errorf("user_canvas.tenant_id is missing after GORM migration")+ }+ if err := db.WithContext(ctx).Exec("UPDATE user_canvas SET tenant_id = user_id WHERE tenant_id IS NULL OR tenant_id = ''").Error; err != nil {+ return fmt.Errorf("backfill user_canvas.tenant_id: %w", err)+ }+ return nil+}++// migrateAPITokenUserID backfills user IDs for existing API tokens.+func migrateAPITokenUserID(ctx context.Context, db *gorm.DB) error {+ migrator := db.WithContext(ctx).Migrator()+ if !migrator.HasTable(&entity.APIToken{}) {+ return nil+ }+ if !migrator.HasColumn(&entity.APIToken{}, "UserID") {+ return fmt.Errorf("api_token.user_id is missing after GORM migration")+ }+ if err := db.WithContext(ctx).Exec("UPDATE api_token SET user_id = tenant_id WHERE user_id IS NULL OR user_id = ''").Error; err != nil {+ return fmt.Errorf("backfill api_token.user_id: %w", err)+ }+ return nil+}++// migrateInvitedByNullable allows tenant membership requests without an inviter.+func migrateInvitedByNullable(ctx context.Context, db *gorm.DB) error {+ migrator := db.WithContext(ctx).Migrator()+ columns, err := migrator.ColumnTypes(&entity.UserTenant{})+ if err != nil {+ return fmt.Errorf("inspect user_tenant columns: %w", err)+ }+ for _, column := range columns {+ if column.Name() != "invited_by" {+ continue+ }+ nullable, known := column.Nullable()+ if !known {+ return fmt.Errorf("user_tenant.invited_by nullability is unknown")+ }+ if nullable {+ return nil+ }+ // AutoMigrate does not relax NOT NULL on an existing column for every+ // supported dialect, so use GORM's migrator for this one legacy constraint.+ if err := migrator.AlterColumn(&entity.UserTenant{}, "InvitedBy"); err != nil {+ return fmt.Errorf("make user_tenant.invited_by nullable: %w", err)+ }+ return nil+ }+ return fmt.Errorf("user_tenant.invited_by column is missing")+}diff --git a/internal/dao/permission_migration_ee.go b/internal/dao/permission_migration_ee.gonew file mode 100644index 0000000000..a61f916651--- /dev/null+++ b/internal/dao/permission_migration_ee.go@@ -0,0 +1,28 @@+//+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.+//++package dao++import (+ "context"++ "gorm.io/gorm"+)++// migratePermissionDataEE migrates enterprise permission data after schema setup.+func migratePermissionDataEE(context.Context, *gorm.DB) error {+ return nil+}diff --git a/internal/dao/permission_migration_test.go b/internal/dao/permission_migration_test.gonew file mode 100644index 0000000000..460f90dbd3--- /dev/null+++ b/internal/dao/permission_migration_test.go@@ -0,0 +1,253 @@+//+// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+//+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.+//++package dao++import (+ "context"+ "testing"++ "github.com/glebarez/sqlite"+ "gorm.io/gorm"++ "ragflow/internal/entity"+)++// TestMigratePermissions verifies legacy permission fields are migrated once.+func TestMigratePermissions(t *testing.T) {+ db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})+ if err != nil {+ t.Fatalf("open database: %v", err)+ }+ if err := db.Exec(`CREATE TABLE user_tenant (+ id TEXT PRIMARY KEY, user_id TEXT NOT NULL, tenant_id TEXT NOT NULL,+ role TEXT NOT NULL, invited_by TEXT NOT NULL, status varchar(1)+ )`).Error; err != nil {+ t.Fatalf("create existing membership table: %v", err)+ }+ if err := db.Exec(`INSERT INTO user_tenant (id, user_id, tenant_id, role, invited_by, status)+ VALUES ('membership-1', 'user-1', 'tenant-1', 'normal', 'owner-1', '1')`).Error; err != nil {+ t.Fatalf("create existing membership: %v", err)+ }+ if err := db.Exec(`CREATE TABLE api_token (tenant_id varchar(32) NOT NULL, token varchar(255) NOT NULL,+ PRIMARY KEY (tenant_id, token))`).Error; err != nil {+ t.Fatalf("create existing API token table: %v", err)+ }+ if err := db.Exec(`INSERT INTO api_token (tenant_id, token) VALUES ('tenant-1', 'token-1')`).Error; err != nil {+ t.Fatalf("create existing API token: %v", err)+ }+ if err := db.Exec(`CREATE TABLE user_canvas (id varchar(32) PRIMARY KEY, user_id varchar(255) NOT NULL)`).Error; err != nil {+ t.Fatalf("create existing canvas table: %v", err)+ }+ if err := db.Exec(`INSERT INTO user_canvas (id, user_id) VALUES ('canvas-1', 'tenant-1')`).Error; err != nil {+ t.Fatalf("create existing canvas: %v", err)+ }+ if err := db.Exec(`CREATE TABLE tenant_model_provider (+ id varchar(32) PRIMARY KEY, tenant_id varchar(32) NOT NULL, provider_name varchar(128) NOT NULL+ )`).Error; err != nil {+ t.Fatalf("create legacy model provider table: %v", err)+ }+ if err := db.Exec(`INSERT INTO tenant_model_provider (id, tenant_id, provider_name)+ VALUES ('provider-1', 'tenant-1', 'openai')`).Error; err != nil {+ t.Fatalf("create legacy model provider: %v", err)+ }+ if err := db.AutoMigrate(&entity.SystemSettings{}); err != nil {+ t.Fatalf("create system settings: %v", err)+ }+ if err := db.AutoMigrate(+ &entity.UserTenant{},+ &entity.APIToken{},+ &entity.UserCanvas{},+ &entity.TenantModelProvider{},+ ); err != nil {+ t.Fatalf("auto-migrate shared permission migration entities: %v", err)+ }+ if err := db.AutoMigrate(permissionDataModelsEE()...); err != nil {+ t.Fatalf("auto-migrate enterprise permission entities: %v", err)+ }+ ctx := context.Background()+ if err := setDatabaseMigrationVersion(ctx, db, tenantModelMaxTokensTargetVersion); err != nil {+ t.Fatalf("set previous migration version: %v", err)+ }+ if err := migratePermissions(ctx, db); err != nil {+ t.Fatalf("migrate permissions: %v", err)+ }+ columns, err := db.Migrator().ColumnTypes(&entity.UserTenant{})+ if err != nil {+ t.Fatalf("inspect user_tenant columns: %v", err)+ }+ for _, column := range columns {+ if column.Name() == "invited_by" {+ if nullable, known := column.Nullable(); !known || !nullable {+ t.Fatalf("user_tenant.invited_by nullable = %v, known = %v", nullable, known)+ }+ }+ }+ for _, model := range permissionDataModelsEE() {+ if !db.Migrator().HasTable(model) {+ t.Fatalf("permission migration did not create %T", model)+ }+ }+ var provider entity.TenantModelProvider+ if err := db.Take(&provider, "id = ?", "provider-1").Error; err != nil {+ t.Fatalf("read migrated model provider: %v", err)+ }+ if provider.UserID != "tenant-1" {+ t.Fatalf("model provider user_id = %q, want tenant-1", provider.UserID)+ }+ var token entity.APIToken+ if err := db.Take(&token, "tenant_id = ? AND token = ?", "tenant-1", "token-1").Error; err != nil {+ t.Fatalf("read migrated API token: %v", err)+ }+ if token.UserID == nil || *token.UserID != "tenant-1" {+ t.Fatalf("API token user_id = %v, want tenant-1", token.UserID)+ }+ var canvas entity.UserCanvas+ if err := db.Take(&canvas, "id = ?", "canvas-1").Error; err != nil {+ t.Fatalf("read migrated canvas: %v", err)+ }+ if canvas.TenantID == nil || *canvas.TenantID != "tenant-1" {+ t.Fatalf("canvas tenant_id = %v, want tenant-1", canvas.TenantID)+ }+ if err := db.Exec("INSERT INTO api_token (tenant_id, user_id, token) VALUES (?, ?, ?)", "tenant-1", "tenant-1", "token-1").Error; err == nil {+ t.Fatal("duplicate (tenant_id, token) was accepted")+ }+ if err := db.Exec("INSERT INTO api_token (tenant_id, user_id, token) VALUES (?, ?, ?)", "tenant-2", "user-2", "token-1").Error; err != nil {+ t.Fatalf("same token in another tenant was rejected: %v", err)+ }+ columns, err = db.Migrator().ColumnTypes(&entity.APIToken{})+ if err != nil {+ t.Fatalf("inspect API token columns: %v", err)+ }+ for _, column := range columns {+ if column.Name() == "user_id" {+ if nullable, known := column.Nullable(); !known || !nullable {+ t.Fatalf("api_token.user_id nullable = %v, known = %v", nullable, known)+ }+ }+ }+ version, err := GetDatabaseMigrationVersion(ctx, db)+ if err != nil {+ t.Fatalf("get migration version: %v", err)+ }+ if version != permissionMigrationTargetVersion {+ t.Fatalf("migration version = %q, want %q", version, permissionMigrationTargetVersion)+ }+ if err := db.Exec("UPDATE user_tenant SET invited_by = NULL WHERE id = ?", "membership-1").Error; err != nil {+ t.Fatalf("clear invited_by: %v", err)+ }+ if err := db.Exec("UPDATE tenant_model_provider SET user_id = '' WHERE id = ?", "provider-1").Error; err != nil {+ t.Fatalf("clear model provider owner: %v", err)+ }+ if err := db.Exec("UPDATE api_token SET user_id = '' WHERE tenant_id = ? AND token = ?", "tenant-1", "token-1").Error; err != nil {+ t.Fatalf("clear API token owner: %v", err)+ }+ if err := db.Exec("UPDATE user_canvas SET tenant_id = '' WHERE id = ?", "canvas-1").Error; err != nil {+ t.Fatalf("clear canvas tenant: %v", err)+ }+ if err := migratePermissions(ctx, db); err != nil {+ t.Fatalf("repeat permission migration: %v", err)+ }+ if err := db.Take(&provider, "id = ?", "provider-1").Error; err != nil {+ t.Fatalf("read model provider after repeated migration: %v", err)+ }+ if provider.UserID != "" {+ t.Fatalf("repeated migration backfilled model provider user_id = %q, want it unchanged", provider.UserID)+ }+ if err := db.Take(&token, "tenant_id = ? AND token = ?", "tenant-1", "token-1").Error; err != nil {+ t.Fatalf("read API token after repeated migration: %v", err)+ }+ if token.UserID == nil || *token.UserID != "" {+ t.Fatalf("repeated migration backfilled API token user_id = %v, want it unchanged", token.UserID)+ }+ if err := db.Take(&canvas, "id = ?", "canvas-1").Error; err != nil {+ t.Fatalf("read canvas after repeated migration: %v", err)+ }+ if canvas.TenantID == nil || *canvas.TenantID != "" {+ t.Fatalf("repeated migration backfilled canvas tenant_id = %v, want it unchanged", canvas.TenantID)+ }+}++func TestMigrateUserTenantDuplicates(t *testing.T) {+ db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})+ if err != nil {+ t.Fatalf("open database: %v", err)+ }+ if err := db.AutoMigrate(&entity.UserTenant{}); err != nil {+ t.Fatalf("create user_tenant table: %v", err)+ }+ if err := db.Migrator().DropIndex(&entity.UserTenant{}, "idx_user_tenant_user_tenant"); err != nil {+ t.Fatalf("drop user_tenant unique index: %v", err)+ }+ for _, statement := range []string{+ `CREATE TABLE group_info (id TEXT PRIMARY KEY, owner_id TEXT NOT NULL)`,+ `CREATE TABLE group_member (id TEXT PRIMARY KEY, member_id TEXT NOT NULL)`,+ `CREATE TABLE department_member (id TEXT PRIMARY KEY, member_id TEXT NOT NULL)`,+ `CREATE TABLE permission (id TEXT PRIMARY KEY, member_id TEXT)`,+ `INSERT INTO user_tenant (id, user_id, tenant_id, role, invited_by, status) VALUES+ ('member-normal', 'user-1', 'tenant-1', 'normal', 'user-1', '1'),+ ('member-owner', 'user-1', 'tenant-1', 'owner', 'user-1', '1')`,+ `INSERT INTO group_info (id, owner_id) VALUES ('group-1', 'member-normal')`,+ `INSERT INTO group_member (id, member_id) VALUES ('group-member-1', 'member-normal')`,+ `INSERT INTO department_member (id, member_id) VALUES ('department-member-1', 'member-normal')`,+ `INSERT INTO permission (id, member_id) VALUES ('permission-1', 'member-normal')`,+ } {+ if err := db.Exec(statement).Error; err != nil {+ t.Fatalf("execute test setup statement: %v", err)+ }+ }++ if err := migrateUserTenantDuplicates(context.Background(), db); err != nil {+ t.Fatalf("deduplicate user_tenant memberships: %v", err)+ }+ var memberships []entity.UserTenant+ if err := db.Find(&memberships).Error; err != nil {+ t.Fatalf("read user_tenant memberships: %v", err)+ }+ if len(memberships) != 1 || memberships[0].ID != "member-owner" {+ t.Fatalf("kept user_tenant memberships = %+v, want only owner membership", memberships)+ }+ for _, reference := range []struct {+ table string+ id string+ }{+ {table: "group_info", id: "group-1"},+ {table: "group_member", id: "group-member-1"},+ {table: "department_member", id: "department-member-1"},+ {table: "permission", id: "permission-1"},+ } {+ var row struct {+ OwnerID string `gorm:"column:owner_id"`+ MemberID string `gorm:"column:member_id"`+ }+ if err := db.Table(reference.table).Where("id = ?", reference.id).Take(&row).Error; err != nil {+ t.Fatalf("read %s reference: %v", reference.table, err)+ }+ memberID := row.MemberID+ if memberID == "" {+ memberID = row.OwnerID+ }+ if memberID != "member-owner" {+ t.Fatalf("%s membership reference = %q, want member-owner", reference.table, memberID)+ }+ }+ if err := db.AutoMigrate(&entity.UserTenant{}); err != nil {+ t.Fatalf("auto-migrate unique user_tenant index: %v", err)+ }+ if err := db.Exec("INSERT INTO user_tenant (id, user_id, tenant_id, role) VALUES (?, ?, ?, ?)", "member-duplicate", "user-1", "tenant-1", "normal").Error; err == nil {+ t.Fatal("duplicate user_tenant membership was accepted after AutoMigrate")+ }+}diff --git a/internal/entity/api_token.go b/internal/entity/api_token.goindex 37464ee9b5..4a37b9152b 100644--- a/internal/entity/api_token.go+++ b/internal/entity/api_token.go@@ -19,6 +19,7 @@ package entity// APIToken API token modeltype APIToken struct {TenantID string `gorm:"column:tenant_id;size:32;not null;primaryKey" json:"tenant_id"`+ UserID *string `gorm:"column:user_id;size:32" json:"user_id,omitempty"`Token string `gorm:"column:token;size:255;not null;primaryKey" json:"token"`DialogID *string `gorm:"column:dialog_id;size:32;index" json:"dialog_id,omitempty"`Source *string `gorm:"column:source;size:16;index" json:"source,omitempty"`diff --git a/internal/entity/canvas.go b/internal/entity/canvas.goindex f98f2d271f..464ee00616 100644--- a/internal/entity/canvas.go+++ b/internal/entity/canvas.go@@ -21,6 +21,7 @@ type UserCanvas struct {ID string `gorm:"column:id;primaryKey;size:32" json:"id"`Avatar *string `gorm:"column:avatar;type:longtext" json:"avatar,omitempty"`UserID string `gorm:"column:user_id;size:255;not null;index" json:"user_id"`+ TenantID *string `gorm:"column:tenant_id;size:32" json:"tenant_id,omitempty"`Tags string `gorm:"column:tags;size:512;not null;default:'';index" json:"tags"`Title *string `gorm:"column:title;size:255" json:"title,omitempty"`Permission string `gorm:"column:permission;size:16;not null;default:me;index" json:"permission"`diff --git a/internal/entity/tenant.go b/internal/entity/tenant.goindex 844d82eb32..68316921a0 100644--- a/internal/entity/tenant.go+++ b/internal/entity/tenant.go@@ -37,6 +37,8 @@ type Tenant struct {OCRID *string `gorm:"column:ocr_id;size:256;index" json:"ocr_id,omitempty"`TenantOCRID *string `gorm:"column:tenant_ocr_id;size:32;index" json:"tenant_ocr_id,omitempty"`Credit int `gorm:"column:credit;default:512;index" json:"credit"`+ InviteEnabled bool `gorm:"column:invite_enabled;not null;default:false" json:"invite_enabled"`+ RoleID *int32 `gorm:"column:role_id" json:"role_id,omitempty"`Status *string `gorm:"column:status;size:1;index;default:'1'" json:"status,omitempty"`BaseModel}diff --git a/internal/entity/tenant_model_provider.go b/internal/entity/tenant_model_provider.goindex db65188359..cbb3c170a4 100644--- a/internal/entity/tenant_model_provider.go+++ b/internal/entity/tenant_model_provider.go@@ -19,6 +19,7 @@ package entity// TenantModelProvider tenant model provider tabletype TenantModelProvider struct {ID string `gorm:"column:id;primaryKey;size:32" json:"id"`+ UserID string `gorm:"column:user_id;size:32;index" json:"user_id"`ProviderName string `gorm:"column:provider_name;size:128;not null;index:idx_tenant_provider_unique,unique" json:"provider_name"`TenantID string `gorm:"column:tenant_id;size:32;not null;index;index:idx_tenant_provider_unique,unique" json:"tenant_id"`BaseModeldiff --git a/internal/entity/user_tenant.go b/internal/entity/user_tenant.goindex f46b47a74a..b7db6d0191 100644--- a/internal/entity/user_tenant.go+++ b/internal/entity/user_tenant.go@@ -19,11 +19,11 @@ package entity// UserTenant user tenant relationship modeltype UserTenant struct {ID string `gorm:"column:id;primaryKey;size:32" json:"id"`- UserID string `gorm:"column:user_id;size:32;not null;index" json:"user_id"`- TenantID string `gorm:"column:tenant_id;size:32;not null;index" json:"tenant_id"`+ UserID string `gorm:"column:user_id;size:32;not null;index;uniqueIndex:idx_user_tenant_user_tenant,priority:1" json:"user_id"`+ TenantID string `gorm:"column:tenant_id;size:32;not null;index;uniqueIndex:idx_user_tenant_user_tenant,priority:2" json:"tenant_id"`Role string `gorm:"column:role;size:32;not null;index" json:"role"`- InvitedBy string `gorm:"column:invited_by;size:32;not null;index" json:"invited_by"`- Status *string `gorm:"column:status;size:1;index;default:'1'" json:"status,omitempty"`+ InvitedBy string `gorm:"column:invited_by;size:32;index" json:"invited_by"`+ Status *string `gorm:"column:status;size:16;index;default:'1'" json:"status,omitempty"`BaseModel}diff --git a/internal/handler/chat_audio_test.go b/internal/handler/chat_audio_test.goindex d732fe1283..91f3746c1d 100644--- a/internal/handler/chat_audio_test.go+++ b/internal/handler/chat_audio_test.go@@ -82,6 +82,7 @@ func TestChatAudioSpeechFailureOmitsProviderError(t *testing.T) {}if err = db.Create(&entity.TenantModelProvider{ID: "prov-1",+ UserID: "user-1",ProviderName: "SILICONFLOW",TenantID: "user-1",}).Error; err != nil {diff --git a/internal/handler/ingestion_messages_test.go b/internal/handler/ingestion_messages_test.goindex 3cc1cb2ef0..623e2d98ed 100644--- a/internal/handler/ingestion_messages_test.go+++ b/internal/handler/ingestion_messages_test.go@@ -206,14 +206,4 @@ func insertIngestionMessagesHandlerKB(t *testing.T, db *gorm.DB, id, userID stri}).Error; err != nil {t.Fatalf("insert knowledgebase: %v", err)}- activeStatus := string(entity.StatusValid)- if err := db.Create(&entity.UserTenant{- ID: id + "-owner-membership",- UserID: userID,- TenantID: userID,- Role: "owner",- Status: &activeStatus,- }).Error; err != nil {- t.Fatalf("insert tenant owner: %v", err)- }}diff --git a/internal/handler/providers_test.go b/internal/handler/providers_test.goindex 4be18e967a..b7e0fa4db8 100644--- a/internal/handler/providers_test.go+++ b/internal/handler/providers_test.go@@ -74,7 +74,7 @@ func seedProviderHandlerModel(t *testing.T, db *gorm.DB) {activeStatus := "1"rows := []interface{}{&entity.UserTenant{ID: "user-tenant-1", UserID: "user-1", TenantID: "tenant-1", Role: "owner", InvitedBy: "user-1", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-1", TenantID: "tenant-1", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-1", UserID: "user-1", TenantID: "tenant-1", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-1", ProviderID: "provider-1", InstanceName: "default", APIKey: "sk-test", Status: "active", Extra: "{}"},&entity.TenantModel{ID: "model-1", ProviderID: "provider-1", InstanceID: "instance-1", ModelName: "gpt-test", ModelType: int(entity.ModelTypeChat), Status: "active"},}diff --git a/internal/permission/database_source.go b/internal/permission/database_source.goindex 749218a5c9..9e45245c8e 100644--- a/internal/permission/database_source.go+++ b/internal/permission/database_source.go@@ -247,15 +247,6 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (if err != nil {return nil, err}- modelTenantIDs := make([]string, 0, len(modelProvidersByID))- for _, provider := range modelProvidersByID {- modelTenantIDs = append(modelTenantIDs, provider.TenantID)- }- modelOwnerIDsByTenant, err := s.loadTenantOwnerIDs(ctx, modelTenantIDs)- if err != nil {- return nil, err- }-resources := make([]Resource, 0, len(refs))for _, ref := range refs {switch ref.Kind {@@ -326,11 +317,10 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (resources = append(resources, syncTaskResource(task, connector, linked))case ResourceKindModelProvider:if provider, ok := modelProvidersByID[ref.ID]; ok {- ownerUserID := modelOwnerIDsByTenant[provider.TenantID]- if ownerUserID == "" {- return nil, fmt.Errorf("%w: tenant %q has no active owner", ErrInvalidPermission, provider.TenantID)+ if strings.TrimSpace(provider.UserID) == "" {+ return nil, fmt.Errorf("%w: model provider %q has no owner user_id", ErrInvalidPermission, provider.ID)}- resources = append(resources, modelProviderResource(provider, ownerUserID))+ resources = append(resources, modelProviderResource(provider))}case ResourceKindModelInstance:instance, ok := modelInstancesByID[ref.ID]@@ -341,11 +331,10 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (if !ok {continue}- ownerUserID := modelOwnerIDsByTenant[provider.TenantID]- if ownerUserID == "" {- return nil, fmt.Errorf("%w: tenant %q has no active owner", ErrInvalidPermission, provider.TenantID)+ if strings.TrimSpace(provider.UserID) == "" {+ return nil, fmt.Errorf("%w: model provider %q has no owner user_id", ErrInvalidPermission, provider.ID)}- resources = append(resources, modelInstanceResource(instance, provider, ownerUserID))+ resources = append(resources, modelInstanceResource(instance, provider))case ResourceKindModel:model, ok := tenantModelsByID[ref.ID]if !ok {@@ -359,11 +348,10 @@ func (s *databaseSource) GetResources(ctx context.Context, refs []ResourceRef) (if !ok {continue}- ownerUserID := modelOwnerIDsByTenant[provider.TenantID]- if ownerUserID == "" {- return nil, fmt.Errorf("%w: tenant %q has no active owner", ErrInvalidPermission, provider.TenantID)+ if strings.TrimSpace(provider.UserID) == "" {+ return nil, fmt.Errorf("%w: model provider %q has no owner user_id", ErrInvalidPermission, provider.ID)}- resources = append(resources, tenantModelResource(model, provider, ownerUserID))+ resources = append(resources, tenantModelResource(model, provider))case ResourceKindMCPServer:tenantID, ok := mcpServerTenantsByID[ref.ID]if !ok {diff --git a/internal/permission/database_source_test.go b/internal/permission/database_source_test.goindex 065f10e66e..27ab3a88a1 100644--- a/internal/permission/database_source_test.go+++ b/internal/permission/database_source_test.go@@ -998,8 +998,8 @@ func TestDatabaseCheckerAuthorizesTenantModelsAndSeparatesInstanceUseFromRead(t}providers := []entity.TenantModelProvider{- {ID: "team-provider", ProviderName: "openai", TenantID: "team-tenant"},- {ID: "other-provider", ProviderName: "openai", TenantID: "other-tenant"},+ {ID: "team-provider", UserID: "team-owner", ProviderName: "openai", TenantID: "team-tenant"},+ {ID: "other-provider", UserID: "other-owner", ProviderName: "openai", TenantID: "other-tenant"},}for i := range providers {if err := db.Create(&providers[i]).Error; err != nil {diff --git a/internal/permission/model_resources.go b/internal/permission/model_resources.goindex b026a552d2..ec8c6499b0 100644--- a/internal/permission/model_resources.go+++ b/internal/permission/model_resources.go@@ -119,11 +119,12 @@ func (s *databaseSource) tenantIDsForSubject(ctx context.Context, subject Subjecreturn uniqueStringValues(append(tenantIDs, subject.UserID)), nil}-func modelProviderResource(provider *entity.TenantModelProvider, ownerUserID string) Resource {+// modelProviderResource builds permission metadata for a model provider.+func modelProviderResource(provider *entity.TenantModelProvider) Resource {return Resource{Ref: ResourceRef{Kind: ResourceKindModelProvider, ID: provider.ID},TenantID: provider.TenantID,- OwnerUserID: ownerUserID,+ OwnerUserID: provider.UserID,Visibility: VisibilityTenant,TenantRequirement: TenantMember,OwnerOperations: []Operation{OperationRead, OperationCreate, OperationUpdate, OperationDelete},@@ -132,11 +133,12 @@ func modelProviderResource(provider *entity.TenantModelProvider, ownerUserID str}}-func modelInstanceResource(instance *entity.TenantModelInstance, provider *entity.TenantModelProvider, ownerUserID string) Resource {+// modelInstanceResource builds permission metadata for a model instance.+func modelInstanceResource(instance *entity.TenantModelInstance, provider *entity.TenantModelProvider) Resource {return Resource{Ref: ResourceRef{Kind: ResourceKindModelInstance, ID: instance.ID},TenantID: provider.TenantID,- OwnerUserID: ownerUserID,+ OwnerUserID: provider.UserID,Visibility: VisibilityTenant,TenantRequirement: TenantMember,OwnerOperations: []Operation{OperationRead, OperationCreate, OperationUpdate, OperationDelete, OperationUse},@@ -145,11 +147,12 @@ func modelInstanceResource(instance *entity.TenantModelInstance, provider *entit}}-func tenantModelResource(model *entity.TenantModel, provider *entity.TenantModelProvider, ownerUserID string) Resource {+// tenantModelResource builds permission metadata for a tenant model.+func tenantModelResource(model *entity.TenantModel, provider *entity.TenantModelProvider) Resource {return Resource{Ref: ResourceRef{Kind: ResourceKindModel, ID: model.ID},TenantID: provider.TenantID,- OwnerUserID: ownerUserID,+ OwnerUserID: provider.UserID,Visibility: VisibilityTenant,TenantRequirement: TenantMember,OwnerOperations: []Operation{OperationRead, OperationCreate, OperationUpdate, OperationDelete, OperationUse},diff --git a/internal/service/agent_deferred_failure_test.go b/internal/service/agent_deferred_failure_test.goindex 40c3df7384..56944ef7a8 100644--- a/internal/service/agent_deferred_failure_test.go+++ b/internal/service/agent_deferred_failure_test.go@@ -106,7 +106,7 @@ func TestRunAgent_DeferredAgentModelFailureStaysInChatStream(t *testing.T) {},"path": []any{"begin_0", "Agent:fail_0", "Message:fail_0"},}- dao.DB.Create(&entity.TenantModelProvider{ID: "prov-deferred-fail", ProviderName: "OpenAI-API-Compatible", TenantID: "tenant-1"})+ dao.DB.Create(&entity.TenantModelProvider{ID: "prov-deferred-fail", UserID: "user-1", ProviderName: "OpenAI-API-Compatible", TenantID: "tenant-1"})dao.DB.Create(&entity.TenantModelInstance{ID: "inst-deferred-fail", InstanceName: "unreachable", ProviderID: "prov-deferred-fail", APIKey: "test-key", Extra: `{"base_url": "http://127.0.0.1:59999/v1"}`})dao.DB.Create(&entity.TenantModel{ID: "unavailable-model", ModelName: "unavailable-model", ProviderID: "prov-deferred-fail", InstanceID: "inst-deferred-fail", ModelType: int(entity.ModelTypeChat), Status: "active", Extra: "{}"})makeCanvasWithDSL(t, "canvas-deferred-fail", "user-1", "tenant-1", "v-deferred-fail", dsl)diff --git a/internal/service/dataset/update_test.go b/internal/service/dataset/update_test.goindex 76ffaa8e53..5681d17e33 100644--- a/internal/service/dataset/update_test.go+++ b/internal/service/dataset/update_test.go@@ -1116,6 +1116,7 @@ func insertDatasetUpdateModelProvider(t *testing.T, id, tenantID, providerName sprovider := &entity.TenantModelProvider{ID: id,+ UserID: tenantID,TenantID: tenantID,ProviderName: providerName,}diff --git a/internal/service/model_service.go b/internal/service/model_service.goindex 8689012e6f..d7c8475b62 100644--- a/internal/service/model_service.go+++ b/internal/service/model_service.go@@ -117,6 +117,7 @@ func (m *ModelProviderService) AddModelProvider(ctx context.Context, providerNamtenantModelProvider := &entity.TenantModelProvider{ID: providerID,+ UserID: userID,ProviderName: providerName,TenantID: tenantID,}@@ -1393,11 +1394,11 @@ func (m *ModelProviderService) ListTenantAddedModels(ctx context.Context, userID// Mirror Python's ensure_*_from_env calls.if permission.NewDatabaseChecker(dao.DB).CheckTenant(ctx, permission.Subject{UserID: userID}, tenantID, permission.TenantOwner) == nil {- _ = m.ensureMineruFromEnv(ctx, tenantID)- _ = m.ensureMonkeyOCRv2FromEnv(ctx, tenantID)- _ = m.ensureMonkeyOCRFromEnv(ctx, tenantID)- _ = m.ensurePaddleOCREnabledFromEnv(ctx, tenantID)- _ = m.ensureOpenDataLoaderFromEnv(ctx, tenantID)+ _ = m.ensureMineruFromEnv(ctx, userID, tenantID)+ _ = m.ensureMonkeyOCRv2FromEnv(ctx, userID, tenantID)+ _ = m.ensureMonkeyOCRFromEnv(ctx, userID, tenantID)+ _ = m.ensurePaddleOCREnabledFromEnv(ctx, userID, tenantID)+ _ = m.ensureOpenDataLoaderFromEnv(ctx, userID, tenantID)}var modelTypeFilterBin entity.ModelType@@ -1653,31 +1654,31 @@ func (m *ModelProviderService) resolveModelListTenant(ctx context.Context, userI// ensureMineruFromEnv mirrors Python's ensure_mineru_from_env.// It ensures a MinerU OCR provider instance exists when env vars are configured.-func (m *ModelProviderService) ensureMineruFromEnv(ctx context.Context, tenantID string) error {+func (m *ModelProviderService) ensureMineruFromEnv(ctx context.Context, userID, tenantID string) error {config := collectEnvConfig(mineruEnvKeys, mineruDefaultConfig)- return m.ensureOCRProviderFromEnv(ctx, tenantID, "MinerU", "mineru-from-env", config)+ return m.ensureOCRProviderFromEnv(ctx, userID, tenantID, "MinerU", "mineru-from-env", config)}// ensurePaddleOCREnabledFromEnv mirrors Python's ensure_paddleocr_from_env.-func (m *ModelProviderService) ensurePaddleOCREnabledFromEnv(ctx context.Context, tenantID string) error {+func (m *ModelProviderService) ensurePaddleOCREnabledFromEnv(ctx context.Context, userID, tenantID string) error {config := collectEnvConfig(paddleOCREnvKeys, paddleOCRDefaultConfig)- return m.ensureOCRProviderFromEnv(ctx, tenantID, "PaddleOCR", "paddleocr-from-env", config)+ return m.ensureOCRProviderFromEnv(ctx, userID, tenantID, "PaddleOCR", "paddleocr-from-env", config)}// ensureOpenDataLoaderFromEnv mirrors Python's ensure_opendataloader_from_env.-func (m *ModelProviderService) ensureOpenDataLoaderFromEnv(ctx context.Context, tenantID string) error {+func (m *ModelProviderService) ensureOpenDataLoaderFromEnv(ctx context.Context, userID, tenantID string) error {config := collectEnvConfig(openDataLoaderEnvKeys, openDataLoaderDefaultConfig)- return m.ensureOCRProviderFromEnv(ctx, tenantID, "OpenDataLoader", "opendataloader-from-env", config)+ return m.ensureOCRProviderFromEnv(ctx, userID, tenantID, "OpenDataLoader", "opendataloader-from-env", config)}// ensureMonkeyOCRv2FromEnv mirrors Python's ensure_monkeyocrv2_from_env.-func (m *ModelProviderService) ensureMonkeyOCRv2FromEnv(ctx context.Context, tenantID string) error {+func (m *ModelProviderService) ensureMonkeyOCRv2FromEnv(ctx context.Context, userID, tenantID string) error {config := collectEnvConfig(monkeyOCRv2EnvKeys, monkeyOCRv2DefaultConfig)- return m.ensureOCRProviderFromEnv(ctx, tenantID, "MonkeyOCRv2", "monkeyocrv2-from-env", config)+ return m.ensureOCRProviderFromEnv(ctx, userID, tenantID, "MonkeyOCRv2", "monkeyocrv2-from-env", config)}// ensureMonkeyOCRFromEnv mirrors Python's ensure_monkeyocr_from_env.-func (m *ModelProviderService) ensureMonkeyOCRFromEnv(ctx context.Context, tenantID string) error {+func (m *ModelProviderService) ensureMonkeyOCRFromEnv(ctx context.Context, userID, tenantID string) error {config := collectEnvConfig(monkeyOCREnvKeys, monkeyOCRDefaultConfig)if config == nil {return nil@@ -1686,7 +1687,7 @@ func (m *ModelProviderService) ensureMonkeyOCRFromEnv(ctx context.Context, tenanif strings.TrimSpace(apiserver) == "" {return nil}- return m.ensureOCRProviderFromEnv(ctx, tenantID, "MonkeyOCR", "monkeyocr-from-env", config)+ return m.ensureOCRProviderFromEnv(ctx, userID, tenantID, "MonkeyOCR", "monkeyocr-from-env", config)}// Environment-key/default tables mirror the Python OCR provider settings.@@ -1771,7 +1772,7 @@ func collectEnvConfig(envKeys []string, defaultConfig map[string]interface{}) ma// ensureOCRProviderFromEnv mirrors Python's _ensure_ocr_provider_from_env.// It finds or creates a provider, instance, and model for the given OCR provider.-func (m *ModelProviderService) ensureOCRProviderFromEnv(ctx context.Context, tenantID, providerName, modelName string, config map[string]interface{}) error {+func (m *ModelProviderService) ensureOCRProviderFromEnv(ctx context.Context, userID, tenantID, providerName, modelName string, config map[string]interface{}) error {if config == nil {return nil}@@ -1785,6 +1786,7 @@ func (m *ModelProviderService) ensureOCRProviderFromEnv(ctx context.Context, tenproviderID := common.GenerateToken()provider = &entity.TenantModelProvider{ID: providerID,+ UserID: userID,TenantID: tenantID,ProviderName: providerName,}diff --git a/internal/service/model_service_test.go b/internal/service/model_service_test.goindex eb0109ef3c..67c67f0a57 100644--- a/internal/service/model_service_test.go+++ b/internal/service/model_service_test.go@@ -61,7 +61,7 @@ func TestEnsureMonkeyOCRFromEnvSkipsBlankAPIServer(t *testing.T) {t.Setenv(common.EnvMonkeyOCRAPIServer, "")svc := &ModelProviderService{}- if err := svc.ensureMonkeyOCRFromEnv(context.Background(), "tenant-id"); err != nil {+ if err := svc.ensureMonkeyOCRFromEnv(context.Background(), "user-id", "tenant-id"); err != nil {t.Fatalf("ensureMonkeyOCRFromEnv: %v", err)}}@@ -320,7 +320,7 @@ func seedModelProviderServiceScope(t *testing.T, db *gorm.DB) {activeStatus := "1"rows := []interface{}{&entity.UserTenant{ID: "user-tenant-1", UserID: "user-1", TenantID: "tenant-1", Role: "owner", InvitedBy: "user-1", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-1", TenantID: "tenant-1", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-1", UserID: "user-1", TenantID: "tenant-1", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-1", ProviderID: "provider-1", InstanceName: "default", APIKey: "sk-test", Status: "active", Extra: "{}"},&entity.TenantModel{ID: "model-1", ProviderID: "provider-1", InstanceID: "instance-1", ModelName: "gpt-test", ModelType: int(entity.ModelTypeChat), Status: "active"},}@@ -337,7 +337,7 @@ func TestBedrockAPIKeyInstancePersistsDiscoveredModelsWithoutRuntimeVerificationactiveStatus := "1"for _, row := range []interface{}{&entity.UserTenant{ID: "user-tenant-bedrock", UserID: "user-1", TenantID: "tenant-bedrock", Role: "owner", InvitedBy: "user-1", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-bedrock", TenantID: "tenant-bedrock", ProviderName: "Bedrock"},+ &entity.TenantModelProvider{ID: "provider-bedrock", UserID: "user-1", TenantID: "tenant-bedrock", ProviderName: "Bedrock"},} {if err := db.Create(row).Error; err != nil {t.Fatalf("failed to seed %T: %v", row, err)@@ -534,7 +534,7 @@ func TestListProvidersOfTenantExcludesOtherTenants(t *testing.T) {rows := []interface{}{&entity.UserTenant{ID: "user-tenant-owner-2", UserID: "owner-2", TenantID: "tenant-2", Role: string(permission.RoleOwner), InvitedBy: "owner-2", Status: &activeStatus},&entity.UserTenant{ID: "user-tenant-member-2", UserID: "user-1", TenantID: "tenant-2", Role: string(permission.RoleNormal), InvitedBy: "owner-2", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-2", TenantID: "tenant-2", ProviderName: "Anthropic"},+ &entity.TenantModelProvider{ID: "provider-2", UserID: "owner-2", TenantID: "tenant-2", ProviderName: "Anthropic"},}for _, row := range rows {if err := db.Create(row).Error; err != nil {@@ -559,7 +559,7 @@ func TestListProviderInstancesUsesOwnedTenantProvider(t *testing.T) {rows := []interface{}{&entity.UserTenant{ID: "user-tenant-owner-2", UserID: "owner-2", TenantID: "tenant-2", Role: string(permission.RoleOwner), InvitedBy: "owner-2", Status: &activeStatus},&entity.UserTenant{ID: "user-tenant-member-2", UserID: "user-1", TenantID: "tenant-2", Role: string(permission.RoleNormal), InvitedBy: "owner-2", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-2", TenantID: "tenant-2", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-2", UserID: "owner-2", TenantID: "tenant-2", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-2", ProviderID: "provider-2", InstanceName: "other-default", APIKey: "sk-other", Status: "active", Extra: "{}"},}for _, row := range rows {@@ -590,7 +590,7 @@ func TestProviderModelListingUsesOwnedTenant(t *testing.T) {rows := []interface{}{&entity.UserTenant{ID: "user-tenant-owner-2", UserID: "owner-2", TenantID: "tenant-2", Role: string(permission.RoleOwner), InvitedBy: "owner-2", Status: &activeStatus},&entity.UserTenant{ID: "user-tenant-member-2", UserID: "user-1", TenantID: "tenant-2", Role: string(permission.RoleNormal), InvitedBy: "owner-2", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-2", TenantID: "tenant-2", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-2", UserID: "owner-2", TenantID: "tenant-2", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-2", ProviderID: "provider-2", InstanceName: "default", APIKey: "sk-other", Status: "active", Extra: "{}"},&entity.TenantModel{ID: "model-2", ProviderID: "provider-2", InstanceID: "instance-2", ModelName: "foreign-model", ModelType: int(entity.ModelTypeChat), Status: "active"},}@@ -625,7 +625,7 @@ func TestShowProviderInstanceUsesOwnedTenantProvider(t *testing.T) {rows := []interface{}{&entity.UserTenant{ID: "user-tenant-owner-2", UserID: "owner-2", TenantID: "tenant-2", Role: string(permission.RoleOwner), InvitedBy: "owner-2", Status: &activeStatus},&entity.UserTenant{ID: "user-tenant-member-2", UserID: "user-1", TenantID: "tenant-2", Role: string(permission.RoleNormal), InvitedBy: "owner-2", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-2", TenantID: "tenant-2", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-2", UserID: "owner-2", TenantID: "tenant-2", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-2", ProviderID: "provider-2", InstanceName: "default", APIKey: "sk-other", Status: "active", Extra: "{}"},}for _, row := range rows {@@ -708,6 +708,7 @@ func TestModelProviderServiceMissingProviderAndInstancePreserveLookupError(t *teuseModelProviderServiceTestDB(t, db)if err := db.Create(&entity.TenantModelProvider{ID: "provider-1",+ UserID: "user-1",TenantID: "tenant-1",ProviderName: "OpenAI",}).Error; err != nil {@@ -1009,8 +1010,8 @@ func TestModelFactoryResolveModelConfigReportsToolSupport(t *testing.T) {activeStatus := "1"rows := []interface{}{&entity.UserTenant{ID: "ut-1", UserID: "tenant-1", TenantID: "tenant-1", Role: "owner", InvitedBy: "tenant-1", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-own", TenantID: "tenant-1", ProviderName: "OpenAI"},- &entity.TenantModelProvider{ID: "provider-other", TenantID: "tenant-2", ProviderName: "Anthropic"},+ &entity.TenantModelProvider{ID: "provider-own", UserID: "tenant-1", TenantID: "tenant-1", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-other", UserID: "owner-2", TenantID: "tenant-2", ProviderName: "Anthropic"},&entity.TenantModelInstance{ID: "instance-own", ProviderID: "provider-own", InstanceName: "default", APIKey: "sk-test", Status: "active", Extra: "{}"},&entity.TenantModelInstance{ID: "instance-other", ProviderID: "provider-other", InstanceName: "default", APIKey: "sk-test", Status: "active", Extra: "{}"},&entity.TenantModel{ID: "model-active", ProviderID: "provider-own", InstanceID: "instance-own", ModelName: "gpt-test", ModelType: int(entity.ModelTypeChat), Status: "active", Extra: `{"is_tools":true}`},@@ -1084,7 +1085,7 @@ func TestModelFactoryResolveModelConfigPrefersTenantToolFlag(t *testing.T) {db := setupModelProviderServiceTestDB(t)useModelProviderServiceTestDB(t, db)rows := []interface{}{- &entity.TenantModelProvider{ID: "provider-openai", TenantID: "tenant-1", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-openai", UserID: "tenant-1", TenantID: "tenant-1", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-openai", ProviderID: "provider-openai", InstanceName: "default", APIKey: "sk-test", Status: "active", Extra: "{}"},// Catalog says tools are supported; the tenant disabled them.&entity.TenantModel{ID: "model-on-off", ProviderID: "provider-openai", InstanceID: "instance-openai", ModelName: toolsOn, ModelType: int(entity.ModelTypeChat), Status: "active", Extra: `{"is_tools":false}`},@@ -1132,7 +1133,7 @@ func TestModelFactoryResolveModelConfigPropagatesLookupFailure(t *testing.T) {activeStatus := "1"rows := []interface{}{&entity.UserTenant{ID: "ut-1", UserID: "tenant-1", TenantID: "tenant-1", Role: "owner", InvitedBy: "tenant-1", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-1", TenantID: "tenant-1", ProviderName: "OpenAI"},+ &entity.TenantModelProvider{ID: "provider-1", UserID: "tenant-1", TenantID: "tenant-1", ProviderName: "OpenAI"},&entity.TenantModelInstance{ID: "instance-1", ProviderID: "provider-1", InstanceName: "default", APIKey: "sk-test", Status: "active", Extra: "{}"},&entity.TenantModel{ID: "model-1", ProviderID: "provider-1", InstanceID: "instance-1", ModelName: "gpt-test", ModelType: int(entity.ModelTypeChat), Status: "active", Extra: `{"is_tools":true}`},}diff --git a/internal/service/model_stored_provider_name_test.go b/internal/service/model_stored_provider_name_test.goindex 52c45fa7b7..244b49bbf5 100644--- a/internal/service/model_stored_provider_name_test.go+++ b/internal/service/model_stored_provider_name_test.go@@ -38,7 +38,7 @@ func seedStoredMistralOCRProvider(t *testing.T, db *gorm.DB) {activeStatus := "1"rows := []interface{}{&entity.UserTenant{ID: "user-tenant-1", UserID: "user-1", TenantID: "tenant-1", Role: "owner", InvitedBy: "user-1", Status: &activeStatus},- &entity.TenantModelProvider{ID: "provider-mistral-ocr", TenantID: "tenant-1", ProviderName: "Mistral OCR"},+ &entity.TenantModelProvider{ID: "provider-mistral-ocr", UserID: "user-1", TenantID: "tenant-1", ProviderName: "Mistral OCR"},&entity.TenantModelInstance{ID: "instance-mistral-ocr", ProviderID: "provider-mistral-ocr", InstanceName: "default", APIKey: mistralOCRStoredKey, Status: "active", Extra: "{}"},&entity.TenantModel{ID: "model-mistral-ocr", ProviderID: "provider-mistral-ocr", InstanceID: "instance-mistral-ocr", ModelName: "mistral-ocr-latest", ModelType: int(entity.ModelTypeOCR), Status: "active"},}@@ -148,7 +148,7 @@ func TestListProvidersOfTenantSkipsStoredMistralOCRProvider(t *testing.T) {db := setupModelProviderServiceTestDB(t)useModelProviderServiceTestDB(t, db)seedStoredMistralOCRProvider(t, db)- if err := db.Create(&entity.TenantModelProvider{ID: "provider-openai", TenantID: "tenant-1", ProviderName: "OpenAI"}).Error; err != nil {+ if err := db.Create(&entity.TenantModelProvider{ID: "provider-openai", UserID: "user-1", TenantID: "tenant-1", ProviderName: "OpenAI"}).Error; err != nil {t.Fatalf("create provider: %v", err)}