Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

refa: remove NVIDIA model list reconciliation (#20301)

buua436e4d13ac1ac90
diff --git a/internal/service/model_service.go b/internal/service/model_service.go
index cec60d5733..f1dd8583a4 100644
--- a/internal/service/model_service.go
+++ b/internal/service/model_service.go
@@ -412,12 +412,6 @@ func (m *ModelProviderService) ListSupportedModels(ctx context.Context, provider
if err != nil {
return nil, err
}
- if strings.EqualFold(provider.ProviderName, "NVIDIA") {
- if err = m.reconcileNvidiaInstanceModels(ctx, dao.DB, provider, instance, modelList); err != nil {
- return nil, err
- }
- }
-
var result []map[string]interface{}
for _, model := range modelList {
result = append(result, map[string]interface{}{
@@ -434,125 +428,6 @@ func (m *ModelProviderService) ListSupportedModels(ctx context.Context, provider
return result, nil
}
-func (m *ModelProviderService) reconcileNvidiaInstanceModels(
- ctx context.Context,
- db *gorm.DB,
- provider *entity.TenantModelProvider,
- instance *entity.TenantModelInstance,
- remoteModels []modelModule.ListModelResponse,
-) error {
- if provider == nil || instance == nil || provider.ID == "" || instance.ID == "" || instance.ProviderID != provider.ID {
- return errors.New("invalid NVIDIA provider instance scope")
- }
-
- normalized := make([]modelModule.ListModelResponse, 0, len(remoteModels))
- seen := make(map[string]struct{}, len(remoteModels))
- for _, remote := range remoteModels {
- remote.Name = strings.TrimSpace(remote.Name)
- if remote.Name == "" {
- continue
- }
- if _, ok := seen[remote.Name]; ok {
- continue
- }
- seen[remote.Name] = struct{}{}
- if len(remote.ModelTypes) == 0 {
- remote.ModelTypes = modelModule.InferModelTypes(remote.Name)
- }
- normalized = append(normalized, remote)
- }
- if len(normalized) == 0 {
- return errors.New("NVIDIA model discovery returned no usable models")
- }
-
- return db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
- existingModels, err := m.modelDAO.GetModelsByInstanceID(ctx, tx, instance.ID)
- if err != nil {
- return err
- }
- existingByName := make(map[string]*entity.TenantModel, len(existingModels))
- for _, existing := range existingModels {
- existingByName[existing.ModelName] = existing
- }
-
- for _, remote := range normalized {
- maxTokens := 8192
- if remote.MaxOutput != nil && *remote.MaxOutput > 0 {
- maxTokens = *remote.MaxOutput
- }
- modelType := int(entity.ModelTypeFromStrings(remote.ModelTypes))
-
- if existing, ok := existingByName[remote.Name]; ok {
- extra := make(map[string]interface{})
- if existing.Extra != "" {
- if err := json.Unmarshal([]byte(existing.Extra), &extra); err != nil {
- return fmt.Errorf("decode metadata for NVIDIA model %q: %w", remote.Name, err)
- }
- }
- setDiscoveredModelMetadata(extra, remote, maxTokens)
- extraBytes, err := json.Marshal(extra)
- if err != nil {
- return fmt.Errorf("encode metadata for NVIDIA model %q: %w", remote.Name, err)
- }
- if err = m.modelDAO.UpdateByID(ctx, tx, existing.ID, map[string]interface{}{
- "model_type": modelType,
- "extra": string(extraBytes),
- }); err != nil {
- return err
- }
- delete(existingByName, remote.Name)
- continue
- }
-
- extra := map[string]interface{}{"verify": entity.ModelVerifyUnknown}
- setDiscoveredModelMetadata(extra, remote, maxTokens)
- extraBytes, err := json.Marshal(extra)
- if err != nil {
- return fmt.Errorf("encode metadata for NVIDIA model %q: %w", remote.Name, err)
- }
- if err = m.modelDAO.Create(ctx, tx, &entity.TenantModel{
- ID: utility.GenerateToken(),
- ModelName: remote.Name,
- ModelType: modelType,
- ProviderID: provider.ID,
- InstanceID: instance.ID,
- Status: "active",
- Extra: string(extraBytes),
- }); err != nil {
- return err
- }
- }
-
- staleIDs := make([]string, 0, len(existingByName))
- for _, stale := range existingByName {
- staleIDs = append(staleIDs, stale.ID)
- }
- if len(staleIDs) > 0 {
- if _, err := m.modelDAO.DeleteByIDs(ctx, tx, staleIDs); err != nil {
- return err
- }
- }
- return nil
- })
-}
-
-func setDiscoveredModelMetadata(extra map[string]interface{}, model modelModule.ListModelResponse, maxTokens int) {
- extra["max_tokens"] = maxTokens
- if model.MaxDimension != nil {
- extra["max_dimension"] = *model.MaxDimension
- }
- if model.MaxBatchSize != nil {
- extra["max_batch_size"] = *model.MaxBatchSize
- }
- if len(model.Dimensions) > 0 {
- extra["dimensions"] = model.Dimensions
- }
- if model.Thinking != nil {
- extra["thinking"] = model.Thinking.DefaultValue
- extra["clear_thinking"] = model.Thinking.ClearThinking
- }
-}
-
type CreateInstanceModelInfo struct {
ModelName string `json:"model_name"`
ModelTypes []string `json:"model_type"`
diff --git a/internal/service/model_service_test.go b/internal/service/model_service_test.go
index f5b89b058e..bc6a0bc96b 100644
--- a/internal/service/model_service_test.go
+++ b/internal/service/model_service_test.go
@@ -613,144 +613,6 @@ func TestModelProviderServiceAlterModelRejectsWrongScopedModelID(t *testing.T) {
}
}
-func TestReconcileNvidiaInstanceModelsAddsUpdatesAndDeletes(t *testing.T) {
- db := setupModelProviderServiceTestDB(t)
- provider := &entity.TenantModelProvider{ID: "provider-nvidia", TenantID: "tenant-1", ProviderName: "NVIDIA"}
- instance := &entity.TenantModelInstance{ID: "instance-nvidia", ProviderID: provider.ID, InstanceName: "default", APIKey: "nvapi-test", Status: "active", Extra: "{}"}
- rows := []interface{}{
- provider,
- instance,
- &entity.TenantModel{
- ID: "keep-id",
- ProviderID: provider.ID,
- InstanceID: instance.ID,
- ModelName: "nvidia/keep",
- ModelType: int(entity.ModelTypeChat),
- Status: "inactive",
- Extra: `{"max_tokens":4096,"verify":"success","custom":"preserved"}`,
- },
- &entity.TenantModel{
- ID: "stale-id",
- ProviderID: provider.ID,
- InstanceID: instance.ID,
- ModelName: "nvidia/stale",
- ModelType: int(entity.ModelTypeChat),
- Status: "active",
- Extra: `{}`,
- },
- }
- for _, row := range rows {
- if err := db.Create(row).Error; err != nil {
- t.Fatalf("seed %T: %v", row, err)
- }
- }
-
- maxTokens := 131072
- maxDimension := 2048
- remote := []modelModule.ListModelResponse{
- {Name: "nvidia/keep", MaxOutput: &maxTokens, ModelTypes: []string{"chat", "vision"}},
- {Name: "nvidia/new-embed", MaxOutput: ptrService(8192), MaxDimension: &maxDimension, Dimensions: []int{1024, 2048}, ModelTypes: []string{"embedding"}},
- }
-
- err := NewModelProviderService().reconcileNvidiaInstanceModels(t.Context(), db, provider, instance, remote)
- if err != nil {
- t.Fatalf("reconcileNvidiaInstanceModels() error = %v", err)
- }
-
- var got []*entity.TenantModel
- if err = db.Order("model_name").Find(&got).Error; err != nil {
- t.Fatalf("list models: %v", err)
- }
- if len(got) != 2 || got[0].ModelName != "nvidia/keep" || got[1].ModelName != "nvidia/new-embed" {
- t.Fatalf("models = %#v, want keep and new", got)
- }
- if got[0].ID != "keep-id" || got[0].Status != "inactive" {
- t.Fatalf("retained model identity/status = %q/%q", got[0].ID, got[0].Status)
- }
- if got[0].ModelType != int(entity.ModelTypeChat|entity.ModelTypeImage2Text) {
- t.Fatalf("retained model type = %d", got[0].ModelType)
- }
- var keepExtra map[string]interface{}
- if err := json.Unmarshal([]byte(got[0].Extra), &keepExtra); err != nil {
- t.Fatalf("decode retained extra: %v", err)
- }
- if keepExtra["custom"] != "preserved" || keepExtra["verify"] != "success" || int(keepExtra["max_tokens"].(float64)) != maxTokens {
- t.Fatalf("retained extra = %#v", keepExtra)
- }
- var newExtra map[string]interface{}
- if err := json.Unmarshal([]byte(got[1].Extra), &newExtra); err != nil {
- t.Fatalf("decode new extra: %v", err)
- }
- if newExtra["verify"] != entity.ModelVerifyUnknown || int(newExtra["max_dimension"].(float64)) != maxDimension {
- t.Fatalf("new extra = %#v", newExtra)
- }
-}
-
-func TestReconcileNvidiaInstanceModelsRejectsEmptyDiscoveryWithoutMutation(t *testing.T) {
- db := setupModelProviderServiceTestDB(t)
- provider := &entity.TenantModelProvider{ID: "provider-nvidia", TenantID: "tenant-1", ProviderName: "NVIDIA"}
- instance := &entity.TenantModelInstance{ID: "instance-nvidia", ProviderID: provider.ID, InstanceName: "default", Status: "active", Extra: "{}"}
- existing := &entity.TenantModel{ID: "keep-id", ProviderID: provider.ID, InstanceID: instance.ID, ModelName: "nvidia/keep", ModelType: int(entity.ModelTypeChat), Status: "active", Extra: "{}"}
- for _, row := range []interface{}{provider, instance, existing} {
- if err := db.Create(row).Error; err != nil {
- t.Fatalf("seed %T: %v", row, err)
- }
- }
-
- err := NewModelProviderService().reconcileNvidiaInstanceModels(t.Context(), db, provider, instance, nil)
- if err == nil {
- t.Fatal("reconcileNvidiaInstanceModels() error = nil, want empty discovery error")
- }
- var count int64
- if err := db.Model(&entity.TenantModel{}).Where("id = ?", existing.ID).Count(&count).Error; err != nil {
- t.Fatalf("count retained model: %v", err)
- }
- if count != 1 {
- t.Fatalf("retained model count = %d, want 1", count)
- }
-}
-
-func TestReconcileNvidiaInstanceModelsRollsBackPartialRefresh(t *testing.T) {
- db := setupModelProviderServiceTestDB(t)
- provider := &entity.TenantModelProvider{ID: "provider-nvidia", TenantID: "tenant-1", ProviderName: "NVIDIA"}
- instance := &entity.TenantModelInstance{ID: "instance-nvidia", ProviderID: provider.ID, InstanceName: "default", Status: "active", Extra: "{}"}
- existing := &entity.TenantModel{
- ID: "keep-id",
- ProviderID: provider.ID,
- InstanceID: instance.ID,
- ModelName: "nvidia/keep",
- ModelType: int(entity.ModelTypeChat),
- Status: "active",
- Extra: "{invalid-json",
- }
- for _, row := range []interface{}{provider, instance, existing} {
- if err := db.Create(row).Error; err != nil {
- t.Fatalf("seed %T: %v", row, err)
- }
- }
-
- remote := []modelModule.ListModelResponse{
- {Name: "nvidia/new", ModelTypes: []string{"chat"}},
- {Name: "nvidia/keep", ModelTypes: []string{"chat"}},
- }
- err := NewModelProviderService().reconcileNvidiaInstanceModels(t.Context(), db, provider, instance, remote)
- if err == nil {
- t.Fatal("reconcileNvidiaInstanceModels() error = nil, want metadata error")
- }
-
- var got []*entity.TenantModel
- if err := db.Order("model_name").Find(&got).Error; err != nil {
- t.Fatalf("list models: %v", err)
- }
- if len(got) != 1 || got[0].ID != existing.ID {
- t.Fatalf("models after rollback = %#v, want only original model", got)
- }
-}
-
-func ptrService[T any](value T) *T {
- return &value
-}
-
func TestParseModelName(t *testing.T) {
tests := []struct {
name string