mirror of
https://github.com/langgenius/dify.git
synced 2026-08-28 21:23:22 +08:00
fix: refine
This commit is contained in:
parent
fb8ecf7b5a
commit
c7696964b9
@ -8,9 +8,9 @@ from core.plugin.utils.http_parser import deserialize_request, serialize_request
|
|||||||
from extensions.ext_storage import storage
|
from extensions.ext_storage import storage
|
||||||
|
|
||||||
|
|
||||||
class TriggerRequestService:
|
class TriggerHttpRequestCachingService:
|
||||||
"""
|
"""
|
||||||
Service for handling trigger requests.
|
Service for caching trigger requests.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
_TRIGGER_STORAGE_PATH = "triggers"
|
_TRIGGER_STORAGE_PATH = "triggers"
|
||||||
|
|||||||
@ -25,7 +25,7 @@ from models.provider_ids import TriggerProviderID
|
|||||||
from models.trigger import AppTrigger, AppTriggerStatus, TriggerSubscription, WorkflowPluginTrigger
|
from models.trigger import AppTrigger, AppTriggerStatus, TriggerSubscription, WorkflowPluginTrigger
|
||||||
from models.workflow import Workflow
|
from models.workflow import Workflow
|
||||||
from services.trigger.trigger_provider_service import TriggerProviderService
|
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 services.workflow.entities import PluginTriggerDispatchData
|
||||||
from tasks.trigger_processing_tasks import dispatch_triggered_workflows_async
|
from tasks.trigger_processing_tasks import dispatch_triggered_workflows_async
|
||||||
|
|
||||||
@ -51,8 +51,8 @@ class TriggerService:
|
|||||||
if not subscription:
|
if not subscription:
|
||||||
raise ValueError("Subscription not found")
|
raise ValueError("Subscription not found")
|
||||||
node_data: TriggerEventNodeData = TriggerEventNodeData.model_validate(node_config.get("data", {}))
|
node_data: TriggerEventNodeData = TriggerEventNodeData.model_validate(node_config.get("data", {}))
|
||||||
request = TriggerRequestService.get_request(event.request_id)
|
request = TriggerHttpRequestCachingService.get_request(event.request_id)
|
||||||
payload = TriggerRequestService.get_payload(event.request_id)
|
payload = TriggerHttpRequestCachingService.get_payload(event.request_id)
|
||||||
# invoke triger
|
# invoke triger
|
||||||
provider_controller: PluginTriggerProviderController = TriggerManager.get_trigger_provider(
|
provider_controller: PluginTriggerProviderController = TriggerManager.get_trigger_provider(
|
||||||
tenant_id, TriggerProviderID(subscription.provider_id)
|
tenant_id, TriggerProviderID(subscription.provider_id)
|
||||||
@ -113,8 +113,8 @@ class TriggerService:
|
|||||||
request_id = f"trigger_request_{timestamp}_{secrets.token_hex(6)}"
|
request_id = f"trigger_request_{timestamp}_{secrets.token_hex(6)}"
|
||||||
|
|
||||||
# save the request and payload to storage as persistent data
|
# save the request and payload to storage as persistent data
|
||||||
TriggerRequestService.persist_request(request_id, request)
|
TriggerHttpRequestCachingService.persist_request(request_id, request)
|
||||||
TriggerRequestService.persist_payload(request_id, dispatch_response.payload)
|
TriggerHttpRequestCachingService.persist_payload(request_id, dispatch_response.payload)
|
||||||
|
|
||||||
# Validate event names
|
# Validate event names
|
||||||
for event_name in dispatch_response.events:
|
for event_name in dispatch_response.events:
|
||||||
|
|||||||
@ -31,7 +31,7 @@ from models.workflow import Workflow
|
|||||||
from services.async_workflow_service import AsyncWorkflowService
|
from services.async_workflow_service import AsyncWorkflowService
|
||||||
from services.end_user_service import EndUserService
|
from services.end_user_service import EndUserService
|
||||||
from services.trigger.trigger_provider_service import TriggerProviderService
|
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
|
from services.workflow.entities import PluginTriggerData, PluginTriggerDispatchData
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -118,8 +118,8 @@ def dispatch_triggered_workflow(
|
|||||||
event: The trigger entity that was activated
|
event: The trigger entity that was activated
|
||||||
request_id: The ID of the stored request in storage system
|
request_id: The ID of the stored request in storage system
|
||||||
"""
|
"""
|
||||||
request = TriggerRequestService.get_request(request_id)
|
request = TriggerHttpRequestCachingService.get_request(request_id)
|
||||||
payload = TriggerRequestService.get_payload(request_id)
|
payload = TriggerHttpRequestCachingService.get_payload(request_id)
|
||||||
|
|
||||||
from services.trigger.trigger_service import TriggerService
|
from services.trigger.trigger_service import TriggerService
|
||||||
# FIXME: we should avoid import modules inside methods
|
# FIXME: we should avoid import modules inside methods
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user