diff --git a/apps/trigger/handler/impl/task/tool_task.py b/apps/trigger/handler/impl/task/tool_task.py index eee72311d6f..d599ac9d156 100644 --- a/apps/trigger/handler/impl/task/tool_task.py +++ b/apps/trigger/handler/impl/task/tool_task.py @@ -35,24 +35,10 @@ def get_field_value(value, kwargs): return get_reference(value.get('value'), kwargs) -def get_application_execute_parameters(parameter_setting, kwargs): - parameters = {'form_data': {}} - question_setting = parameter_setting.get('question') - if question_setting: - parameters['message'] = get_field_value(question_setting, kwargs) - filed_list = ['image_list', 'document_list', 'audio_list', 'video_list', 'other_list'] - for field in filed_list: - field_setting = parameter_setting.get(field) - if field_setting: - parameters[field] = get_field_value(field_setting, kwargs) - api_input_field_list = parameter_setting.get('api_input_field_list') - if api_input_field_list: - for key, value in api_input_field_list.items(): - parameters['form_data'][key] = get_field_value(value, kwargs) - user_input_field_list = parameter_setting.get('user_input_field_list') - if user_input_field_list: - for key, value in user_input_field_list.items(): - parameters['form_data'][key] = get_field_value(value, kwargs) +def get_tool_execute_parameters(parameter_setting, kwargs): + parameters = {} + for key, value in parameter_setting.items(): + parameters[key] = get_field_value(value, kwargs) return parameters @@ -81,7 +67,7 @@ def support(self, trigger_task, **kwargs): def execute(self, trigger_task, **kwargs): parameter_setting = trigger_task.get('parameter') - parameters = get_application_execute_parameters(parameter_setting, kwargs) + parameters = get_tool_execute_parameters(parameter_setting, kwargs) tool_id = trigger_task.get('source_id') task_record_id = uuid.uuid7() diff --git a/apps/trigger/handler/simple_tools.py b/apps/trigger/handler/simple_tools.py index dc11c5487e3..b8886fc0b33 100644 --- a/apps/trigger/handler/simple_tools.py +++ b/apps/trigger/handler/simple_tools.py @@ -9,10 +9,11 @@ from threading import Thread from trigger.handler.impl.task.application_task import ApplicationTask +from trigger.handler.impl.task.tool_task import ToolTask from trigger.handler.impl.trigger.event_trigger import EventTrigger from trigger.handler.impl.trigger.scheduled_trigger import ScheduledTrigger -simple_task_handlers = [ApplicationTask()] +simple_task_handlers = [ApplicationTask(), ToolTask()] simple_trigger_handlers = [ScheduledTrigger(), EventTrigger()] diff --git a/apps/trigger/sql/get_trigger_task_record_page_list.sql b/apps/trigger/sql/get_trigger_task_record_page_list.sql index 1e7a104f57f..8d519afe7f2 100644 --- a/apps/trigger/sql/get_trigger_task_record_page_list.sql +++ b/apps/trigger/sql/get_trigger_task_record_page_list.sql @@ -20,8 +20,10 @@ WITH source_data_cte AS (SELECT 'APPLICATION' as source_type, "folder_id" FROM tool) select ett.*, + ett.meta::json as meta, sdc.name as source_name, - sdc.icon as source_icon + sdc.icon as source_icon, + sdc.type as type from event_trigger_task_record ett left join source_data_cte sdc on ett.source_id = sdc.id and ett.source_type = sdc.source_type