AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-15 11:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add default values for optional parameters in API tool and parser (#2491)

Browse Source
This commit is contained in:
Yeuoly 2024-02-20 16:07:43 +08:00 committed by GitHub
parent 20b932da97
commit 25957d917a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/core/tools/tool/api_tool.py
View File

@ -127,6 +127,8 @@ class ApiTool(Tool):
value = parameters[parameter['name']] value = parameters[parameter['name']]
elif parameter['required']: elif parameter['required']:
raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}") raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}")
else:
value = (parameter.get('schema', {}) or {}).get('default', '')
path_params[parameter['name']] = value path_params[parameter['name']] = value
elif parameter['in'] == 'query': elif parameter['in'] == 'query':
@ -135,6 +137,8 @@ class ApiTool(Tool):
value = parameters[parameter['name']] value = parameters[parameter['name']]
elif parameter['required']: elif parameter['required']:
raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}") raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}")
else:
value = (parameter.get('schema', {}) or {}).get('default', '')
params[parameter['name']] = value params[parameter['name']] = value
elif parameter['in'] == 'cookie': elif parameter['in'] == 'cookie':
@ -143,6 +147,8 @@ class ApiTool(Tool):
value = parameters[parameter['name']] value = parameters[parameter['name']]
elif parameter['required']: elif parameter['required']:
raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}") raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}")
else:
value = (parameter.get('schema', {}) or {}).get('default', '')
cookies[parameter['name']] = value cookies[parameter['name']] = value
elif parameter['in'] == 'header': elif parameter['in'] == 'header':
@ -151,6 +157,8 @@ class ApiTool(Tool):
value = parameters[parameter['name']] value = parameters[parameter['name']]
elif parameter['required']: elif parameter['required']:
raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}") raise ToolProviderCredentialValidationError(f"Missing required parameter {parameter['name']}")
else:
value = (parameter.get('schema', {}) or {}).get('default', '')
headers[parameter['name']] = value headers[parameter['name']] = value
# check if there is a request body and handle it # check if there is a request body and handle it

2
api/core/tools/utils/parser.py
View File

@ -60,7 +60,7 @@ class ApiBasedToolSchemaParser:
required=parameter.get('required', False), required=parameter.get('required', False),
form=ToolParameter.ToolParameterForm.LLM, form=ToolParameter.ToolParameterForm.LLM,
llm_description=parameter.get('description'), llm_description=parameter.get('description'),
default=parameter['default'] if 'default' in parameter else None, default=parameter['schema']['default'] if 'schema' in parameter and 'default' in parameter['schema'] else None,
)) ))
# create tool bundle # create tool bundle
# check if there is a request body # check if there is a request body