diff --git a/apps/trigger/handler/impl/trigger/event_trigger.py b/apps/trigger/handler/impl/trigger/event_trigger.py index fcbffa06eac..ae19a321e3a 100644 --- a/apps/trigger/handler/impl/trigger/event_trigger.py +++ b/apps/trigger/handler/impl/trigger/event_trigger.py @@ -20,8 +20,6 @@ from common.result import Result from trigger.handler.base_trigger import BaseTrigger from trigger.models import TriggerTask, Trigger -from trigger.serializers.trigger import TriggerResponse -from trigger.serializers.trigger_task import TriggerTaskResponse def valid_parameter_type(value, _type, desc): @@ -96,6 +94,7 @@ class EventTriggerView(APIView): ) def post(self, request: Request, trigger_id: str): + from trigger.serializers.trigger import TriggerResponse trigger = QuerySet(Trigger).filter(id=trigger_id).first() if trigger: return EventTrigger.execute(TriggerResponse(trigger).data, request) @@ -109,6 +108,7 @@ class EventTrigger(BaseTrigger): @staticmethod def execute(trigger, request=None, **kwargs): + from trigger.serializers.trigger_task import TriggerTaskResponse trigger_setting = trigger.get('trigger_setting') if trigger_setting.get('token'): token = request.META.get('HTTP_AUTHORIZATION') diff --git a/apps/trigger/handler/simple_tools.py b/apps/trigger/handler/simple_tools.py index 3191cd63d2e..dc11c5487e3 100644 --- a/apps/trigger/handler/simple_tools.py +++ b/apps/trigger/handler/simple_tools.py @@ -9,11 +9,12 @@ from threading import Thread from trigger.handler.impl.task.application_task import ApplicationTask +from trigger.handler.impl.trigger.event_trigger import EventTrigger from trigger.handler.impl.trigger.scheduled_trigger import ScheduledTrigger simple_task_handlers = [ApplicationTask()] -simple_trigger_handlers = [ScheduledTrigger()] +simple_trigger_handlers = [ScheduledTrigger(), EventTrigger()] def execute(trigger_task, **kwargs):