Realized that _CommandFunc and BoundCommandFunc had identical implementation

Deleted _CommandFunc from annotated.py and replaced with BoundCommandFunc from types.py

Author: tleonhardt

cmd2/annotated.py

@@ -309,6 +309,7 @@ def do_build(self, target: str, common: CommonArgs):
 from .exceptions import Cmd2ArgparseError
 from .rich_utils import Cmd2HelpFormatter, HelpContent
 from .types import (
+    BoundCommandFunc,
     CmdOrSetT,
     UnboundChoicesProvider,
     UnboundCompleter,
@@ -318,20 +319,6 @@ def do_build(self, target: str, common: CommonArgs):
 _NargsValue = int | str | tuple[int] | tuple[int, int] | tuple[int, float]
 
 
-class _CommandFunc(Protocol):
-    """The command-function interface required by the annotation machinery.
-
-    The parser builders only depend on a command's name metadata and its
-    boolean command result; they never depend on whether the function is
-    bound or unbound, nor on the types of its parsed arguments.
-    """
-
-    __name__: str
-    __qualname__: str
-
-    def __call__(self, *args: Any, **kwargs: Any) -> bool | None: ...
-
-
 class Cmd2ParserKwargs(TypedDict, total=False):
     """Forwarded ctor kwargs for [`Cmd2ArgumentParser`][cmd2.argparse_utils.Cmd2ArgumentParser] (PEP 692 ``Unpack``).
 
@@ -2132,7 +2119,7 @@ def _link_mutex_group_membership(
             by_name[name].mutex_group_indices.append(index)
 
 
-def _resolve_func_hints(func: _CommandFunc, *, skip_params: frozenset[str] = _SKIP_PARAMS) -> dict[str, Any]:
+def _resolve_func_hints(func: BoundCommandFunc, *, skip_params: frozenset[str] = _SKIP_PARAMS) -> dict[str, Any]:
     """Resolve the type hints for the parameters that become arguments.
 
     The bound first parameter (self/cls), the injected ``skip_params``, and the ``return`` annotation
@@ -2310,7 +2297,7 @@ def _block_field_dest(spec: _BlockSpec, field_name: str) -> str:
     return _shared_field_dest(spec.dc_type, field_name) if spec.shared else field_name
 
 
-def _dataclass_blocks(func: _CommandFunc, *, skip_params: frozenset[str] = _SKIP_PARAMS) -> dict[str, _BlockSpec]:
+def _dataclass_blocks(func: BoundCommandFunc, *, skip_params: frozenset[str] = _SKIP_PARAMS) -> dict[str, _BlockSpec]:
     """Map each dataclass-block parameter name to its :class:`_BlockSpec`.
 
     Used by the runtime handler to reconstruct the dataclass instance from the parsed namespace.  A
@@ -2334,7 +2321,7 @@ def _dataclass_blocks(func: _CommandFunc, *, skip_params: frozenset[str] = _SKIP
 
 
 def _lazy_block_resolver(
-    func: _CommandFunc,
+    func: BoundCommandFunc,
     *,
     base_accepted: set[str],
     skip_params: frozenset[str],
@@ -2391,7 +2378,7 @@ def _reconstruct_dataclass_blocks(func_kwargs: dict[str, Any], blocks: dict[str,
 
 
 def _resolve_parameters(
-    func: _CommandFunc,
+    func: BoundCommandFunc,
     *,
     skip_params: frozenset[str] = _SKIP_PARAMS,
     base_command: bool = False,
@@ -2735,7 +2722,7 @@ def _docstring_first_paragraph(doc: str | None) -> str | None:
 
 
 def build_parser_from_function(
-    func: _CommandFunc,
+    func: BoundCommandFunc,
     *,
     skip_params: frozenset[str] = _SKIP_PARAMS,
     groups: tuple[Group, ...] | None = None,
@@ -2810,7 +2797,7 @@ def build_parser_from_function(
     return parser
 
 
-def _derive_subcommand_name(func: _CommandFunc, subcommand_to: str) -> str:
+def _derive_subcommand_name(func: BoundCommandFunc, subcommand_to: str) -> str:
     """Derive the subcommand name from the function name and validate the naming convention.
 
     ``subcommand_to='team member'`` + ``func.__name__='team_member_add'`` -> ``'add'``.
@@ -2846,7 +2833,7 @@ class _ParserBuildOptions:
 
 
 def _make_parser_builder(
-    func: _CommandFunc,
+    func: BoundCommandFunc,
     *,
     skip_params: frozenset[str],
     base_command: bool,
@@ -2885,12 +2872,12 @@ def parser_builder() -> Cmd2ArgumentParser:
 
 
 def _build_subcommand_handler(
-    func: _CommandFunc,
+    func: BoundCommandFunc,
     subcommand_to: str,
     *,
     base_command: bool = False,
     options: _ParserBuildOptions,
-) -> tuple[_CommandFunc, str, Callable[[], Cmd2ArgumentParser]]:
+) -> tuple[BoundCommandFunc, str, Callable[[], Cmd2ArgumentParser]]:
     """Build a subcommand's parser and a handler that unpacks the Namespace into typed kwargs.
 
     :param func: the subcommand handler function
@@ -2936,7 +2923,7 @@ def handler(self_arg: Any, ns: Any) -> Any:
 _CommandParams = ParamSpec("_CommandParams")
 
 
-class _AnnotatedCommand(_CommandFunc, Protocol[_CommandParams]):
+class _AnnotatedCommand(BoundCommandFunc, Protocol[_CommandParams]):
     """A callable command method with the metadata used by ``with_annotated``."""
 
     def __call__(self, *args: _CommandParams.args, **kwargs: _CommandParams.kwargs) -> bool | None: ...