Tighten mypy: globus_cli.parsing

src/globus_cli/parsing/commands.py

@@ -90,6 +90,9 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
     def invoke(self, ctx: click.Context) -> t.Any:
         log.debug("command invoke start")
         try:
+            # this isn't forcing interactive mode, it's just checking to see that
+            # the GLOBUS_CLI_INTERACTIVE valude is *valid*
+            env_interactive(raising=True)
             return super().invoke(ctx)
         finally:
             log.debug("command invoke exit")
@@ -128,12 +131,6 @@ def parse_args(self, ctx: click.Context, args: list[str]) -> list[str]:
             raise
 
 
-class GlobusCommandEnvChecks(GlobusCommand):
-    def invoke(self, ctx: click.Context) -> t.Any:
-        env_interactive(raising=True)
-        return super().invoke(ctx)
-
-
 class GlobusCommandGroup(click.Group):
     """
     This is a click.Group with any customizations which we deem necessary
@@ -229,32 +226,21 @@ def decorator(f: C) -> TopLevelGroup:
     return decorator
 
 
-def command(
-    *args: t.Any, **kwargs: t.Any
-) -> t.Callable[[C], GlobusCommand | GlobusCommandEnvChecks]:
+def command(*args: t.Any, **kwargs: t.Any) -> t.Callable[[C], GlobusCommand]:
     """
     A helper for decorating commands a-la `click.command`, but pulling the help string
     from `<function>.__doc__` by default.
 
     Also allows the use of custom arguments, which are stored on the command, as in
     "adoc_examples".
-
-    `skip_env_checks` is used to disable environment variable validation prior to
-    running a command, but is ignored when a specific `cls` argument is passed.
     """
     disable_opts = kwargs.pop("disable_options", [])
 
-    def _inner_decorator(func: C) -> GlobusCommand | GlobusCommandEnvChecks:
-        if "cls" not in kwargs:
-            if kwargs.get("skip_env_checks", False) is True:
-                kwargs["cls"] = GlobusCommand
-            else:
-                kwargs["cls"] = GlobusCommandEnvChecks
-
+    def _inner_decorator(func: C) -> GlobusCommand:
         kwargs["globus_disable_opts"] = disable_opts
 
-        return common_options(disable_options=disable_opts)(  # type: ignore[no-any-return]  # noqa: E501
-            click.command(*args, **kwargs)(func)
+        return common_options(disable_options=disable_opts)(
+            click.command(*args, cls=GlobusCommand, **kwargs)(func)
         )
 
     return _inner_decorator