Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/trigger/handler/impl/task/tool_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ def execute(self, trigger_task, **kwargs):

parameters = get_tool_execute_parameters(tool.input_field_list, parameter_setting, kwargs)
init_params_default_value = {i["field"]: i.get('default_value') for i in tool.init_field_list}
parameters = init_params_default_value | parameters

if tool.init_params is not None:
all_params = json.loads(rsa_long_decrypt(tool.init_params)) | parameters
all_params = init_params_default_value | json.loads(rsa_long_decrypt(tool.init_params)) | parameters
else:
all_params = parameters
all_params = init_params_default_value | parameters

result = executor.exec_code(tool.code, all_params)

Expand All @@ -165,7 +165,7 @@ def execute(self, trigger_task, **kwargs):
QuerySet(ToolRecord).filter(id=task_record_id).update(
state=State.SUCCESS,
run_time=time.time() - start_time,
meta={'input': parameters, 'output': result_dict}
meta={'input': init_params_default_value | parameters, 'output': result_dict}
)
except Exception as e:
maxkb_logger.error(f"Tool execution error: {traceback.format_exc()}")
Expand Down