Merge branch 'feat/r2' into deploy/rag-dev

# Conflicts:
#	docker/docker-compose.middleware.yaml
This commit is contained in:
jyong 2025-06-06 15:06:47 +08:00
commit 06dfc32e0f

View File

@ -103,17 +103,18 @@ class DatasourceNode(BaseNode[DatasourceNodeData]):
inputs=parameters_for_log, inputs=parameters_for_log,
metadata={WorkflowNodeExecutionMetadataKey.DATASOURCE_INFO: datasource_info}, metadata={WorkflowNodeExecutionMetadataKey.DATASOURCE_INFO: datasource_info},
outputs={ outputs={
"online_document": online_document_result.result.model_dump(), **online_document_result.result.model_dump(),
"datasource_type": datasource_type, "datasource_type": datasource_type,
}, },
) )
case DatasourceProviderType.WEBSITE_CRAWL: case DatasourceProviderType.WEBSITE_CRAWL:
return NodeRunResult( return NodeRunResult(
status=WorkflowNodeExecutionStatus.SUCCEEDED, status=WorkflowNodeExecutionStatus.SUCCEEDED,
inputs=parameters_for_log, inputs=parameters_for_log,
metadata={WorkflowNodeExecutionMetadataKey.DATASOURCE_INFO: datasource_info}, metadata={WorkflowNodeExecutionMetadataKey.DATASOURCE_INFO: datasource_info},
outputs={ outputs={
"website": datasource_info, **datasource_info,
"datasource_type": datasource_type, "datasource_type": datasource_type,
}, },
) )