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

api/controllers/console/datasets/rag_pipeline/rag_pipeline.py

@@ -158,5 +158,5 @@ api.add_resource(
 )
 api.add_resource(
     PublishCustomizedPipelineTemplateApi,
-    "/rag/pipeline/customized/pipelines/<string:pipeline_id>/publish",
+    "/rag/pipeline/<string:pipeline_id>/customized/publish",
 )

api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py

@@ -300,6 +300,7 @@ class PublishedRagPipelineRunApi(Resource):
         except InvokeRateLimitError as ex:
             raise InvokeRateLimitHttpError(ex.description)
 
+
 class RagPipelinePublishedDatasourceNodeRunStatusApi(Resource):
     @setup_required
     @login_required
@@ -340,6 +341,7 @@ class RagPipelinePublishedDatasourceNodeRunStatusApi(Resource):
 
         return result
 
+
 class RagPipelineDraftDatasourceNodeRunStatusApi(Resource):
     @setup_required
     @login_required
@@ -379,7 +381,7 @@ class RagPipelineDraftDatasourceNodeRunStatusApi(Resource):
         )
 
         return result
-    
+
 
 class RagPipelinePublishedDatasourceNodeRunApi(Resource):
     @setup_required
@@ -421,6 +423,7 @@ class RagPipelinePublishedDatasourceNodeRunApi(Resource):
 
         return result
 
+
 class RagPipelineDrafDatasourceNodeRunApi(Resource):
     @setup_required
     @login_required
@@ -461,6 +464,7 @@ class RagPipelineDrafDatasourceNodeRunApi(Resource):
 
         return result
 
+
 class RagPipelinePublishedNodeRunApi(Resource):
     @setup_required
     @login_required
@@ -798,6 +802,7 @@ class PublishedRagPipelineSecondStepApi(Resource):
             "variables": variables,
         }
 
+
 class PublishedRagPipelineFirstStepApi(Resource):
     @setup_required
     @login_required
@@ -822,6 +827,7 @@ class PublishedRagPipelineFirstStepApi(Resource):
             "variables": variables,
         }
 
+
 class DraftRagPipelineFirstStepApi(Resource):
     @setup_required
     @login_required
@@ -846,6 +852,7 @@ class DraftRagPipelineFirstStepApi(Resource):
             "variables": variables,
         }
 
+
 class DraftRagPipelineSecondStepApi(Resource):
     @setup_required
     @login_required

api/services/rag_pipeline/rag_pipeline.py

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