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

api/controllers/console/datasets/datasets_document.py

@@ -1,3 +1,4 @@
+import json
 import logging
 from argparse import ArgumentTypeError
 from datetime import UTC, datetime
@@ -1116,7 +1117,7 @@ class DocumentPipelineExecutionLogApi(DocumentResource):
         if not log:
             return {"datasource_info": None, "datasource_type": None, "input_data": None}, 200
         return {
-            "datasource_info": log.datasource_info,
+            "datasource_info": json.loads(log.datasource_info),
             "datasource_type": log.datasource_type,
             "input_data": log.input_data,
         }, 200
@@ -1144,3 +1145,5 @@ api.add_resource(DocumentRetryApi, "/datasets/<uuid:dataset_id>/retry")
 api.add_resource(DocumentRenameApi, "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/rename")
 
 api.add_resource(WebsiteDocumentSyncApi, "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/website-sync")
+api.add_resource(DocumentPipelineExecutionLogApi, 
+                 "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/pipeline-execution-log")

api/core/app/apps/pipeline/pipeline_generator.py

@@ -140,7 +140,7 @@ class PipelineGenerator(BaseAppGenerator):
                 document_pipeline_execution_log = DocumentPipelineExecutionLog(
                     document_id=document_id,
                     datasource_type=datasource_type,
-                    datasource_info=datasource_info,
+                    datasource_info=json.dumps(datasource_info),
                     input_data=inputs,
                     pipeline_id=pipeline.id,
                     created_by=user.id,