From 04c91111e9bfc39866f19bf9d6f59b44cf7478e0 Mon Sep 17 00:00:00 2001 From: -LAN- Date: Fri, 17 Oct 2025 13:37:46 +0800 Subject: [PATCH] fix(trigger): trigger node is marked as 'branch' type --- api/core/workflow/nodes/trigger_plugin/entities.py | 13 +++---------- .../trigger/trigger_subscription_builder_service.py | 4 +++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/api/core/workflow/nodes/trigger_plugin/entities.py b/api/core/workflow/nodes/trigger_plugin/entities.py index 01c4c6f17d..e6853bb854 100644 --- a/api/core/workflow/nodes/trigger_plugin/entities.py +++ b/api/core/workflow/nodes/trigger_plugin/entities.py @@ -4,8 +4,7 @@ from typing import Any, Literal, Optional, Union from pydantic import BaseModel, Field, ValidationInfo, field_validator from core.trigger.entities.entities import EventParameter -from core.workflow.enums import ErrorStrategy -from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig +from core.workflow.nodes.base.entities import BaseNodeData from core.workflow.nodes.trigger_plugin.exc import TriggerEventParameterError @@ -27,14 +26,14 @@ class TriggerEventNodeData(BaseNodeData): if type == "mixed" and not isinstance(value, str): raise ValueError("value must be a string") - + if type == "variable": if not isinstance(value, list): raise ValueError("value must be a list") for val in value: if not isinstance(val, str): raise ValueError("value must be a list of strings") - + if type == "constant" and not isinstance(value, str | int | float | bool | dict | list): raise ValueError("value must be a string, int, float, bool or dict") return type @@ -48,12 +47,6 @@ class TriggerEventNodeData(BaseNodeData): plugin_unique_identifier: str = Field(..., description="Plugin unique identifier") event_parameters: Mapping[str, TriggerEventInput] = Field(default_factory=dict, description="Trigger parameters") - # Error handling - error_strategy: Optional[ErrorStrategy] = Field( - default=ErrorStrategy.FAIL_BRANCH, description="Error handling strategy" - ) - retry_config: RetryConfig = Field(default_factory=lambda: RetryConfig(), description="Retry configuration") - def resolve_parameters( self, *, diff --git a/api/services/trigger/trigger_subscription_builder_service.py b/api/services/trigger/trigger_subscription_builder_service.py index 927a3ddf8e..5f5cd3e8ee 100644 --- a/api/services/trigger/trigger_subscription_builder_service.py +++ b/api/services/trigger/trigger_subscription_builder_service.py @@ -385,7 +385,9 @@ class TriggerSubscriptionBuilderService: credentials=masked_credentials( schemas=controller.get_credentials_schema(credential_type), credentials=entity.credentials, - ) if controller.get_subscription_constructor() else {}, + ) + if controller.get_subscription_constructor() + else {}, ) @classmethod