opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-28 20:17:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: test

Browse Source
This commit is contained in:
Yeuoly 2024-04-01 17:07:09 +08:00
parent 51f225e567
commit 75e95e09d3
No known key found for this signature in database
GPG Key ID: A66E7E320FB19F61
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/workflow/nodes/tool/entities.py
View File

@ -16,8 +16,8 @@ class ToolEntity(BaseModel):
class ToolNodeData(BaseNodeData, ToolEntity): class ToolNodeData(BaseNodeData, ToolEntity):
class ToolInput(BaseModel): class ToolInput(BaseModel):
type: Literal['mixed', 'variable', 'constant']
value: Union[ToolParameterValue, list[str]] value: Union[ToolParameterValue, list[str]]
type: Literal['mixed', 'variable', 'constant']
@validator('type', pre=True, always=True) @validator('type', pre=True, always=True)
def check_type(cls, value, values): def check_type(cls, value, values):
@ -29,7 +29,7 @@ class ToolNodeData(BaseNodeData, ToolEntity):
raise ValueError('value must be a list') raise ValueError('value must be a list')
elif typ == 'constant' and not isinstance(value, ToolParameterValue): elif typ == 'constant' and not isinstance(value, ToolParameterValue):
raise ValueError('value must be a string, int, float, or bool') raise ValueError('value must be a string, int, float, or bool')
return value return typ
""" """
Tool Node Schema Tool Node Schema

54
api/tests/integration_tests/workflow/nodes/test_tool.py
View File

@ -4,7 +4,7 @@ from core.workflow.entities.variable_pool import VariablePool
from core.workflow.nodes.tool.tool_node import ToolNode from core.workflow.nodes.tool.tool_node import ToolNode
from models.workflow import WorkflowNodeExecutionStatus from models.workflow import WorkflowNodeExecutionStatus
def test_tool_invoke(): def test_tool_variable_invoke():
pool = VariablePool(system_variables={}, user_inputs={}) pool = VariablePool(system_variables={}, user_inputs={})
pool.append_variable(node_id='1', variable_key_list=['123', 'args1'], value='1+1') pool.append_variable(node_id='1', variable_key_list=['123', 'args1'], value='1+1')
@ -25,14 +25,50 @@ def test_tool_invoke():
'tool_name': 'eval_expression', 'tool_name': 'eval_expression',
'tool_label': 'eval_expression', 'tool_label': 'eval_expression',
'tool_configurations': {}, 'tool_configurations': {},
'tool_parameters': [ 'tool_parameters': {
{ 'expression': {
'value_type': 'variable', 'type': 'variable',
'static_value': None, 'value': ['1', '123', 'args1'],
'variable_value': ['1', '123', 'args1'], }
'parameter_name': 'expression', }
}, }
] }
)
# execute node
result = node.run(pool)
assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
assert '2' in result.outputs['text']
assert result.outputs['files'] == []
def test_tool_mixed_invoke():
pool = VariablePool(system_variables={}, user_inputs={})
pool.append_variable(node_id='1', variable_key_list=['args1'], value='1+1')
node = ToolNode(
tenant_id='1',
app_id='1',
workflow_id='1',
user_id='1',
user_from=InvokeFrom.WEB_APP,
config={
'id': '1',
'data': {
'title': 'a',
'desc': 'a',
'provider_id': 'maths',
'provider_type': 'builtin',
'provider_name': 'maths',
'tool_name': 'eval_expression',
'tool_label': 'eval_expression',
'tool_configurations': {},
'tool_parameters': {
'expression': {
'type': 'mixed',
'value': '{{#1.args1#}}',
}
}
} }
} }
) )