✨ Add callable support to show_default

Based on tiangolo#355.

tests/test_tutorial/test_arguments/test_help/test_tutorial005.py

@@ -18,7 +18,7 @@ def test_help():
     assert columns_match(
         result.output,
         "[NAME]",
-        "Who to greet  [default: (Deadpoolio the amazing's name)]",
+        "Who to greet  [default: Deadpoolio the amazing's name]",
     )
 
 

typer_cloup/core.py

@@ -1,4 +1,3 @@
-import inspect
 import os
 import sys
 from gettext import gettext as _
@@ -73,7 +72,7 @@ def __init__(
         # TyperParameterMixin
         convertor: Optional[Any] = None,
         # TyperArgument
-        show_default: Union[bool, str] = True,
+        show_default: Union[bool, str, Callable[[], Union[bool, str]]] = True,
         show_choices: bool = True,
         show_envvar: bool = True,
         allow_from_autoenv: bool = False,
@@ -163,13 +162,16 @@ def get_help_record(self, ctx: click.Context) -> Tuple[str, str]:
         finally:
             ctx.resilient_parsing = resilient
 
-        show_default_is_str = isinstance(self.show_default, str)
+        show_default = (
+            self.show_default() if callable(self.show_default) else self.show_default
+        )
+        show_default_is_str = isinstance(show_default, str)
 
         if show_default_is_str or (
-            default_value is not None and (self.show_default or ctx.show_default)
+            default_value is not None and (show_default or ctx.show_default)
         ):
             if show_default_is_str:
-                default_string = f"({self.show_default})"
+                default_string = str(show_default)
             elif isinstance(default_value, (list, tuple)):
                 default_string = ", ".join(str(d) for d in default_value)
             elif callable(default_value):
@@ -241,7 +243,7 @@ def __init__(
         # TyperParameterMixin
         convertor: Optional[Any] = None,
         # click.Option
-        show_default: Union[bool, str] = False,
+        show_default: Union[bool, str, Callable[[], Union[bool, str]]] = False,
         prompt: Union[bool, str] = False,
         confirmation_prompt: Union[bool, str] = False,
         prompt_required: bool = True,
@@ -373,23 +375,19 @@ def _write_opts(opts: Sequence[str]) -> str:
         finally:
             ctx.resilient_parsing = resilient
 
-        show_default = False
-        show_default_is_str = False
-
-        if self.show_default is not None:
-            if isinstance(self.show_default, str):
-                show_default_is_str = show_default = True
-            else:
-                show_default = self.show_default
-        elif ctx.show_default is not None:  # pragma: no cover
-            show_default = ctx.show_default
+        show_default = (
+            self.show_default() if callable(self.show_default) else self.show_default
+        )
+        show_default_is_str = isinstance(show_default, str)
 
-        if show_default_is_str or (show_default and (default_value is not None)):
+        if show_default_is_str or (
+            default_value is not None and (show_default or ctx.show_default)
+        ):
             if show_default_is_str:
-                default_string = f"({self.show_default})"
+                default_string = str(self.show_default)
             elif isinstance(default_value, (list, tuple)):
                 default_string = ", ".join(str(d) for d in default_value)
-            elif inspect.isfunction(default_value):
+            elif callable(default_value):
                 default_string = _("(dynamic)")
             elif self.is_bool_flag and self.secondary_opts:
                 # For boolean flags that have distinct True/False opts,

typer_cloup/main.py

@@ -574,7 +574,7 @@ def get_params_convertors_ctx_param_name_from_function(
             params[param_name] = click_param
         callback_obj = cast(Any, callback)
         if hasattr(callback_obj, "__opt_groups"):
-            for (opt_group, opt_group_params) in reversed(callback_obj.__opt_groups):
+            for opt_group, opt_group_params in reversed(callback_obj.__opt_groups):
                 for param_name in opt_group_params:
                     option = params.get(param_name, None)
                     if option is None:

typer_cloup/models.py

@@ -268,7 +268,7 @@ def __init__(
             ]
         ] = None,
         # TyperArgument
-        show_default: Union[bool, str] = True,
+        show_default: Union[bool, str, Callable[[], Union[bool, str]]] = True,
         show_choices: bool = True,
         show_envvar: bool = True,
         allow_from_autoenv: bool = False,
@@ -363,7 +363,7 @@ def __init__(
             ]
         ] = None,
         # Option
-        show_default: Union[bool, str] = True,
+        show_default: Union[bool, str, Callable[[], Union[bool, str]]] = True,
         prompt: Union[bool, str] = False,
         confirmation_prompt: bool = False,
         prompt_required: bool = True,
@@ -476,7 +476,7 @@ def __init__(
             ]
         ] = None,
         # TyperArgument
-        show_default: Union[bool, str] = True,
+        show_default: Union[bool, str, Callable[[], Union[bool, str]]] = True,
         show_choices: bool = True,
         show_envvar: bool = True,
         allow_from_autoenv: bool = False,

typer_cloup/params.py

@@ -30,7 +30,7 @@ def Option(
         ]
     ] = None,
     # Option
-    show_default: Union[bool, str] = True,
+    show_default: Union[bool, str, Callable[[], Union[bool, str]]] = True,
     prompt: Union[bool, str] = False,
     confirmation_prompt: bool = False,
     prompt_required: bool = True,
@@ -143,7 +143,7 @@ def Argument(
         ]
     ] = None,
     # TyperArgument
-    show_default: Union[bool, str] = True,
+    show_default: Union[bool, str, Callable[[], Union[bool, str]]] = True,
     show_choices: bool = True,
     show_envvar: bool = True,
     allow_from_autoenv: bool = False,