Clean up imports and argument formatting in workflow nodes

This commit removes redundant imports and unnecessary blank lines in agent_node.py, and streamlines argument formatting in knowledge_retrieval_node.py, llm/node.py, and question_classifier_node.py. These changes improve code readability and maintain consistency across workflow node implementations.
pull/21938/head
fdb02983rhy 10 months ago
parent ce7c57e393
commit e39494c761

@ -10,8 +10,7 @@ from sqlalchemy.orm import Session
from core.agent.entities import AgentToolEntity from core.agent.entities import AgentToolEntity
from core.agent.plugin_entities import AgentStrategyParameter from core.agent.plugin_entities import AgentStrategyParameter
from core.agent.strategy.plugin import PluginAgentStrategy from core.agent.strategy.plugin import PluginAgentStrategy
from core.file import File, FileTransferMethod, file_manager
from core.file import file_manager
from core.memory.token_buffer_memory import TokenBufferMemory from core.memory.token_buffer_memory import TokenBufferMemory
from core.model_manager import ModelInstance, ModelManager from core.model_manager import ModelInstance, ModelManager
from core.model_runtime.entities import ( from core.model_runtime.entities import (
@ -19,12 +18,7 @@ from core.model_runtime.entities import (
TextPromptMessageContent, TextPromptMessageContent,
UserPromptMessage, UserPromptMessage,
) )
from core.file import File, FileTransferMethod
from core.memory.token_buffer_memory import TokenBufferMemory
from core.model_manager import ModelInstance, ModelManager
from core.model_runtime.entities.llm_entities import LLMUsage from core.model_runtime.entities.llm_entities import LLMUsage
from core.model_runtime.entities.model_entities import AIModelEntity, ModelType from core.model_runtime.entities.model_entities import AIModelEntity, ModelType
from core.plugin.entities.request import InvokeCredentials from core.plugin.entities.request import InvokeCredentials
from core.plugin.impl.exc import PluginDaemonClientSideError from core.plugin.impl.exc import PluginDaemonClientSideError
@ -37,12 +31,8 @@ from core.tools.entities.tool_entities import (
ToolProviderType, ToolProviderType,
) )
from core.tools.tool_manager import ToolManager from core.tools.tool_manager import ToolManager
from core.variables.segments import ArrayAnySegment, ArrayFileSegment, FileSegment, StringSegment
from core.tools.utils.message_transformer import ToolFileMessageTransformer from core.tools.utils.message_transformer import ToolFileMessageTransformer
from core.variables.segments import ArrayFileSegment, StringSegment from core.variables.segments import ArrayAnySegment, ArrayFileSegment, FileSegment, StringSegment
from core.workflow.entities.node_entities import NodeRunResult from core.workflow.entities.node_entities import NodeRunResult
from core.workflow.entities.variable_pool import VariablePool from core.workflow.entities.variable_pool import VariablePool
from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
@ -57,11 +47,8 @@ from core.workflow.utils.variable_template_parser import VariableTemplateParser
from extensions.ext_database import db from extensions.ext_database import db
from factories import file_factory from factories import file_factory
from factories.agent_factory import get_plugin_agent_strategy from factories.agent_factory import get_plugin_agent_strategy
from models.model import Conversation, NodeFileUsage
from models import ToolFile from models import ToolFile
from models.model import Conversation from models.model import Conversation, NodeFileUsage
from services.tools.builtin_tools_manage_service import BuiltinToolManageService from services.tools.builtin_tools_manage_service import BuiltinToolManageService
from .exc import ( from .exc import (
@ -74,7 +61,6 @@ from .exc import (
) )
class AgentNode(BaseNode): class AgentNode(BaseNode):
""" """
Agent Node Agent Node

@ -527,11 +527,8 @@ class KnowledgeRetrievalNode(BaseNode):
vision_detail=node_data.vision.configs.detail, vision_detail=node_data.vision.configs.detail,
variable_pool=self.graph_runtime_state.variable_pool, variable_pool=self.graph_runtime_state.variable_pool,
jinja2_variables=[], jinja2_variables=[],
uses_sys_files_for_node=False, uses_sys_files_for_node=False,
tenant_id=self.tenant_id, tenant_id=self.tenant_id,
) )
result_text = "" result_text = ""

@ -206,8 +206,8 @@ class LLMNode(BaseNode):
# A node is considered "using" sys.files when vision is enabled and a variable selector is configured. # A node is considered "using" sys.files when vision is enabled and a variable selector is configured.
# ------------------------------ # ------------------------------
uses_sys_files_for_node = self.node_data.vision.enabled and bool( uses_sys_files_for_node = self._node_data.vision.enabled and bool(
self.node_data.vision.configs.variable_selector self._node_data.vision.configs.variable_selector
) )
if uses_sys_files_for_node and files: if uses_sys_files_for_node and files:
@ -286,13 +286,9 @@ class LLMNode(BaseNode):
vision_enabled=self._node_data.vision.enabled, vision_enabled=self._node_data.vision.enabled,
vision_detail=self._node_data.vision.configs.detail, vision_detail=self._node_data.vision.configs.detail,
variable_pool=variable_pool, variable_pool=variable_pool,
jinja2_variables=self.node_data.prompt_config.jinja2_variables,
uses_sys_files_for_node=uses_sys_files_for_node, uses_sys_files_for_node=uses_sys_files_for_node,
jinja2_variables=self._node_data.prompt_config.jinja2_variables, jinja2_variables=self._node_data.prompt_config.jinja2_variables,
tenant_id=self.tenant_id, tenant_id=self.tenant_id,
) )
# handle invoke result # handle invoke result
@ -679,11 +675,8 @@ class LLMNode(BaseNode):
vision_detail: ImagePromptMessageContent.DETAIL, vision_detail: ImagePromptMessageContent.DETAIL,
variable_pool: VariablePool, variable_pool: VariablePool,
jinja2_variables: Sequence[VariableSelector], jinja2_variables: Sequence[VariableSelector],
uses_sys_files_for_node: bool, uses_sys_files_for_node: bool,
tenant_id: str, tenant_id: str,
) -> tuple[Sequence[PromptMessage], Optional[Sequence[str]]]: ) -> tuple[Sequence[PromptMessage], Optional[Sequence[str]]]:
prompt_messages: list[PromptMessage] = [] prompt_messages: list[PromptMessage] = []

@ -168,11 +168,8 @@ class QuestionClassifierNode(BaseNode):
vision_detail=node_data.vision.configs.detail, vision_detail=node_data.vision.configs.detail,
variable_pool=variable_pool, variable_pool=variable_pool,
jinja2_variables=[], jinja2_variables=[],
uses_sys_files_for_node=node_data.vision.enabled and bool(node_data.vision.configs.variable_selector), uses_sys_files_for_node=node_data.vision.enabled and bool(node_data.vision.configs.variable_selector),
tenant_id=self.tenant_id, tenant_id=self.tenant_id,
) )
result_text = "" result_text = ""

Loading…
Cancel
Save