ngskcloud
/
gcgj-dify-1.7.0
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(base/node.py): Rename `_get_base_node_data` to `get_base_node_data`

Browse Source 
Signed-off-by: -LAN- <laipz8200@outlook.com>
pull/22581/head
-LAN- 10 months ago
parent ae4c7ab34a
commit 52bc116e0b
No known key found for this signature in database
GPG Key ID: 6BA0D108DED011FF
25 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

20
api/core/workflow/graph_engine/graph_engine.py
Unescape Escape View File

@ -311,7 +311,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=next_node_id, node_id=next_node_id,
node_type=node_type, node_type=node_type,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
parallel_id=in_parallel_id, parallel_id=in_parallel_id,
parallel_start_node_id=parallel_start_node_id, parallel_start_node_id=parallel_start_node_id,
@ -613,7 +613,7 @@ class GraphEngine:
# trigger node run start event # trigger node run start event
agent_strategy = ( agent_strategy = (
AgentNodeStrategyInit( 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, icon=cast(AgentNode, node).agent_strategy_icon,
) )
if node.type_ == NodeType.AGENT if node.type_ == NodeType.AGENT
@ -623,7 +623,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
predecessor_node_id=node.previous_node_id, predecessor_node_id=node.previous_node_id,
parallel_id=parallel_id, parallel_id=parallel_id,
@ -672,7 +672,7 @@ class GraphEngine:
id=str(uuid.uuid4()), id=str(uuid.uuid4()),
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
predecessor_node_id=node.previous_node_id, predecessor_node_id=node.previous_node_id,
parallel_id=parallel_id, parallel_id=parallel_id,
@ -712,7 +712,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
parallel_id=parallel_id, parallel_id=parallel_id,
parallel_start_node_id=parallel_start_node_id, parallel_start_node_id=parallel_start_node_id,
@ -727,7 +727,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
parallel_id=parallel_id, parallel_id=parallel_id,
parallel_start_node_id=parallel_start_node_id, parallel_start_node_id=parallel_start_node_id,
@ -788,7 +788,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
parallel_id=parallel_id, parallel_id=parallel_id,
parallel_start_node_id=parallel_start_node_id, parallel_start_node_id=parallel_start_node_id,
@ -804,7 +804,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
chunk_content=event.chunk_content, chunk_content=event.chunk_content,
from_variable_selector=event.from_variable_selector, from_variable_selector=event.from_variable_selector,
route_node_state=route_node_state, route_node_state=route_node_state,
@ -819,7 +819,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
retriever_resources=event.retriever_resources, retriever_resources=event.retriever_resources,
context=event.context, context=event.context,
route_node_state=route_node_state, route_node_state=route_node_state,
@ -838,7 +838,7 @@ class GraphEngine:
id=node.id, id=node.id,
node_id=node.node_id, node_id=node.node_id,
node_type=node.type_, node_type=node.type_,
node_data=node._get_base_node_data(), node_data=node.get_base_node_data(),
route_node_state=route_node_state, route_node_state=route_node_state,
parallel_id=parallel_id, parallel_id=parallel_id,
parallel_start_node_id=parallel_start_node_id, parallel_start_node_id=parallel_start_node_id,

2
api/core/workflow/nodes/agent/agent_node.py
Unescape Escape View File

@ -83,7 +83,7 @@ class AgentNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/answer/answer_node.py
Unescape Escape View File

@ -40,7 +40,7 @@ class AnswerNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/base/node.py
Unescape Escape View File

@ -195,7 +195,7 @@ class BaseNode:
... ...
@abstractmethod @abstractmethod
def _get_base_node_data(self) -> BaseNodeData: def get_base_node_data(self) -> BaseNodeData:
"""Get the BaseNodeData object for this node.""" """Get the BaseNodeData object for this node."""
... ...

2
api/core/workflow/nodes/code/code_node.py
Unescape Escape View File

@ -45,7 +45,7 @@ class CodeNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/document_extractor/node.py
Unescape Escape View File

@ -65,7 +65,7 @@ class DocumentExtractorNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/end/end_node.py
Unescape Escape View File

@ -32,7 +32,7 @@ class EndNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/http_request/node.py
Unescape Escape View File

@ -56,7 +56,7 @@ class HttpRequestNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/if_else/if_else_node.py
Unescape Escape View File

@ -37,7 +37,7 @@ class IfElseNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/iteration/iteration_node.py
Unescape Escape View File

@ -84,7 +84,7 @@ class IterationNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/iteration/iteration_start_node.py
Unescape Escape View File

@ -36,7 +36,7 @@ class IterationStartNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
Unescape Escape View File

@ -143,7 +143,7 @@ class KnowledgeRetrievalNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/list_operator/node.py
Unescape Escape View File

@ -37,7 +37,7 @@ class ListOperatorNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/llm/node.py
Unescape Escape View File

@ -156,7 +156,7 @@ class LLMNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/loop/loop_end_node.py
Unescape Escape View File

@ -36,7 +36,7 @@ class LoopEndNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/loop/loop_node.py
Unescape Escape View File

@ -71,7 +71,7 @@ class LoopNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/loop/loop_start_node.py
Unescape Escape View File

@ -36,7 +36,7 @@ class LoopStartNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
Unescape Escape View File

@ -114,7 +114,7 @@ class ParameterExtractorNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
_model_instance: Optional[ModelInstance] = None _model_instance: Optional[ModelInstance] = None

2
api/core/workflow/nodes/question_classifier/question_classifier_node.py
Unescape Escape View File

@ -101,7 +101,7 @@ class QuestionClassifierNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/start/start_node.py
Unescape Escape View File

@ -33,7 +33,7 @@ class StartNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/template_transform/template_transform_node.py
Unescape Escape View File

@ -36,7 +36,7 @@ class TemplateTransformNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/tool/tool_node.py
Unescape Escape View File

@ -418,7 +418,7 @@ class ToolNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@property @property

2
api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py
Unescape Escape View File

@ -33,7 +33,7 @@ class VariableAggregatorNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
@classmethod @classmethod

2
api/core/workflow/nodes/variable_assigner/v1/node.py
Unescape Escape View File

@ -47,7 +47,7 @@ class VariableAssignerNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
def __init__( def __init__(

2
api/core/workflow/nodes/variable_assigner/v2/node.py
Unescape Escape View File

@ -76,7 +76,7 @@ class VariableAssignerNode(BaseNode):
def _get_default_value_dict(self) -> dict[str, Any]: def _get_default_value_dict(self) -> dict[str, Any]:
return self._node_data.default_value_dict 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 return self._node_data
def _conv_var_updater_factory(self) -> ConversationVariableUpdater: def _conv_var_updater_factory(self) -> ConversationVariableUpdater:

Write Preview
Loading…
Cancel
Save