From b4227b195e8d933381f8281fdbf7086a8e6c6c85 Mon Sep 17 00:00:00 2001
From: GareArc <garethcxy@dify.ai>
Date: Wed, 11 Mar 2026 19:01:45 -0700
Subject: [PATCH] Squash merge fix/enterprise-api-error-handling into
 release/e-1.12.1

---
 .../enterprise/plugin_manager_service.py      | 21 +++++
 .../enterprise/test_plugin_manager_service.py | 86 +++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 api/tests/unit_tests/services/enterprise/test_plugin_manager_service.py

diff --git a/api/services/enterprise/plugin_manager_service.py b/api/services/enterprise/plugin_manager_service.py
index 817dbd95f8..48023f408c 100644
--- a/api/services/enterprise/plugin_manager_service.py
+++ b/api/services/enterprise/plugin_manager_service.py
@@ -28,6 +28,11 @@ class CheckCredentialPolicyComplianceRequest(BaseModel):
         return data
 
 
+class PreUninstallPluginRequest(BaseModel):
+    tenant_id: str
+    plugin_unique_identifier: str
+
+
 class CredentialPolicyViolationError(BaseServiceError):
     pass
 
@@ -55,3 +60,19 @@ class PluginManagerService:
             body.dify_credential_id,
             ret.get("result", False),
         )
+
+    @classmethod
+    def try_pre_uninstall_plugin(cls, body: PreUninstallPluginRequest):
+        try:
+            # the invocation must be synchronous.
+            EnterprisePluginManagerRequest.send_request(
+                "POST",
+                "/pre-uninstall-plugin",
+                json=body.model_dump(),
+            )
+        except Exception:
+            logger.exception(
+                "failed to perform pre uninstall plugin hook. tenant_id: %s, plugin_unique_identifier: %s",
+                body.tenant_id,
+                body.plugin_unique_identifier,
+            )
diff --git a/api/tests/unit_tests/services/enterprise/test_plugin_manager_service.py b/api/tests/unit_tests/services/enterprise/test_plugin_manager_service.py
new file mode 100644
index 0000000000..dc084b6eb8
--- /dev/null
+++ b/api/tests/unit_tests/services/enterprise/test_plugin_manager_service.py
@@ -0,0 +1,86 @@
+"""Unit tests for PluginManagerService.
+
+This module covers the pre-uninstall plugin hook behavior:
+- Successful API call: no exception raised, correct request sent
+- API failure: soft-fail (logs and does not re-raise)
+"""
+
+from unittest.mock import patch
+
+from httpx import HTTPStatusError
+
+from services.enterprise.plugin_manager_service import (
+    PluginManagerService,
+    PreUninstallPluginRequest,
+)
+
+
+class TestTryPreUninstallPlugin:
+    def test_try_pre_uninstall_plugin_success(self):
+        body = PreUninstallPluginRequest(
+            tenant_id="tenant-123",
+            plugin_unique_identifier="com.example.my_plugin",
+        )
+
+        with patch(
+            "services.enterprise.plugin_manager_service.EnterprisePluginManagerRequest.send_request"
+        ) as mock_send_request:
+            mock_send_request.return_value = {}
+
+            PluginManagerService.try_pre_uninstall_plugin(body)
+
+            mock_send_request.assert_called_once_with(
+                "POST",
+                "/pre-uninstall-plugin",
+                json={"tenant_id": "tenant-123", "plugin_unique_identifier": "com.example.my_plugin"},
+            )
+
+    def test_try_pre_uninstall_plugin_http_error_soft_fails(self):
+        body = PreUninstallPluginRequest(
+            tenant_id="tenant-456",
+            plugin_unique_identifier="com.example.other_plugin",
+        )
+
+        with (
+            patch(
+                "services.enterprise.plugin_manager_service.EnterprisePluginManagerRequest.send_request"
+            ) as mock_send_request,
+            patch("services.enterprise.plugin_manager_service.logger") as mock_logger,
+        ):
+            mock_send_request.side_effect = HTTPStatusError(
+                "502 Bad Gateway",
+                request=None,
+                response=None,
+            )
+
+            PluginManagerService.try_pre_uninstall_plugin(body)
+
+            mock_send_request.assert_called_once_with(
+                "POST",
+                "/pre-uninstall-plugin",
+                json={"tenant_id": "tenant-456", "plugin_unique_identifier": "com.example.other_plugin"},
+            )
+            mock_logger.exception.assert_called_once()
+
+    def test_try_pre_uninstall_plugin_generic_exception_soft_fails(self):
+        body = PreUninstallPluginRequest(
+            tenant_id="tenant-789",
+            plugin_unique_identifier="com.example.failing_plugin",
+        )
+
+        with (
+            patch(
+                "services.enterprise.plugin_manager_service.EnterprisePluginManagerRequest.send_request"
+            ) as mock_send_request,
+            patch("services.enterprise.plugin_manager_service.logger") as mock_logger,
+        ):
+            mock_send_request.side_effect = ConnectionError("network unreachable")
+
+            PluginManagerService.try_pre_uninstall_plugin(body)
+
+            mock_send_request.assert_called_once_with(
+                "POST",
+                "/pre-uninstall-plugin",
+                json={"tenant_id": "tenant-789", "plugin_unique_identifier": "com.example.failing_plugin"},
+            )
+            mock_logger.exception.assert_called_once()