Updated types for some functions in completion.py.

Author: kmvanbrunt

cmd2/argparse_completer.py

@@ -36,6 +36,7 @@
 )
 from .command_definition import CommandSet
 from .completion import (
+    Choices,
     CompletionItem,
     Completions,
     all_display_numeric,
@@ -697,9 +698,7 @@ def _get_raw_choices(self, arg_state: _ArgumentState) -> list[CompletionItem] |
                 ]
 
             # Standard choices
-            return [
-                choice if isinstance(choice, CompletionItem) else CompletionItem(choice) for choice in arg_state.action.choices
-            ]
+            return Choices.from_values(arg_state.action.choices)
 
         choices_callable: ChoicesCallable | None = arg_state.action.get_choices_callable()  # type: ignore[attr-defined]
         return choices_callable

cmd2/completion.py

@@ -4,6 +4,7 @@
 import sys
 from collections.abc import (
     Callable,
+    Collection,
     Iterator,
     Sequence,
 )
@@ -148,13 +149,13 @@ def __post_init__(self) -> None:
         object.__setattr__(self, "items", tuple(unique_items))
 
     @classmethod
-    def from_values(cls, values: Sequence[str], *, is_sorted: bool = False) -> Self:
-        """Create a completion results instance from a sequence of arbitrary objects.
+    def from_values(cls, values: Iterator[Any], *, is_sorted: bool = False) -> Self:
+        """Create a CompletionItem instance from arbitrary objects.
 
         :param values: the raw objects (e.g. strs, ints, Paths) to be converted into CompletionItems.
         :param is_sorted: whether the values are already in the desired order.
         """
-        items = [CompletionItem(value=v) for v in values]
+        items = [v if isinstance(v, CompletionItem) else CompletionItem(value=v) for v in values]
         return cls(items=items, is_sorted=is_sorted)
 
     def to_strings(self) -> tuple[str, ...]:
@@ -244,7 +245,7 @@ class Completions(CompletionResultsBase):
     _quote_char: str = ""
 
 
-def all_display_numeric(items: Sequence[CompletionItem]) -> bool:
+def all_display_numeric(items: Collection[CompletionItem]) -> bool:
     """Return True if items is non-empty and every item.display is a numeric string."""
     return bool(items) and all(NUMERIC_RE.match(item.display) for item in items)