jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: transform None into correct dest type (#4077)

Browse source
This commit is contained in:
Yeuoly 2024-05-04 16:34:42 +08:00 • committed by GitHub
commit b5f101bdac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/core/tools/tool/tool.py
View file

@ -233,6 +233,9 @@ class Tool(BaseModel, ABC):
ToolParameter.ToolParameterType.STRING, ToolParameter.ToolParameterType.STRING,
ToolParameter.ToolParameterType.SELECT, ToolParameter.ToolParameterType.SELECT,
] and not isinstance(tool_parameters[parameter.name], str): ] and not isinstance(tool_parameters[parameter.name], str):
if tool_parameters[parameter.name] is None:
tool_parameters[parameter.name] = ''
else:
tool_parameters[parameter.name] = str(tool_parameters[parameter.name]) tool_parameters[parameter.name] = str(tool_parameters[parameter.name])
elif parameter.type == ToolParameter.ToolParameterType.NUMBER \ elif parameter.type == ToolParameter.ToolParameterType.NUMBER \
and not isinstance(tool_parameters[parameter.name], int | float): and not isinstance(tool_parameters[parameter.name], int | float):
@ -241,6 +244,10 @@ class Tool(BaseModel, ABC):
tool_parameters[parameter.name] = int(tool_parameters[parameter.name]) tool_parameters[parameter.name] = int(tool_parameters[parameter.name])
except ValueError: except ValueError:
tool_parameters[parameter.name] = float(tool_parameters[parameter.name]) tool_parameters[parameter.name] = float(tool_parameters[parameter.name])
elif isinstance(tool_parameters[parameter.name], bool):
tool_parameters[parameter.name] = int(tool_parameters[parameter.name])
elif tool_parameters[parameter.name] is None:
tool_parameters[parameter.name] = 0
elif parameter.type == ToolParameter.ToolParameterType.BOOLEAN: elif parameter.type == ToolParameter.ToolParameterType.BOOLEAN:
if not isinstance(tool_parameters[parameter.name], bool): if not isinstance(tool_parameters[parameter.name], bool):
# check if it is a string # check if it is a string