Revert "Merge PR sooperset#572: DRAFT - fix(decorators): Propagate API errors instead of returning empty list"

This reverts commit e10f234, reversing
changes made to b5743cf.

Author: nszceta

src/mcp_atlassian/utils/decorators.py

@@ -89,6 +89,13 @@ def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
                 operation_name = getattr(func, "__name__", "API operation")
                 logger.error(f"Error processing {operation_name} results: {str(e)}")
                 return []
+            except Exception as e:  # noqa: BLE001 - Intentional fallback with logging
+                operation_name = getattr(func, "__name__", "API operation")
+                logger.error(f"Unexpected error during {operation_name}: {str(e)}")
+                logger.debug(
+                    f"Full exception details for {operation_name}:", exc_info=True
+                )
+                return []
 
         return wrapper
 

tests/unit/confluence/test_search.py

@@ -4,7 +4,6 @@
 
 import pytest
 import requests
-from atlassian.errors import ApiValueError
 from requests import HTTPError
 
 from mcp_atlassian.confluence.search import SearchMixin
@@ -257,6 +256,18 @@ def test_search_with_config_spaces_filter(self, search_mixin):
         )
         assert len(result) == 1
 
+    def test_search_general_exception(self, search_mixin):
+        """Test handling of general exceptions during search."""
+        # Mock a general exception
+        search_mixin.confluence.cql.side_effect = Exception("General error")
+
+        # Act
+        results = search_mixin.search("error query")
+
+        # Assert
+        assert isinstance(results, list)
+        assert len(results) == 0
+
     def test_search_user_success(self, search_mixin):
         """Test search_user with successful results."""
         # Prepare the mock response
@@ -358,6 +369,7 @@ def test_search_user_with_custom_limit(self, search_mixin):
             (requests.RequestException, ("Network error",), []),
             (ValueError, ("Value error",), []),
             (TypeError, ("Type error",), []),
+            (Exception, ("General error",), []),
             (KeyError, ("Missing key",), []),
         ],
     )
@@ -375,37 +387,6 @@ def test_search_user_exception_handling(
         assert isinstance(results, list)
         assert results == expected_result
 
-    def test_search_propagated_exception_handling(self, search_mixin):
-        """Test that general Exceptions are propagated from the search method."""
-        # Mock a general exception
-        search_mixin.confluence.cql.side_effect = Exception("General error")
-
-        # Act and Assert
-        with pytest.raises(Exception, match="General error"):
-            search_mixin.search("error query")
-
-    def test_search_user_propagated_exception_handling(self, search_mixin):
-        """Test that general Exceptions are propagated from the search_user method."""
-        # Mock a general exception
-        search_mixin.confluence.get.side_effect = Exception("General error")
-
-        # Act and Assert
-        with pytest.raises(Exception, match="General error"):
-            search_mixin.search_user('user.fullname ~ "Test"')
-
-    def test_api_value_error_is_raised(self, search_mixin):
-        """Test that ApiValueError from the underlying library is raised, not suppressed."""
-        # Arrange
-        # Mock the cql method to raise ApiValueError, simulating an invalid query
-        search_mixin.confluence.cql.side_effect = ApiValueError(
-            "The query cannot be parsed", response=MagicMock()
-        )
-
-        # Act & Assert
-        # The decorator should now let this exception propagate instead of returning []
-        with pytest.raises(ApiValueError):
-            search_mixin.search("this is an invalid query")
-
     @pytest.mark.parametrize(
         "status_code,exception_type",
         [
@@ -460,12 +441,14 @@ def test_search_user_edge_cases(self, search_mixin, mock_response, expected_leng
         assert isinstance(results, list)
         assert len(results) == expected_length
 
+    # You can also parametrize the regular search method exception tests:
     @pytest.mark.parametrize(
         "exception_type,exception_args,expected_result",
         [
             (requests.RequestException, ("API error",), []),
             (ValueError, ("Value error",), []),
             (TypeError, ("Type error",), []),
+            (Exception, ("General error",), []),
             (KeyError, ("Missing key",), []),
         ],
     )
@@ -483,6 +466,7 @@ def test_search_exception_handling(
         assert isinstance(results, list)
         assert results == expected_result
 
+    # Parametrize CQL query tests:
     @pytest.mark.parametrize(
         "query,limit,expected_params",
         [