From b85af2ec47ffe621e5f1c751b87e73baaf9d2424 Mon Sep 17 00:00:00 2001
From: FFXN <lizy@dify.ai>
Date: Wed, 18 Mar 2026 11:20:50 +0800
Subject: [PATCH] fix: When can not obtain pipeline template detail failed from
 upstream service including remote template service and database, return
 responding error message.

---
 .../remote/remote_retrieval.py                |  7 +++-
 .../rag_pipeline/test_rag_pipeline.py         | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py b/api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py
index c5d36eb720..c5775d9a37 100644
--- a/api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py
+++ b/api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py
@@ -15,7 +15,8 @@ class RemotePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
     Retrieval recommended app from dify official
     """
 
-    def get_pipeline_template_detail(self, template_id: str):
+    def get_pipeline_template_detail(self, template_id: str) -> dict | None:
+        result: dict | None
         try:
             result = self.fetch_pipeline_template_detail_from_dify_official(template_id)
         except Exception as e:
@@ -48,7 +49,9 @@ class RemotePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
         response = httpx.get(url, timeout=httpx.Timeout(10.0, connect=3.0))
         if response.status_code != 200:
             raise ValueError(
-                f"fetch pipeline template detail failed, status_code: {response.status_code}, response: {response.text[:1000]}"
+                f"fetch pipeline template detail failed,"
+                + f" status_code: {response.status_code},"
+                + f" response: {response.text[:1000]}"
             )
         data: dict = response.json()
         return data
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py
index 3b8679f4ec..ebbb34e069 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py
@@ -59,6 +59,44 @@ class TestPipelineTemplateDetailApi:
         assert status == 200
         assert response == template
 
+    def test_get_returns_404_when_template_not_found(self, app):
+        api = PipelineTemplateDetailApi()
+        method = unwrap(api.get)
+
+        service = MagicMock()
+        service.get_pipeline_template_detail.return_value = None
+
+        with (
+            app.test_request_context("/?type=built-in"),
+            patch(
+                "controllers.console.datasets.rag_pipeline.rag_pipeline.RagPipelineService",
+                return_value=service,
+            ),
+        ):
+            response, status = method(api, "non-existent-id")
+
+        assert status == 404
+        assert "error" in response
+
+    def test_get_returns_404_for_customized_type_not_found(self, app):
+        api = PipelineTemplateDetailApi()
+        method = unwrap(api.get)
+
+        service = MagicMock()
+        service.get_pipeline_template_detail.return_value = None
+
+        with (
+            app.test_request_context("/?type=customized"),
+            patch(
+                "controllers.console.datasets.rag_pipeline.rag_pipeline.RagPipelineService",
+                return_value=service,
+            ),
+        ):
+            response, status = method(api, "non-existent-id")
+
+        assert status == 404
+        assert "error" in response
+
 
 class TestCustomizedPipelineTemplateApi:
     def test_patch_success(self, app):