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

api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py

@@ -73,6 +73,6 @@ class CustomizedPipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
             "icon_info": pipeline_template.icon,
             "description": pipeline_template.description,
             "chunk_structure": pipeline_template.chunk_structure,
-            "export_data": yaml.safe_load(pipeline_template.yaml_content),
+            "export_data": pipeline_template.yaml_content,
             "created_by": pipeline_template.created_user_name,
         }

api/services/rag_pipeline/pipeline_template/database/database_retrieval.py

@@ -72,7 +72,7 @@ class DatabasePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
             "name": pipeline_template.name,
             "icon_info": pipeline_template.icon,
             "chunk_structure": pipeline_template.chunk_structure,
-            "export_data": yaml.safe_load(pipeline_template.yaml_content),
+            "export_data": pipeline_template.yaml_content,
             "created_by": pipeline_template.created_user_name,
             "description": pipeline_template.description,
         }

api/services/rag_pipeline/rag_pipeline.py

@@ -474,9 +474,9 @@ class RagPipelineService:
                     provider_type=datasource_runtime.datasource_provider_type(),
                 )
                 return {
-                    "result": [result.model_dump() for result in website_crawl_result.result],
+                    "result": [result for result in website_crawl_result.result],
-                    "job_id": website_crawl_result.job_id,
+                    "job_id": website_crawl_result.result.job_id,
-                    "status": website_crawl_result.status,
+                    "status": website_crawl_result.result.status,
                     "provider_type": datasource_node_data.get("provider_type"),
                 }
             case _: