Merge pull request #23 from explosion/fix/no-defaullt-handling

Author: ines

radicli/cli.py

@@ -380,12 +380,14 @@ def _add_args(self, parser: ArgumentParser, args: List[ArgparseArg]) -> None:
             if arg.id == self.extra_key:
                 continue
             func_args, func_kwargs = arg.to_argparse()
-            # Suppress all argument defaults and mark options without defaults
-            # as required
+            # Suppress all defaults and mark options without defaults as required
             if not self.fill_defaults:
                 func_kwargs["default"] = DEFAULT_PLACEHOLDER
                 if arg.arg.option:
                     func_kwargs["required"] = arg.default is DEFAULT_PLACEHOLDER
+                if arg.help and arg.default is not DEFAULT_PLACEHOLDER:
+                    # Manually add default to help again (now suppressed)
+                    func_kwargs["help"] = f"{arg.help} (default: {arg.default})"
             parser.add_argument(*func_args, **func_kwargs)
 
     def _validate(

radicli/parser.py

@@ -3,7 +3,7 @@
 import argparse
 import sys
 
-from .util import format_arg_help, CliParserError
+from .util import format_arg_help, CliParserError, DEFAULT_PLACEHOLDER
 
 
 class ArgumentParser(argparse.ArgumentParser):
@@ -13,6 +13,8 @@ def error(self, message: str) -> NoReturn:
     # Overriding this internal function so we can have more control over how
     # errors are handled and (not) masked internally
     def _get_value(self, action: argparse.Action, arg_string: str) -> Any:
+        if arg_string == DEFAULT_PLACEHOLDER:
+            return DEFAULT_PLACEHOLDER
         type_func = self._registry_get("type", action.type, action.type)
         if not callable(type_func):
             raise argparse.ArgumentError(action, f"{type_func!r} is not callable")

radicli/util.py

@@ -314,6 +314,7 @@ def get_arg(
     if inspect.isclass(param_type) and issubclass(param_type, Enum):
         arg.choices = list(param_type.__members__.keys())
         arg.type = lambda value: getattr(param_type, value, value)
+        arg.has_converter = True
         return arg
     if not origin:
         raise UnsupportedTypeError(param, param_type)

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = 0.0.19
+version = 0.0.20
 description = Radically lightweight command-line interfaces
 url = https://github.com/explosion/radicli
 author = Explosion