yujunjun/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2025-11-29 12:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: only retrieval plugin-compatible providers when provider_name starts with langgenius (#15133)

Browse Source
This commit is contained in:
Yeuoly 2025-03-07 00:41:56 +08:00 committed by GitHub
parent b7583e95a5
commit 65da9425df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
api/core/entities/provider_configuration.py
View File

@ -187,18 +187,30 @@ class ProviderConfiguration(BaseModel):
:return: :return:
""" """
# get provider # get provider
provider_record = ( model_provider_id = ModelProviderID(self.provider.provider)
db.session.query(Provider) if model_provider_id.is_langgenius():
.filter( provider_record = (
Provider.tenant_id == self.tenant_id, db.session.query(Provider)
Provider.provider_type == ProviderType.CUSTOM.value, .filter(
or_( Provider.tenant_id == self.tenant_id,
Provider.provider_name == ModelProviderID(self.provider.provider).plugin_name, Provider.provider_type == ProviderType.CUSTOM.value,
Provider.provider_name == self.provider.provider, or_(
), Provider.provider_name == model_provider_id.provider_name,
Provider.provider_name == self.provider.provider,
),
)
.first()
)
else:
provider_record = (
db.session.query(Provider)
.filter(
Provider.tenant_id == self.tenant_id,
Provider.provider_type == ProviderType.CUSTOM.value,
Provider.provider_name == self.provider.provider,
)
.first()
) )
.first()
)
# Get provider credential secret variables # Get provider credential secret variables
provider_credential_secret_variables = self.extract_secret_variables( provider_credential_secret_variables = self.extract_secret_variables(

3
api/core/plugin/entities/plugin.py
View File

@ -164,6 +164,9 @@ class GenericProviderID:
self.organization, self.plugin_name, self.provider_name = value.split("/") self.organization, self.plugin_name, self.provider_name = value.split("/")
self.is_hardcoded = is_hardcoded self.is_hardcoded = is_hardcoded
def is_langgenius(self) -> bool:
return self.organization == "langgenius"
@property @property
def plugin_id(self) -> str: def plugin_id(self) -> str:
return f"{self.organization}/{self.plugin_name}" return f"{self.organization}/{self.plugin_name}"