mirror of
https://github.com/langgenius/dify.git
synced 2026-05-03 00:48:04 +08:00
Merge branch 'feat/queue-based-graph-engine' into feat/rag-2
# Conflicts: # api/commands.py # api/core/app/apps/common/workflow_response_converter.py # api/core/llm_generator/llm_generator.py # api/core/plugin/entities/plugin.py # api/core/plugin/impl/tool.py # api/core/rag/index_processor/index_processor_base.py # api/core/workflow/entities/workflow_execution.py # api/core/workflow/entities/workflow_node_execution.py # api/core/workflow/enums.py # api/core/workflow/graph_engine/entities/graph.py # api/core/workflow/graph_engine/graph_engine.py # api/core/workflow/nodes/enums.py # api/services/dataset_service.py
This commit is contained in:
@ -14,7 +14,7 @@ from core.file.models import File
|
||||
from core.variables import utils as variable_utils
|
||||
from core.variables.variables import FloatVariable, IntegerVariable, StringVariable
|
||||
from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
|
||||
from core.workflow.nodes.enums import NodeType
|
||||
from core.workflow.enums import NodeType
|
||||
from factories.variable_factory import TypeMismatchError, build_segment_with_type
|
||||
from libs.datetime_utils import naive_utc_now
|
||||
|
||||
|
||||
Reference in New Issue
Block a user