Skip to content

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

fix: resolve provider aliases for extractor models (#19824)

buua436563a108dd424
diff --git a/internal/entity/models/get_driver.go b/internal/entity/models/get_driver.go
index e6d22da31b..7fb7fef246 100644
--- a/internal/entity/models/get_driver.go
+++ b/internal/entity/models/get_driver.go
@@ -46,6 +46,20 @@ func GetPreconfiguredDriver(driver string, baseURLOverride string) (ModelDriver,
return nil, fmt.Errorf("provider manager not initialized")
}
provider := pm.FindProvider(driver)
+ if provider == nil || provider.ModelDriver == nil {
+ // Some drivers expose a short runtime name that differs from the
+ // provider name in conf/models. For example, the Zhipu provider is
+ // configured as "ZHIPU-AI" while its driver name is "zhipu".
+ // Match the registered driver name as a fallback so callers that
+ // already resolved a ModelDriver can safely use its name here.
+ for i := range pm.Providers {
+ candidate := &pm.Providers[i]
+ if candidate.ModelDriver != nil && strings.EqualFold(candidate.ModelDriver.Name(), driver) {
+ provider = candidate
+ break
+ }
+ }
+ }
if provider == nil || provider.ModelDriver == nil {
return nil, fmt.Errorf("provider %q is not configured", driver)
}
diff --git a/internal/entity/models/get_driver_test.go b/internal/entity/models/get_driver_test.go
index 29c1d8a262..5f78a1258c 100644
--- a/internal/entity/models/get_driver_test.go
+++ b/internal/entity/models/get_driver_test.go
@@ -41,6 +41,23 @@ func TestGetPreconfiguredDriverReturnsPreBuiltDriver(t *testing.T) {
}
}
+func TestGetPreconfiguredDriverMatchesRuntimeDriverName(t *testing.T) {
+ dir, restore := setupProviderTestDir(t, "zhipu-ai.json")
+ defer restore()
+
+ if err := InitProviderManager(dir); err != nil {
+ t.Fatalf("InitProviderManager: %v", err)
+ }
+
+ driver, err := GetPreconfiguredDriver("zhipu", "")
+ if err != nil {
+ t.Fatalf("GetPreconfiguredDriver: %v", err)
+ }
+ if _, ok := driver.(*ZhipuAIModel); !ok {
+ t.Fatalf("GetPreconfiguredDriver returned %T, want *ZhipuAIModel", driver)
+ }
+}
+
func TestGetPreconfiguredDriverWithBaseURLOverride(t *testing.T) {
dir, restore := setupProviderTestDir(t, "aliyun.json")
defer restore()