replbase 0.0.62__tar.gz → 0.0.64__tar.gz

{replbase-0.0.62 → replbase-0.0.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: replbase
-Version: 0.0.62
+Version: 0.0.64
 Summary: "Combination of other REPL tools into a reusable class that generates a REPL"
 License: MIT
 Author: Joseph Bochinski

{replbase-0.0.62 → replbase-0.0.64}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "replbase"
-version = "0.0.62"
+version = "0.0.64"
 description = "\"Combination of other REPL tools into a reusable class that generates a REPL\""
 authors = [ "Joseph Bochinski <stirgejr@gmail.com>",]
 license = "MIT"

{replbase-0.0.62 → replbase-0.0.64}/replbase/cmd_meta.py

@@ -7,7 +7,44 @@ import re
 from collections import defaultdict
 from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import get_type_hints
+from types import GenericAlias
+from typing import Any, get_type_hints
+
+AUTO_ARG_TYPES = [
+    int,
+    float,
+    ascii,
+    ord,
+]
+
+
+def extract_type_info(annotation: Any) -> tuple[type, type]:
+    """Extract type info from an inspect.Paramater annotation
+
+    Args:
+        annotation (Any): Parameter annotation value
+
+    Returns:
+        tuple[type,type]: the annotation/main type, followed by sub/element type
+    """
+
+    # Check if the annotation is an instance of GenericAlias
+    if isinstance(annotation, GenericAlias):
+        # Get the main type, for example `list` from `list[str]`
+        main_type = annotation.__origin__
+        # Get the type arguments, for example `[str]` from `list[str]`
+        type_args = annotation.__args__
+
+        # Since we're dealing with a single type argument, like list[str],
+        # we expect one element in type_args
+        if len(type_args) == 1:
+            element_type = type_args[0]
+        else:
+            element_type = None
+
+        return main_type, element_type
+    else:
+        return annotation, None
 
 
 @dataclass
@@ -225,17 +262,22 @@ class CommandMeta:
                         "store_false" if parm.default is True else "store_true"
                     )
 
-                if arg_type not in [str, bool]:
+                if arg_type in AUTO_ARG_TYPES:
                     cmd_init["type"] = arg_type
 
+                if isinstance(arg_type, GenericAlias):
+                    main_type, sub_type = extract_type_info(parm.annotation)
+                    if main_type is list:
+                        cmd_init["nargs"] = "+"
+                        cmd_init["action"] = "append"
+                    if sub_type in AUTO_ARG_TYPES:
+                        cmd_init["type"] = sub_type
+
                 if isinstance(arg_type, type) and isinstance(
-                    parm.default, arg_type
+                    parm.default, (arg_type, str)
                 ):
                     cmd_init["default"] = parm.default
 
-                if isinstance(arg_type, list):
-                    cmd_init["nargs"] = "+"
-
                 if cmd_init:
                     repl_cmd.parser.add_argument(flag_name, **cmd_init)
 
@@ -312,7 +354,7 @@ class CommandMeta:
         """Parse the argument strings from the docstring"""
         # pylint: disable=C0301
         arg_re = re.compile(
-            r"(?P<arg_name>[a-zA-Z_]\w*)\s*(?P<type_hint>\(\w+(?:, optional)*\)):(?P<arg_text>\s*.+?$)"
+            r"(?P<arg_name>[a-zA-Z_]\w*)\s*(?P<type_hint>\(.+(?:, optional)*\)):(?P<arg_text>\s*.+?$)"
         )
         # pylint: enable=C0301
 
@@ -327,7 +369,7 @@ class CommandMeta:
 
                 if param:
                     arg_type = self.get_param_str(param)
-                args[cur_arg].append(f"{arg_type}{arg_text}")
+                args[cur_arg].append(f"{arg_type}:{arg_text}")
             elif cur_arg:
                 args[cur_arg].append(line)