Merge remote-tracking branch 'origin/main' into optional-plugin-invoke

# Conflicts:
#	api/dify_graph/nodes/llm/llm_utils.py
#	api/dify_graph/nodes/parameter_extractor/parameter_extractor_node.py
#	api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
#	api/tests/unit_tests/libs/test_login.py
This commit is contained in:
WH-2099
2026-03-24 19:35:09 +08:00
95 changed files with 9989 additions and 2581 deletions

View File

@@ -111,6 +111,10 @@ class QuestionClassifierNode(Node[QuestionClassifierNodeData]):
variables = {"query": query}
# fetch model instance
model_instance = self._model_instance
# Resolve variable references in string-typed completion params
model_instance.parameters = llm_utils.resolve_completion_params_variables(
model_instance.parameters, variable_pool
)
memory = self._memory
# fetch instruction
node_data.instruction = node_data.instruction or ""