youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-03 17:08:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: tool

Browse Source
This commit is contained in:
Yeuoly
2024-03-11 21:31:39 +08:00
parent d5b321af3f
commit 8dc4d122b9
3 changed files with 83 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/core/tools/tool_manager.py
View File

@ -315,8 +315,9 @@ class ToolManager:
for parameter in parameters:
# save tool parameter to tool entity memory
value = ToolManager._init_runtime_parameter(parameter, workflow_tool.tool_configurations)
runtime_parameters[parameter.name] = value
if parameter.form == ToolParameter.ToolParameterForm.FORM:
value = ToolManager._init_runtime_parameter(parameter, workflow_tool.tool_configurations)
runtime_parameters[parameter.name] = value
# decrypt runtime parameters
encryption_manager = ToolParameterConfigurationManager(
@ -325,7 +326,9 @@ class ToolManager:
provider_name=workflow_tool.provider_id,
provider_type=workflow_tool.provider_type,
)
runtime_parameters = encryption_manager.decrypt_tool_parameters(runtime_parameters)
if runtime_parameters:
runtime_parameters = encryption_manager.decrypt_tool_parameters(runtime_parameters)
tool_entity.runtime.runtime_parameters.update(runtime_parameters)
return tool_entity

11
api/core/workflow/nodes/tool/tool_node.py
View File

@ -29,7 +29,6 @@ class ToolNode(BaseNode):
# get parameters
parameters = self._generate_parameters(variable_pool, node_data)
# get tool runtime
try:
tool_runtime = ToolManager.get_workflow_tool_runtime(self.tenant_id, node_data, None)
@ -41,7 +40,6 @@ class ToolNode(BaseNode):
)
try:
# TODO: user_id
messages = tool_runtime.invoke(self.user_id, parameters)
except Exception as e:
return NodeRunResult(
@ -68,7 +66,7 @@ class ToolNode(BaseNode):
return {
k.variable:
k.value if k.variable_type == 'static' else
variable_pool.get_variable_value(k.value) if k.variable_type == 'selector' else ''
variable_pool.get_variable_value(k.value_selector) if k.variable_type == 'selector' else ''
for k in node_data.tool_parameters
}
@ -77,7 +75,12 @@ class ToolNode(BaseNode):
Convert ToolInvokeMessages into tuple[plain_text, files]
"""
# transform message and handle file storage
messages = ToolFileMessageTransformer.transform_tool_invoke_messages(messages)
messages = ToolFileMessageTransformer.transform_tool_invoke_messages(
messages=messages,
user_id=self.user_id,
tenant_id=self.tenant_id,
conversation_id='',
)
# extract plain text and files
files = self._extract_tool_response_binary(messages)
plain_text = self._extract_tool_response_text(messages)