Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(api): resolve provider credential aliases (#42790)

林玮 (Jade Lin)6f636b2f491b
diff --git a/api/core/entities/provider_configuration.py b/api/core/entities/provider_configuration.py
index 3e72829a09b..4e5de53d86a 100644
--- a/api/core/entities/provider_configuration.py
+++ b/api/core/entities/provider_configuration.py
@@ -312,14 +312,10 @@ class ProviderConfiguration(BaseModel):
)
with Session(db.engine) as session:
- # Prefer the actual provider record name if exists (to handle aliased provider names)
- provider_record = self._get_provider_record(session)
- provider_name = provider_record.provider_name if provider_record else self.provider.provider
-
stmt = select(ProviderCredential).where(
ProviderCredential.id == credential_id,
ProviderCredential.tenant_id == self.tenant_id,
- ProviderCredential.provider_name == provider_name,
+ ProviderCredential.provider_name.in_(self._get_provider_names()),
)
credential = session.execute(stmt).scalar_one_or_none()
diff --git a/api/tests/unit_tests/core/test_provider_configuration.py b/api/tests/unit_tests/core/test_provider_configuration.py
index 905db39ddde..d9d7e70e244 100644
--- a/api/tests/unit_tests/core/test_provider_configuration.py
+++ b/api/tests/unit_tests/core/test_provider_configuration.py
@@ -292,6 +292,29 @@ class TestProviderConfiguration:
assert result == {"openai_api_key": "encrypted_key"}
+ @pytest.mark.parametrize("sqlite_session", [(Provider, ProviderCredential)], indirect=True)
+ def test_get_specific_provider_credential_with_mixed_provider_names(
+ self, monkeypatch: pytest.MonkeyPatch, provider_configuration, sqlite_session: Session
+ ):
+ provider_configuration.provider.provider = "langgenius/deepseek/deepseek"
+ credential = ProviderCredential(
+ tenant_id="test_tenant",
+ provider_name="langgenius/deepseek/deepseek",
+ credential_name="primary",
+ encrypted_config='{"api_key": "encrypted_key"}',
+ )
+ sqlite_session.add_all((Provider(tenant_id="test_tenant", provider_name="deepseek"), credential))
+ sqlite_session.commit()
+ monkeypatch.setattr(
+ provider_configuration_module,
+ "db",
+ SimpleNamespace(engine=sqlite_session.get_bind()),
+ )
+
+ result = provider_configuration._get_specific_provider_credential(credential.id)
+
+ assert result == {"api_key": "encrypted_key"}
+
@pytest.mark.parametrize("sqlite_session", [(Provider, ProviderCredential)], indirect=True)
def test_get_specific_provider_credential_not_found(
self, monkeypatch: pytest.MonkeyPatch, provider_configuration, sqlite_session: Session