Merge branch 'refs/heads/main' into feat/workflow-parallel-support

# Conflicts:
#	api/core/workflow/nodes/code/code_node.py
#	api/core/workflow/nodes/end/end_node.py
#	api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
#	api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
#	api/core/workflow/nodes/variable_aggregator/variable_aggregator_node.py
This commit is contained in:
takatost
2024-07-23 16:18:34 +08:00
87 changed files with 2153 additions and 517 deletions

View File

@ -405,7 +405,7 @@ class LLMNode(BaseNode):
if 'content' not in item:
raise ValueError(f'Invalid context structure: {item}')
context_str += item['content'] + '\n'
context_str += item['content'].text + '\n'
retriever_resource = self._convert_to_original_retriever_resource(item)
if retriever_resource: