usecli 0.1.54__tar.gz → 0.1.55__tar.gz

{usecli-0.1.54 → usecli-0.1.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.54
+Version: 0.1.55
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>

{usecli-0.1.54 → usecli-0.1.55}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.54"
+version = "0.1.55"
 description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
 readme = "README.md"
 authors = [{ name = "Edward Boswell", email = "thememium@gmail.com" }]

{usecli-0.1.54 → usecli-0.1.55}/src/usecli/__init__.py

@@ -4,12 +4,22 @@ from __future__ import annotations
 
 import sys
 from importlib import import_module
+from typing import Any, Optional, Sequence
 
 import click
 import typer
 from click.exceptions import BadParameter, ClickException, Exit, UsageError
 from typer.core import TyperGroup
 
+try:
+    from typer._click.exceptions import BadParameter as TyperBadParameter  # type: ignore[import-untyped]
+    from typer._click.exceptions import ClickException as TyperClickException  # type: ignore[import-untyped]
+    from typer._click.exceptions import UsageError as TyperUsageError  # type: ignore[import-untyped]
+except ImportError:
+    TyperBadParameter = BadParameter
+    TyperClickException = ClickException
+    TyperUsageError = UsageError
+
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.base_command import BaseCommand
 from usecli.cli.core.exceptions import UsecliBadParameter, UsecliUsageError
@@ -156,6 +166,31 @@ class PrefixMatchingGroup(TyperGroup):
 
         return FilteredListCommand(cmd_name)
 
+    def main(
+        self,
+        args: Optional[Sequence[str]] = None,
+        prog_name: Optional[str] = None,
+        complete_var: Optional[str] = None,
+        standalone_mode: bool = True,
+        windows_expand_args: bool = True,
+        **extra: Any,
+    ) -> Any:
+        """Override main to disable standalone mode.
+
+        Click's default standalone_mode=True catches ClickException
+        internally and calls sys.exit(), preventing our custom error
+        handlers from running. Setting standalone_mode=False lets
+        exceptions propagate to our styled error handlers in invoke().
+        """
+        return super().main(
+            args=args,
+            prog_name=prog_name,
+            complete_var=complete_var,
+            standalone_mode=False,
+            windows_expand_args=windows_expand_args,
+            **extra,
+        )
+
     def invoke(self, ctx: click.Context) -> None:
         """Invoke the group with custom error handling.
 
@@ -169,15 +204,15 @@ class PrefixMatchingGroup(TyperGroup):
             return super().invoke(ctx)
         except Exit:
             sys.exit(0)
-        except BadParameter as e:
+        except (BadParameter, TyperBadParameter) as e:
             styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
             styled_error.show()
             sys.exit(styled_error.exit_code)
-        except UsageError as e:
+        except (UsageError, TyperUsageError) as e:
             styled_error = UsecliUsageError(e.message, ctx=e.ctx)
             styled_error.show()
             sys.exit(styled_error.exit_code)
-        except ClickException as e:
+        except (ClickException, TyperClickException) as e:
             if hasattr(e, "show"):
                 e.show()
             sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)
@@ -276,15 +311,15 @@ def main() -> None:
         app()
     except Exit:
         sys.exit(0)
-    except BadParameter as e:
+    except (BadParameter, TyperBadParameter) as e:
         styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except UsageError as e:
+    except (UsageError, TyperUsageError) as e:
         styled_error = UsecliUsageError(e.message, ctx=e.ctx)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except ClickException as e:
+    except (ClickException, TyperClickException) as e:
         if hasattr(e, "show"):
             e.show()
         sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)

{usecli-0.1.54 → usecli-0.1.55}/src/usecli/cli/core/base_command.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, ClassVar, Optional, Sequence
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import typer
 from click.exceptions import Exit
@@ -192,42 +192,6 @@ class CustomHelpCommand(TyperCommand):
             for param in getattr(self, "params", [])
         )
 
-    def main(
-        self,
-        args: Optional[Sequence[str]] = None,
-        prog_name: Optional[str] = None,
-        complete_var: Optional[str] = None,
-        standalone_mode: bool = True,
-        windows_expand_args: bool = True,
-        **extra: Any,
-    ) -> Any:
-        """Override main to disable standalone mode.
-
-        Click's default standalone_mode=True catches ClickException
-        internally and calls sys.exit(), preventing our custom error
-        handlers from running. Setting standalone_mode=False lets
-        exceptions propagate to our styled error handlers.
-
-        Args:
-            args: Command-line arguments.
-            prog_name: Program name for help display.
-            complete_var: Shell completion variable name.
-            standalone_mode: Must be False for custom error handling.
-            windows_expand_args: Windows argument expansion flag.
-            **extra: Additional context arguments.
-
-        Returns:
-            The command return value.
-        """
-        return super().main(
-            args=args,
-            prog_name=prog_name,
-            complete_var=complete_var,
-            standalone_mode=False,
-            windows_expand_args=windows_expand_args,
-            **extra,
-        )
-
     def invoke(self, ctx: ClickContext) -> Any:
         interactive = ctx.params.pop("interactive", False)
         if interactive: