From d6197e73b3defd4d3f7e0902c1de4c16f0c33237 Mon Sep 17 00:00:00 2001
From: Stream <Stream_2@qq.com>
Date: Mon, 20 Oct 2025 16:29:13 +0800
Subject: [PATCH] fix: merge

---
 api/controllers/service_api/app/chatflow_memory.py | 2 +-
 api/controllers/web/chatflow_memory.py             | 2 +-
 api/core/app/apps/advanced_chat/app_runner.py      | 2 +-
 api/core/llm_generator/llm_generator.py            | 2 +-
 api/services/chatflow_memory_service.py            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/controllers/service_api/app/chatflow_memory.py b/api/controllers/service_api/app/chatflow_memory.py
index 1f56dfba43..b03c6fa863 100644
--- a/api/controllers/service_api/app/chatflow_memory.py
+++ b/api/controllers/service_api/app/chatflow_memory.py
@@ -3,7 +3,7 @@ from flask_restx import Resource, reqparse
 from controllers.service_api import api
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.memory.entities import MemoryBlock, MemoryCreatedBy
-from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.runtime import VariablePool
 from models import App, EndUser
 from services.chatflow_memory_service import ChatflowMemoryService
 from services.workflow_service import WorkflowService
diff --git a/api/controllers/web/chatflow_memory.py b/api/controllers/web/chatflow_memory.py
index 276d6d3b83..ff43ad6cf9 100644
--- a/api/controllers/web/chatflow_memory.py
+++ b/api/controllers/web/chatflow_memory.py
@@ -3,7 +3,7 @@ from flask_restx import reqparse
 from controllers.web import api
 from controllers.web.wraps import WebApiResource
 from core.memory.entities import MemoryBlock, MemoryCreatedBy
-from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.runtime import VariablePool
 from models import App, EndUser
 from services.chatflow_memory_service import ChatflowMemoryService
 from services.workflow_service import WorkflowService
diff --git a/api/core/app/apps/advanced_chat/app_runner.py b/api/core/app/apps/advanced_chat/app_runner.py
index fdd25502b5..dca51d37d0 100644
--- a/api/core/app/apps/advanced_chat/app_runner.py
+++ b/api/core/app/apps/advanced_chat/app_runner.py
@@ -26,7 +26,7 @@ from core.model_runtime.entities import AssistantPromptMessage, UserPromptMessag
 from core.moderation.base import ModerationError
 from core.moderation.input_moderation import InputModeration
 from core.variables.variables import VariableUnion
-from core.workflow.entities import WorkflowType
+from core.workflow.enums import WorkflowType
 from core.workflow.graph_engine.command_channels.redis_channel import RedisChannel
 from core.workflow.graph_events import GraphRunSucceededEvent
 from core.workflow.graph_engine.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index 2b4e944a8b..9e900b73aa 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -29,8 +29,8 @@ from core.ops.entities.trace_entity import TraceTaskName
 from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.ops.utils import measure_time
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
-from core.workflow.entities.variable_pool import VariablePool
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionMetadataKey
+from core.workflow.runtime import VariablePool
 from extensions.ext_database import db
 from extensions.ext_storage import storage
 from models import App, Message, WorkflowNodeExecutionModel
diff --git a/api/services/chatflow_memory_service.py b/api/services/chatflow_memory_service.py
index 560a934aa8..982464b4ba 100644
--- a/api/services/chatflow_memory_service.py
+++ b/api/services/chatflow_memory_service.py
@@ -22,7 +22,7 @@ from core.memory.errors import MemorySyncTimeoutError
 from core.model_runtime.entities.message_entities import PromptMessage
 from core.variables.segments import VersionedMemoryValue
 from core.workflow.constants import MEMORY_BLOCK_VARIABLE_NODE_ID
-from core.workflow.entities.variable_pool import VariablePool
+from core.workflow.runtime import VariablePool
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from models import App, CreatorUserRole