From c7696964b98c6932bf0853423d922ded14fd296a Mon Sep 17 00:00:00 2001 From: Yeuoly Date: Sat, 18 Oct 2025 20:27:22 +0800 Subject: [PATCH] fix: refine --- api/services/trigger/trigger_request_service.py | 4 ++-- api/services/trigger/trigger_service.py | 10 +++++----- api/tasks/trigger_processing_tasks.py | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/services/trigger/trigger_request_service.py b/api/services/trigger/trigger_request_service.py index ad02b43e01..4753e7c24e 100644 --- a/api/services/trigger/trigger_request_service.py +++ b/api/services/trigger/trigger_request_service.py @@ -8,9 +8,9 @@ from core.plugin.utils.http_parser import deserialize_request, serialize_request from extensions.ext_storage import storage -class TriggerRequestService: +class TriggerHttpRequestCachingService: """ - Service for handling trigger requests. + Service for caching trigger requests. """ _TRIGGER_STORAGE_PATH = "triggers" diff --git a/api/services/trigger/trigger_service.py b/api/services/trigger/trigger_service.py index 3ff6d99fbf..8a04a3c642 100644 --- a/api/services/trigger/trigger_service.py +++ b/api/services/trigger/trigger_service.py @@ -25,7 +25,7 @@ from models.provider_ids import TriggerProviderID from models.trigger import AppTrigger, AppTriggerStatus, TriggerSubscription, WorkflowPluginTrigger from models.workflow import Workflow from services.trigger.trigger_provider_service import TriggerProviderService -from services.trigger.trigger_request_service import TriggerRequestService +from services.trigger.trigger_request_service import TriggerHttpRequestCachingService from services.workflow.entities import PluginTriggerDispatchData from tasks.trigger_processing_tasks import dispatch_triggered_workflows_async @@ -51,8 +51,8 @@ class TriggerService: if not subscription: raise ValueError("Subscription not found") node_data: TriggerEventNodeData = TriggerEventNodeData.model_validate(node_config.get("data", {})) - request = TriggerRequestService.get_request(event.request_id) - payload = TriggerRequestService.get_payload(event.request_id) + request = TriggerHttpRequestCachingService.get_request(event.request_id) + payload = TriggerHttpRequestCachingService.get_payload(event.request_id) # invoke triger provider_controller: PluginTriggerProviderController = TriggerManager.get_trigger_provider( tenant_id, TriggerProviderID(subscription.provider_id) @@ -113,8 +113,8 @@ class TriggerService: request_id = f"trigger_request_{timestamp}_{secrets.token_hex(6)}" # save the request and payload to storage as persistent data - TriggerRequestService.persist_request(request_id, request) - TriggerRequestService.persist_payload(request_id, dispatch_response.payload) + TriggerHttpRequestCachingService.persist_request(request_id, request) + TriggerHttpRequestCachingService.persist_payload(request_id, dispatch_response.payload) # Validate event names for event_name in dispatch_response.events: diff --git a/api/tasks/trigger_processing_tasks.py b/api/tasks/trigger_processing_tasks.py index 8305c1eafb..c32e06331c 100644 --- a/api/tasks/trigger_processing_tasks.py +++ b/api/tasks/trigger_processing_tasks.py @@ -31,7 +31,7 @@ from models.workflow import Workflow from services.async_workflow_service import AsyncWorkflowService from services.end_user_service import EndUserService from services.trigger.trigger_provider_service import TriggerProviderService -from services.trigger.trigger_request_service import TriggerRequestService +from services.trigger.trigger_request_service import TriggerHttpRequestCachingService from services.workflow.entities import PluginTriggerData, PluginTriggerDispatchData logger = logging.getLogger(__name__) @@ -118,8 +118,8 @@ def dispatch_triggered_workflow( event: The trigger entity that was activated request_id: The ID of the stored request in storage system """ - request = TriggerRequestService.get_request(request_id) - payload = TriggerRequestService.get_payload(request_id) + request = TriggerHttpRequestCachingService.get_request(request_id) + payload = TriggerHttpRequestCachingService.get_payload(request_id) from services.trigger.trigger_service import TriggerService # FIXME: we should avoid import modules inside methods