Fixed type issues.

Author: kmvanbrunt

cmd2/argparse_completer.py

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

cmd2/completion.py

@@ -5,6 +5,7 @@
 from collections.abc import (
     Callable,
     Collection,
+    Iterable,
     Iterator,
     Sequence,
 )
@@ -149,7 +150,7 @@ def __post_init__(self) -> None:
         object.__setattr__(self, "items", tuple(unique_items))
 
     @classmethod
-    def from_values(cls, values: Iterator[Any], *, is_sorted: bool = False) -> Self:
+    def from_values(cls, values: Iterable[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.