From 52bc116e0b1cf5147f9a9ea29d546cb3ff7aa57c Mon Sep 17 00:00:00 2001 From: -LAN- Date: Fri, 18 Jul 2025 02:56:58 +0800 Subject: [PATCH] refactor(base/node.py): Rename `_get_base_node_data` to `get_base_node_data` Signed-off-by: -LAN- --- .../workflow/graph_engine/graph_engine.py | 20 +++++++++---------- api/core/workflow/nodes/agent/agent_node.py | 2 +- api/core/workflow/nodes/answer/answer_node.py | 2 +- api/core/workflow/nodes/base/node.py | 2 +- api/core/workflow/nodes/code/code_node.py | 2 +- .../workflow/nodes/document_extractor/node.py | 2 +- api/core/workflow/nodes/end/end_node.py | 2 +- api/core/workflow/nodes/http_request/node.py | 2 +- .../workflow/nodes/if_else/if_else_node.py | 2 +- .../nodes/iteration/iteration_node.py | 2 +- .../nodes/iteration/iteration_start_node.py | 2 +- .../knowledge_retrieval_node.py | 2 +- api/core/workflow/nodes/list_operator/node.py | 2 +- api/core/workflow/nodes/llm/node.py | 2 +- api/core/workflow/nodes/loop/loop_end_node.py | 2 +- api/core/workflow/nodes/loop/loop_node.py | 2 +- .../workflow/nodes/loop/loop_start_node.py | 2 +- .../parameter_extractor_node.py | 2 +- .../question_classifier_node.py | 2 +- api/core/workflow/nodes/start/start_node.py | 2 +- .../template_transform_node.py | 2 +- api/core/workflow/nodes/tool/tool_node.py | 2 +- .../variable_aggregator_node.py | 2 +- .../nodes/variable_assigner/v1/node.py | 2 +- .../nodes/variable_assigner/v2/node.py | 2 +- 25 files changed, 34 insertions(+), 34 deletions(-) diff --git a/api/core/workflow/graph_engine/graph_engine.py b/api/core/workflow/graph_engine/graph_engine.py index b5bdd20236..b315129763 100644 --- a/api/core/workflow/graph_engine/graph_engine.py +++ b/api/core/workflow/graph_engine/graph_engine.py @@ -311,7 +311,7 @@ class GraphEngine: id=node.id, node_id=next_node_id, node_type=node_type, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, parallel_id=in_parallel_id, parallel_start_node_id=parallel_start_node_id, @@ -613,7 +613,7 @@ class GraphEngine: # trigger node run start event agent_strategy = ( AgentNodeStrategyInit( - name=cast(AgentNodeData, node._get_base_node_data()).agent_strategy_name, + name=cast(AgentNodeData, node.get_base_node_data()).agent_strategy_name, icon=cast(AgentNode, node).agent_strategy_icon, ) if node.type_ == NodeType.AGENT @@ -623,7 +623,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, predecessor_node_id=node.previous_node_id, parallel_id=parallel_id, @@ -672,7 +672,7 @@ class GraphEngine: id=str(uuid.uuid4()), node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, predecessor_node_id=node.previous_node_id, parallel_id=parallel_id, @@ -712,7 +712,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, parallel_id=parallel_id, parallel_start_node_id=parallel_start_node_id, @@ -727,7 +727,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, parallel_id=parallel_id, parallel_start_node_id=parallel_start_node_id, @@ -788,7 +788,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, parallel_id=parallel_id, parallel_start_node_id=parallel_start_node_id, @@ -804,7 +804,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), chunk_content=event.chunk_content, from_variable_selector=event.from_variable_selector, route_node_state=route_node_state, @@ -819,7 +819,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), retriever_resources=event.retriever_resources, context=event.context, route_node_state=route_node_state, @@ -838,7 +838,7 @@ class GraphEngine: id=node.id, node_id=node.node_id, node_type=node.type_, - node_data=node._get_base_node_data(), + node_data=node.get_base_node_data(), route_node_state=route_node_state, parallel_id=parallel_id, parallel_start_node_id=parallel_start_node_id, diff --git a/api/core/workflow/nodes/agent/agent_node.py b/api/core/workflow/nodes/agent/agent_node.py index c899736b63..344784d495 100644 --- a/api/core/workflow/nodes/agent/agent_node.py +++ b/api/core/workflow/nodes/agent/agent_node.py @@ -83,7 +83,7 @@ class AgentNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/answer/answer_node.py b/api/core/workflow/nodes/answer/answer_node.py index 72bb6d687f..84bbabca73 100644 --- a/api/core/workflow/nodes/answer/answer_node.py +++ b/api/core/workflow/nodes/answer/answer_node.py @@ -40,7 +40,7 @@ class AnswerNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/base/node.py b/api/core/workflow/nodes/base/node.py index 06c0ff2ca8..fb5ec55453 100644 --- a/api/core/workflow/nodes/base/node.py +++ b/api/core/workflow/nodes/base/node.py @@ -195,7 +195,7 @@ class BaseNode: ... @abstractmethod - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: """Get the BaseNodeData object for this node.""" ... diff --git a/api/core/workflow/nodes/code/code_node.py b/api/core/workflow/nodes/code/code_node.py index c20e019a1e..fdf3932827 100644 --- a/api/core/workflow/nodes/code/code_node.py +++ b/api/core/workflow/nodes/code/code_node.py @@ -45,7 +45,7 @@ class CodeNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/document_extractor/node.py b/api/core/workflow/nodes/document_extractor/node.py index 4c7b7e52d5..ab5964ebd4 100644 --- a/api/core/workflow/nodes/document_extractor/node.py +++ b/api/core/workflow/nodes/document_extractor/node.py @@ -65,7 +65,7 @@ class DocumentExtractorNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/end/end_node.py b/api/core/workflow/nodes/end/end_node.py index 17771811b2..f86f2e8129 100644 --- a/api/core/workflow/nodes/end/end_node.py +++ b/api/core/workflow/nodes/end/end_node.py @@ -32,7 +32,7 @@ class EndNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/http_request/node.py b/api/core/workflow/nodes/http_request/node.py index 3182240f6c..6799d5c63c 100644 --- a/api/core/workflow/nodes/http_request/node.py +++ b/api/core/workflow/nodes/http_request/node.py @@ -56,7 +56,7 @@ class HttpRequestNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/if_else/if_else_node.py b/api/core/workflow/nodes/if_else/if_else_node.py index 7bb1565558..86e703dc68 100644 --- a/api/core/workflow/nodes/if_else/if_else_node.py +++ b/api/core/workflow/nodes/if_else/if_else_node.py @@ -37,7 +37,7 @@ class IfElseNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/iteration/iteration_node.py b/api/core/workflow/nodes/iteration/iteration_node.py index a71970af3f..5842c8d64b 100644 --- a/api/core/workflow/nodes/iteration/iteration_node.py +++ b/api/core/workflow/nodes/iteration/iteration_node.py @@ -84,7 +84,7 @@ class IterationNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/iteration/iteration_start_node.py b/api/core/workflow/nodes/iteration/iteration_start_node.py index a83ecaf335..b82c29291a 100644 --- a/api/core/workflow/nodes/iteration/iteration_start_node.py +++ b/api/core/workflow/nodes/iteration/iteration_start_node.py @@ -36,7 +36,7 @@ class IterationStartNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py index 09f44be099..0324be8b2a 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py +++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py @@ -143,7 +143,7 @@ class KnowledgeRetrievalNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/list_operator/node.py b/api/core/workflow/nodes/list_operator/node.py index 4eacb3c6c9..ae9401b056 100644 --- a/api/core/workflow/nodes/list_operator/node.py +++ b/api/core/workflow/nodes/list_operator/node.py @@ -37,7 +37,7 @@ class ListOperatorNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/llm/node.py b/api/core/workflow/nodes/llm/node.py index e6a5796e1e..91e7312805 100644 --- a/api/core/workflow/nodes/llm/node.py +++ b/api/core/workflow/nodes/llm/node.py @@ -156,7 +156,7 @@ class LLMNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/loop/loop_end_node.py b/api/core/workflow/nodes/loop/loop_end_node.py index 3c6b9ec2ed..53cadc5251 100644 --- a/api/core/workflow/nodes/loop/loop_end_node.py +++ b/api/core/workflow/nodes/loop/loop_end_node.py @@ -36,7 +36,7 @@ class LoopEndNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/loop/loop_node.py b/api/core/workflow/nodes/loop/loop_node.py index 35c7bd1c24..655de9362f 100644 --- a/api/core/workflow/nodes/loop/loop_node.py +++ b/api/core/workflow/nodes/loop/loop_node.py @@ -71,7 +71,7 @@ class LoopNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/loop/loop_start_node.py b/api/core/workflow/nodes/loop/loop_start_node.py index d570daaab5..29b45ea0c3 100644 --- a/api/core/workflow/nodes/loop/loop_start_node.py +++ b/api/core/workflow/nodes/loop/loop_start_node.py @@ -36,7 +36,7 @@ class LoopStartNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py b/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py index d436c7e706..7352a0c136 100644 --- a/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py +++ b/api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py @@ -114,7 +114,7 @@ class ParameterExtractorNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data _model_instance: Optional[ModelInstance] = None diff --git a/api/core/workflow/nodes/question_classifier/question_classifier_node.py b/api/core/workflow/nodes/question_classifier/question_classifier_node.py index 0388065c25..84983f8ad8 100644 --- a/api/core/workflow/nodes/question_classifier/question_classifier_node.py +++ b/api/core/workflow/nodes/question_classifier/question_classifier_node.py @@ -101,7 +101,7 @@ class QuestionClassifierNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/start/start_node.py b/api/core/workflow/nodes/start/start_node.py index 1c9c6dcc0b..9e401e76bb 100644 --- a/api/core/workflow/nodes/start/start_node.py +++ b/api/core/workflow/nodes/start/start_node.py @@ -33,7 +33,7 @@ class StartNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/template_transform/template_transform_node.py b/api/core/workflow/nodes/template_transform/template_transform_node.py index 366153ca0c..1962c82db1 100644 --- a/api/core/workflow/nodes/template_transform/template_transform_node.py +++ b/api/core/workflow/nodes/template_transform/template_transform_node.py @@ -36,7 +36,7 @@ class TemplateTransformNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/tool/tool_node.py b/api/core/workflow/nodes/tool/tool_node.py index 1d82ebcbd2..c565ad15c1 100644 --- a/api/core/workflow/nodes/tool/tool_node.py +++ b/api/core/workflow/nodes/tool/tool_node.py @@ -418,7 +418,7 @@ class ToolNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @property diff --git a/api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py b/api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py index 23e849c4df..98127bbeb6 100644 --- a/api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py +++ b/api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py @@ -33,7 +33,7 @@ class VariableAggregatorNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data @classmethod diff --git a/api/core/workflow/nodes/variable_assigner/v1/node.py b/api/core/workflow/nodes/variable_assigner/v1/node.py index 3343c3d27c..51383fa588 100644 --- a/api/core/workflow/nodes/variable_assigner/v1/node.py +++ b/api/core/workflow/nodes/variable_assigner/v1/node.py @@ -47,7 +47,7 @@ class VariableAssignerNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data def __init__( diff --git a/api/core/workflow/nodes/variable_assigner/v2/node.py b/api/core/workflow/nodes/variable_assigner/v2/node.py index 7104eb874a..c0215cae71 100644 --- a/api/core/workflow/nodes/variable_assigner/v2/node.py +++ b/api/core/workflow/nodes/variable_assigner/v2/node.py @@ -76,7 +76,7 @@ class VariableAssignerNode(BaseNode): def _get_default_value_dict(self) -> dict[str, Any]: return self._node_data.default_value_dict - def _get_base_node_data(self) -> BaseNodeData: + def get_base_node_data(self) -> BaseNodeData: return self._node_data def _conv_var_updater_factory(self) -> ConversationVariableUpdater: