From 1b32e70dc5eb9f479185c2291dba3147a2c92d98 Mon Sep 17 00:00:00 2001
From: FFXN <lizy@dify.ai>
Date: Wed, 18 Mar 2026 10:51:07 +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.

---
 .../console/datasets/rag_pipeline/rag_pipeline.py    |  2 ++
 .../pipeline_template/remote/remote_retrieval.py     | 12 ++++++++----
 api/services/rag_pipeline/rag_pipeline.py            | 10 +++++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline.py
index 6e0cd31b8d..b4b42ed594 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline.py
@@ -46,6 +46,8 @@ class PipelineTemplateDetailApi(Resource):
         type = request.args.get("type", default="built-in", type=str)
         rag_pipeline_service = RagPipelineService()
         pipeline_template = rag_pipeline_service.get_pipeline_template_detail(template_id, type)
+        if not pipeline_template:
+            return {"error": "Pipeline template not found from upstream service."}, 404
         return pipeline_template, 200
 
 
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 571ca6c7a6..5820a51ac3 100644
--- a/api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py
+++ b/api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py
@@ -35,17 +35,21 @@ class RemotePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
         return PipelineTemplateType.REMOTE
 
     @classmethod
-    def fetch_pipeline_template_detail_from_dify_official(cls, template_id: str) -> dict | None:
+    def fetch_pipeline_template_detail_from_dify_official(cls, template_id: str) -> dict:
         """
         Fetch pipeline template detail from dify official.
-        :param template_id: Pipeline ID
-        :return:
+
+        :param template_id: Pipeline template ID
+        :return: Template detail dict
+        :raises ValueError: When upstream returns a non-200 status code
         """
         domain = dify_config.HOSTED_FETCH_PIPELINE_TEMPLATES_REMOTE_DOMAIN
         url = f"{domain}/pipeline-templates/{template_id}"
         response = httpx.get(url, timeout=httpx.Timeout(10.0, connect=3.0))
         if response.status_code != 200:
-            return None
+            raise ValueError(
+                f"fetch pipeline template detail failed, status_code: {response.status_code}, response: {response.text}"
+            )
         data: dict = response.json()
         return data
 
diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py
index 2118043a98..015a9aee04 100644
--- a/api/services/rag_pipeline/rag_pipeline.py
+++ b/api/services/rag_pipeline/rag_pipeline.py
@@ -117,13 +117,21 @@ class RagPipelineService:
     def get_pipeline_template_detail(cls, template_id: str, type: str = "built-in") -> dict | None:
         """
         Get pipeline template detail.
+
         :param template_id: template id
-        :return:
+        :param type: template type, "built-in" or "customized"
+        :return: template detail dict, or None if not found
         """
         if type == "built-in":
             mode = dify_config.HOSTED_FETCH_PIPELINE_TEMPLATES_MODE
             retrieval_instance = PipelineTemplateRetrievalFactory.get_pipeline_template_factory(mode)()
             built_in_result: dict | None = retrieval_instance.get_pipeline_template_detail(template_id)
+            if not built_in_result:
+                logger.warning(
+                    "pipeline template not found after all retrieval attempts, template_id: %s, mode: %s",
+                    template_id,
+                    mode,
+                )
             return built_in_result
         else:
             mode = "customized"