From de47b56ca4972311264f7454982efc269691e8f8 Mon Sep 17 00:00:00 2001 From: zxhlyh Date: Thu, 17 Jul 2025 16:49:22 +0800 Subject: [PATCH] merge main --- api/core/variables/variables.py | 8 ++------ api/core/workflow/entities/variable_pool.py | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/api/core/variables/variables.py b/api/core/variables/variables.py index d9ce91990b..985ed87c74 100644 --- a/api/core/variables/variables.py +++ b/api/core/variables/variables.py @@ -1,12 +1,8 @@ from collections.abc import Sequence -from typing import Any, cast +from typing import Annotated, Any, TypeAlias, cast from uuid import uuid4 -from pydantic import BaseModel, Field -from typing import Annotated, TypeAlias, cast -from uuid import uuid4 - -from pydantic import Discriminator, Field, Tag +from pydantic import BaseModel, Discriminator, Field, Tag from core.helper import encrypter diff --git a/api/core/workflow/entities/variable_pool.py b/api/core/workflow/entities/variable_pool.py index 742a50c01f..4e69ad0cbd 100644 --- a/api/core/workflow/entities/variable_pool.py +++ b/api/core/workflow/entities/variable_pool.py @@ -9,16 +9,13 @@ from core.file import File, FileAttribute, file_manager from core.variables import Segment, SegmentGroup, Variable from core.variables.consts import MIN_SELECTORS_LENGTH from core.variables.segments import FileSegment, NoneSegment -from core.variables.variables import RAGPipelineVariableInput +from core.variables.variables import RAGPipelineVariableInput, VariableUnion from core.workflow.constants import ( CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, RAG_PIPELINE_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID, ) -from core.workflow.enums import SystemVariableKey -from core.variables.variables import VariableUnion -from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID from core.workflow.system_variable import SystemVariable from factories import variable_factory