moved to exception

Author: Mohamed Zeidan

src/sagemaker/hyperpod/cli/commands/inference.py

@@ -14,7 +14,7 @@
     _hyperpod_telemetry_emitter,
 )
 from sagemaker.hyperpod.common.telemetry.constants import Feature
-from sagemaker.hyperpod.common.cli_decorators import handle_cli_exceptions, smart_cli_exception_handler
+from sagemaker.hyperpod.common.cli_decorators import handle_cli_exceptions
 
 
 # CREATE
@@ -561,7 +561,7 @@ def custom_describe(
     help="Optional. The namespace of the jumpstart model endpoint to delete. Default set to 'default'.",
 )
 @_hyperpod_telemetry_emitter(Feature.HYPERPOD_CLI, "delete_js_endpoint_cli")
-@smart_cli_exception_handler
+@handle_cli_exceptions
 def js_delete(
     name: str,
     namespace: Optional[str],

src/sagemaker/hyperpod/common/cli_decorators.py

@@ -13,63 +13,6 @@
 logger = logging.getLogger(__name__)
 
 def handle_cli_exceptions(func):
-    """
-    Decorator that provides consistent exception handling for CLI commands.
-    
-    Replaces the repetitive pattern:
-        except Exception as e:
-            click.echo(str(e))
-            import sys
-            sys.exit(1)
-    
-    Usage:
-        @handle_cli_exceptions
-        @click.command()
-        def my_command():
-            # Command logic here
-            pass
-    """
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except Exception as e:
-            # Clean error output - no "Error:" prefix or "Aborted!" suffix
-            click.echo(str(e))
-            sys.exit(1)
-    
-    return wrapper
-
-def handle_cli_exceptions_with_debug(func):
-    """
-    Enhanced decorator that provides debug information when requested.
-    
-    This version logs the full exception details for debugging purposes
-    while still showing clean messages to users.
-    
-    Usage:
-        @handle_cli_exceptions_with_debug
-        @click.command()
-        def my_command():
-            # Command logic here
-            pass
-    """
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except Exception as e:
-            # Log full exception details for debugging
-            logger.debug(f"CLI command failed: {func.__name__}", exc_info=True)
-            
-            # Clean error output for users
-            click.echo(str(e))
-            sys.exit(1)
-    
-    return wrapper
-
-
-def smart_cli_exception_handler(func):
     """
     Smart decorator that automatically detects resource/operation types and applies
     enhanced 404 handling. Eliminates repetitive exception handling across CLI commands.
@@ -81,7 +24,7 @@ def smart_cli_exception_handler(func):
     4. Handles all other exceptions consistently
     
     Usage:
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         @click.command("hyp-jumpstart-endpoint")
         def js_delete(name, namespace):
             # Command logic here - no try/catch needed!
@@ -127,22 +70,22 @@ def _detect_resource_type(func) -> ResourceType:
     Returns:
         ResourceType enum or None if not detected
     """
+    # First try to get the Click command name from the decorator
     try:
-        # First try to get the Click command name from the decorator
-        if hasattr(func, 'name'):
+        if hasattr(func, 'name') and func.name and isinstance(func.name, str):
             command_name = func.name.lower()
             if 'jumpstart' in command_name:
                 return ResourceType.HYP_JUMPSTART_ENDPOINT
             elif 'custom' in command_name:
                 return ResourceType.HYP_CUSTOM_ENDPOINT
             elif 'pytorch' in command_name:
                 return ResourceType.HYP_PYTORCH_JOB
-        
-        # Fallback to function name detection
-        try:
-            func_name = func.__name__.lower()
-        except (AttributeError, TypeError):
-            func_name = ""
+    except (AttributeError, TypeError):
+        pass
+    
+    # Fallback to function name detection
+    try:
+        func_name = func.__name__.lower()
 
         # Function name patterns
         if 'js_' in func_name or 'jumpstart' in func_name:
@@ -151,12 +94,11 @@ def _detect_resource_type(func) -> ResourceType:
             return ResourceType.HYP_CUSTOM_ENDPOINT
         elif 'pytorch' in func_name or 'training' in func_name:
             return ResourceType.HYP_PYTORCH_JOB
-        
-        return None
-        
-    except Exception:
-        # Handle any other exceptions during detection gracefully
-        return None
+            
+    except (AttributeError, TypeError):
+        pass
+    
+    return None
 
 
 def _detect_operation_type(func) -> OperationType:

test/unit_tests/error_handling/test_cli_decorators.py

@@ -10,8 +10,6 @@
 
 from sagemaker.hyperpod.common.cli_decorators import (
     handle_cli_exceptions,
-    handle_cli_exceptions_with_debug,
-    smart_cli_exception_handler,
     _detect_resource_type,
     _detect_operation_type
 )
@@ -56,50 +54,12 @@ def documented_function():
         assert documented_function.__doc__ == "This is a test function."
 
 
-class TestHandleCliExceptionsWithDebug:
-    """Test handle_cli_exceptions_with_debug decorator."""
+class TestHandleCliExceptions404Handling:
+    """Test handle_cli_exceptions decorator 404 handling functionality."""
 
     def test_successful_function_execution(self):
         """Test decorator allows successful function execution."""
-        @handle_cli_exceptions_with_debug
-        def test_function():
-            return "success"
-        
-        result = test_function()
-        assert result == "success"
-    
-    @patch('sagemaker.hyperpod.common.cli_decorators.click')
-    @patch('sagemaker.hyperpod.common.cli_decorators.sys')
-    @patch('sagemaker.hyperpod.common.cli_decorators.logger')
-    def test_exception_handling_with_debug(self, mock_logger, mock_sys, mock_click):
-        """Test decorator handles exceptions with debug logging."""
-        @handle_cli_exceptions_with_debug
-        def failing_function():
-            raise Exception("Debug test error")
-        
-        failing_function()
-        
-        mock_logger.debug.assert_called_once()
-        mock_click.echo.assert_called_once_with("Debug test error")
-        mock_sys.exit.assert_called_once_with(1)
-    
-    def test_preserves_function_metadata(self):
-        """Test decorator preserves original function metadata."""
-        @handle_cli_exceptions_with_debug
-        def documented_function():
-            """This is a debug test function."""
-            pass
-        
-        assert documented_function.__name__ == "documented_function"
-        assert documented_function.__doc__ == "This is a debug test function."
-
-
-class TestSmartCliExceptionHandler:
-    """Test smart_cli_exception_handler decorator."""
-    
-    def test_successful_function_execution(self):
-        """Test decorator allows successful function execution."""
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def test_function():
             return "success"
 
@@ -114,7 +74,7 @@ def test_404_exception_handling(self, mock_sys, mock_click, mock_handle_404):
         # Create 404 ApiException
         api_exception = ApiException(status=404, reason="Not Found")
 
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def js_delete(name, namespace):
             raise api_exception
 
@@ -137,7 +97,7 @@ def js_delete(name, namespace):
     @patch('sagemaker.hyperpod.common.cli_decorators.sys')
     def test_non_404_exception_handling(self, mock_sys, mock_click):
         """Test decorator handles non-404 exceptions normally."""
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def failing_function():
             raise Exception("Generic error")
 
@@ -150,7 +110,7 @@ def failing_function():
     @patch('sagemaker.hyperpod.common.cli_decorators.sys')
     def test_non_api_exception_handling(self, mock_sys, mock_click):
         """Test decorator handles non-ApiException errors normally."""
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def failing_function():
             raise ValueError("Value error")
 
@@ -166,7 +126,7 @@ def test_404_detection_failure_fallback(self, mock_sys, mock_click, mock_handle_
         """Test decorator falls back when resource/operation detection fails."""
         api_exception = ApiException(status=404, reason="Not Found")
 
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def unknown_function(name, namespace):
             raise api_exception
 
@@ -179,7 +139,7 @@ def unknown_function(name, namespace):
 
     def test_preserves_function_metadata(self):
         """Test decorator preserves original function metadata."""
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def documented_function():
             """This is a smart test function."""
             pass
@@ -303,7 +263,7 @@ def test_complete_jumpstart_delete_flow(self, mock_sys, mock_click, mock_handle_
         api_exception = ApiException(status=404, reason="Not Found")
         mock_handle_404.side_effect = Exception("Enhanced 404 message")
 
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def js_delete(name, namespace="default"):
             raise api_exception
 
@@ -327,7 +287,7 @@ def test_complete_custom_describe_flow(self, mock_sys, mock_click, mock_handle_4
         api_exception = ApiException(status=404, reason="Not Found")
         mock_handle_404.side_effect = Exception("Custom endpoint not found message")
 
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def custom_describe(name, namespace="default"):
             raise api_exception
 
@@ -351,7 +311,7 @@ def test_complete_training_list_flow(self, mock_sys, mock_click, mock_handle_404
         api_exception = ApiException(status=404, reason="Not Found")
         mock_handle_404.side_effect = Exception("Training job not found message")
 
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def training_list(name, namespace="default"):
             raise api_exception
 
@@ -371,7 +331,7 @@ def training_list(name, namespace="default"):
     @patch('sagemaker.hyperpod.common.cli_decorators.sys')
     def test_non_404_exception_passthrough(self, mock_sys, mock_click):
         """Test non-404 exceptions are handled normally."""
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def js_delete(name, namespace="default"):
             raise ValueError("Invalid configuration")
 
@@ -382,7 +342,7 @@ def js_delete(name, namespace="default"):
 
     def test_function_with_no_exceptions(self):
         """Test function that completes successfully."""
-        @smart_cli_exception_handler
+        @handle_cli_exceptions
         def successful_function(name, namespace="default"):
             return f"Success: {name} in {namespace}"