From 90bc60188683e210fd17373892d946735f08c4a6 Mon Sep 17 00:00:00 2001 From: karmacoma Date: Mon, 3 Jun 2024 10:03:25 -0700 Subject: [PATCH] for implicit defaults, set a separate help message --- src/halmos/config.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/halmos/config.py b/src/halmos/config.py index ba1596e4..a723b8f9 100644 --- a/src/halmos/config.py +++ b/src/halmos/config.py @@ -30,6 +30,7 @@ def arg( choices: Optional[str] = None, short: Optional[str] = None, countable: bool = False, + global_default_str: Optional[str] = None, ): return field( default=None, @@ -41,6 +42,7 @@ def arg( "choices": choices, "short": short, "countable": countable, + "global_default_str": global_default_str, }, ) @@ -86,14 +88,18 @@ class Config: # # We can then layer these Config objects on top of the `default_config()` + root: str = arg( + help="Project root directory", + metavar="PROJECT_ROOT", + global_default=os.getcwd, + global_default_str="'.'", + ) + config: str = arg( help="path to the configuration file", - global_default=lambda: os.path.join(os.getcwd(), "halmos.toml"), metavar="FILE", - ) - - root: str = arg( - help="Project root directory", global_default=os.getcwd, metavar="PATH" + global_default=lambda: os.path.join(os.getcwd(), "halmos.toml"), + global_default_str="PROJECT_ROOT/halmos.toml", ) contract: str = arg( @@ -343,9 +349,10 @@ class Config: solver_threads: int = arg( help="set the number of threads for parallel solvers", - global_default=(lambda: os.cpu_count() or 1), metavar="N", group=solver, + global_default=(lambda: os.cpu_count() or 1), + global_default_str="number of CPUs", ) ### Experimental options @@ -576,7 +583,9 @@ def _create_arg_parser() -> argparse.ArgumentParser: # add the default value to the help text default = field_info.metadata.get("global_default", None) if default is not None: - arg_help += f" (default: {default!r})" + default_str = field_info.metadata.get("global_default_str", None) + default_str = repr(default) if default_str is None else default_str + arg_help += f" (default: {default_str})" kwargs = { "help": arg_help,