opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-28 20:17:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
hjlarry 2025-09-12 10:43:15 +08:00
parent 02852ee543
commit 9d75d3d04c
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/controllers/console/workspace/model_providers.py
View File

@ -189,8 +189,8 @@ class ModelProviderCredentialCancelApi(Resource):
provider=provider, provider=provider,
) )
return {"result": "success"} return {"result": "success"}
class ModelProviderValidateApi(Resource): class ModelProviderValidateApi(Resource):
@setup_required @setup_required
@login_required @login_required

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

@ -190,7 +190,7 @@ class ProviderConfiguration(BaseModel):
if current_quota_configuration.is_valid if current_quota_configuration.is_valid
else SystemConfigurationStatus.QUOTA_EXCEEDED else SystemConfigurationStatus.QUOTA_EXCEEDED
) )
def get_custom_configuration_status(self) -> Optional[CustomConfigurationStatus]: def get_custom_configuration_status(self) -> Optional[CustomConfigurationStatus]:
""" """
Get custom configuration status. Get custom configuration status.
@ -198,8 +198,12 @@ class ProviderConfiguration(BaseModel):
""" """
if not self.is_custom_configuration_available(): if not self.is_custom_configuration_available():
return CustomConfigurationStatus.NO_CONFIGURE return CustomConfigurationStatus.NO_CONFIGURE
elif self.custom_configuration.provider.current_credential_status:
return self.custom_configuration.provider.current_credential_status provider = self.custom_configuration.provider
if provider and hasattr(provider, "current_credential_status"):
status = provider.current_credential_status
if status:
return status
return CustomConfigurationStatus.ACTIVE return CustomConfigurationStatus.ACTIVE

7
api/models/provider.py
View File

@ -40,7 +40,8 @@ class ProviderQuotaType(Enum):
if member.value == value: if member.value == value:
return member return member
raise ValueError(f"No matching enum found for value '{value}'") raise ValueError(f"No matching enum found for value '{value}'")
class CredentialStatus(StrEnum): class CredentialStatus(StrEnum):
ACTIVE = "active" ACTIVE = "active"
CANCELED = "canceled" CANCELED = "canceled"
@ -71,8 +72,8 @@ class Provider(Base):
last_used: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True) last_used: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True)
credential_id: Mapped[Optional[str]] = mapped_column(StringUUID, nullable=True) credential_id: Mapped[Optional[str]] = mapped_column(StringUUID, nullable=True)
credential_status: Mapped[Optional[str]] = mapped_column( credential_status: Mapped[Optional[str]] = mapped_column(
String(20), nullable=True, server_default=text("'active'::character varying") String(20), nullable=True, server_default=text("'active'::character varying")
) )
quota_type: Mapped[Optional[str]] = mapped_column( quota_type: Mapped[Optional[str]] = mapped_column(
String(40), nullable=True, server_default=text("''::character varying") String(40), nullable=True, server_default=text("''::character varying")