AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 19:49:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: check empty tool provider credentials (#2332)

Browse Source
This commit is contained in:
Yeuoly 2024-02-01 13:13:28 +08:00 committed by GitHub
parent ef308fd121
commit 07dd8b94ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/core/tools/provider/builtin_tool_provider.py
View File

@ -231,25 +231,26 @@ class BuiltinToolProviderController(ToolProviderController):
if credential_schema == ToolProviderCredentials.CredentialsType.SECRET_INPUT or \ if credential_schema == ToolProviderCredentials.CredentialsType.SECRET_INPUT or \
credential_schema == ToolProviderCredentials.CredentialsType.TEXT_INPUT: credential_schema == ToolProviderCredentials.CredentialsType.TEXT_INPUT:
if not isinstance(credentials[credential_name], str): if not isinstance(credentials[credential_name], str):
raise ToolProviderCredentialValidationError(f'credential {credential_name} should be string') raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be string')
elif credential_schema.type == ToolProviderCredentials.CredentialsType.SELECT: elif credential_schema.type == ToolProviderCredentials.CredentialsType.SELECT:
if not isinstance(credentials[credential_name], str): if not isinstance(credentials[credential_name], str):
raise ToolProviderCredentialValidationError(f'credential {credential_name} should be string') raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be string')
options = credential_schema.options options = credential_schema.options
if not isinstance(options, list): if not isinstance(options, list):
raise ToolProviderCredentialValidationError(f'credential {credential_name} options should be list') raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} options should be list')
if credentials[credential_name] not in [x.value for x in options]: if credentials[credential_name] not in [x.value for x in options]:
raise ToolProviderCredentialValidationError(f'credential {credential_name} should be one of {options}') raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} should be one of {options}')
credentials_need_to_validate.pop(credential_name) if credentials[credential_name]:
credentials_need_to_validate.pop(credential_name)
for credential_name in credentials_need_to_validate: for credential_name in credentials_need_to_validate:
credential_schema = credentials_need_to_validate[credential_name] credential_schema = credentials_need_to_validate[credential_name]
if credential_schema.required: if credential_schema.required:
raise ToolProviderCredentialValidationError(f'credential {credential_name} is required') raise ToolProviderCredentialValidationError(f'credential {credential_schema.label.en_US} is required')
# the credential is not set currently, set the default value if needed # the credential is not set currently, set the default value if needed
if credential_schema.default is not None: if credential_schema.default is not None: