opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-06-16 22:11:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace isinstance chains with match-case (#24487) (#37482)

Browse Source
This commit is contained in:
Evan 2026-06-16 12:41:31 +08:00 committed by GitHub
parent 1b2d397fc9
commit a605e7f11e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/core/plugin/utils/converter.py
View File

@ -6,16 +6,13 @@ from graphon.file import File
def convert_parameters_to_plugin_format(parameters: dict[str, Any]) -> dict[str, Any]:
for parameter_name, parameter in parameters.items():
if isinstance(parameter, File):
parameters[parameter_name] = parameter.to_plugin_parameter()
elif isinstance(parameter, list) and all(isinstance(p, File) for p in parameter):
parameters[parameter_name] = []
for p in parameter:
parameters[parameter_name].append(p.to_plugin_parameter())
elif isinstance(parameter, ToolSelector):
parameters[parameter_name] = parameter.to_plugin_parameter()
elif isinstance(parameter, list) and all(isinstance(p, ToolSelector) for p in parameter):
parameters[parameter_name] = []
for p in parameter:
parameters[parameter_name].append(p.to_plugin_parameter())
match parameter:
case File():
parameters[parameter_name] = parameter.to_plugin_parameter()
case [*items] if all(isinstance(p, File) for p in items):
parameters[parameter_name] = [p.to_plugin_parameter() for p in items]
case ToolSelector():
parameters[parameter_name] = parameter.to_plugin_parameter()
case [*items] if all(isinstance(p, ToolSelector) for p in items):
parameters[parameter_name] = [p.to_plugin_parameter() for p in items]
return parameters

21
api/core/tools/__base/tool.py
View File

@ -66,20 +66,21 @@ class Tool(ABC):
message_id=message_id,
)
if isinstance(result, ToolInvokeMessage):
match result:
case ToolInvokeMessage():
def single_generator() -> Generator[ToolInvokeMessage, None, None]:
yield result
def single_generator() -> Generator[ToolInvokeMessage, None, None]:
yield result
return single_generator()
elif isinstance(result, list):
return single_generator()
case list():
def generator() -> Generator[ToolInvokeMessage, None, None]:
yield from result
def generator() -> Generator[ToolInvokeMessage, None, None]:
yield from result
return generator()
else:
return result
return generator()
case _:
return result
def _transform_tool_parameters_type(self, tool_parameters: dict[str, Any]) -> dict[str, Any]:
"""