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
fix(go): sort provider model instances by creation time (#18684)
euvre7ebeadf7107f
diff --git a/internal/dao/tenant_model_instance.go b/internal/dao/tenant_model_instance.goindex 0a0cfc70f7..61803afdd0 100644--- a/internal/dao/tenant_model_instance.go+++ b/internal/dao/tenant_model_instance.go@@ -55,7 +55,10 @@ func (dao *TenantModelInstanceDAO) Create(ctx context.Context, db *gorm.DB, instfunc (dao *TenantModelInstanceDAO) GetAllInstancesByProviderID(ctx context.Context, db *gorm.DB, providerID string) ([]*entity.TenantModelInstance, error) {var instances []*entity.TenantModelInstance- err := db.WithContext(ctx).Where("provider_id = ?", providerID).Find(&instances).Error+ // Newest instance first. Mirrors Python's provider_api_service+ // list_provider_instances, which sorts by create_time desc so the list+ // follows creation order instead of the random-token primary key order.+ err := db.WithContext(ctx).Where("provider_id = ?", providerID).Order("create_time DESC").Find(&instances).Errorif err != nil {return nil, err}diff --git a/internal/dao/tenant_model_instance_test.go b/internal/dao/tenant_model_instance_test.gonew file mode 100644index 0000000000..bb69b776af--- /dev/null+++ b/internal/dao/tenant_model_instance_test.go@@ -0,0 +1,67 @@+package dao++import (+ "slices"+ "testing"++ "github.com/glebarez/sqlite"+ "gorm.io/gorm"++ "ragflow/internal/entity"+)++func setupTenantModelInstanceDAOTestDB(t *testing.T) *gorm.DB {+ t.Helper()+ db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{TranslateError: true})+ if err != nil {+ t.Fatalf("failed to open sqlite: %v", err)+ }+ if err = db.AutoMigrate(&entity.TenantModelInstance{}); err != nil {+ t.Fatalf("failed to migrate tenant_model_instance: %v", err)+ }+ return db+}++func seedTenantModelInstance(t *testing.T, db *gorm.DB, instance *entity.TenantModelInstance) {+ t.Helper()+ if err := db.Create(instance).Error; err != nil {+ t.Fatalf("failed to seed tenant model instance: %v", err)+ }+}++// The random-token primary keys make the storage order unrelated to creation+// time, so the DAO must sort by create_time explicitly (mirroring Python's+// list_provider_instances).+func TestTenantModelInstanceDAOGetAllInstancesByProviderIDOrdersByCreateTimeDesc(t *testing.T) {+ db := setupTenantModelInstanceDAOTestDB(t)++ mkTime := func(v int64) *int64 { return &v }+ // Inserted so that primary-key order differs from creation order.+ seedTenantModelInstance(t, db, &entity.TenantModelInstance{ID: "c-instance-middle", InstanceName: "middle", ProviderID: "provider-1", APIKey: "k", BaseModel: entity.BaseModel{CreateTime: mkTime(2000)}})+ seedTenantModelInstance(t, db, &entity.TenantModelInstance{ID: "a-instance-oldest", InstanceName: "oldest", ProviderID: "provider-1", APIKey: "k", BaseModel: entity.BaseModel{CreateTime: mkTime(1000)}})+ seedTenantModelInstance(t, db, &entity.TenantModelInstance{ID: "b-instance-newest", InstanceName: "newest", ProviderID: "provider-1", APIKey: "k", BaseModel: entity.BaseModel{CreateTime: mkTime(3000)}})+ seedTenantModelInstance(t, db, &entity.TenantModelInstance{ID: "d-other-provider", InstanceName: "other", ProviderID: "provider-2", APIKey: "k", BaseModel: entity.BaseModel{CreateTime: mkTime(4000)}})++ instances, err := NewTenantModelInstanceDAO().GetAllInstancesByProviderID(t.Context(), db, "provider-1")+ if err != nil {+ t.Fatalf("failed to list instances: %v", err)+ }++ var names []string+ for _, instance := range instances {+ names = append(names, instance.InstanceName)+ }+ // Pin the provider filter explicitly: the provider-2 row must be absent.+ if slices.Contains(names, "other") {+ t.Fatalf("expected only provider-1 instances, got %v", names)+ }+ want := []string{"newest", "middle", "oldest"}+ if len(names) != len(want) {+ t.Fatalf("expected %d instances, got %v", len(want), names)+ }+ for i := range want {+ if names[i] != want[i] {+ t.Fatalf("expected instance order %v, got %v", want, names)+ }+ }+}