lockss-pybasic 0.1.0.dev17__tar.gz → 0.1.0.dev19__tar.gz

{lockss_pybasic-0.1.0.dev17 → lockss_pybasic-0.1.0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.1.0.dev17
+Version: 0.1.0.dev19
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: pydantic (>=2.11.0,<3.0.0)
 Requires-Dist: pydantic-argparse (>=0.10.0,<0.11.0)
+Requires-Dist: rich-argparse (>=1.7.0,<1.8.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Description-Content-Type: text/x-rst
 

{lockss_pybasic-0.1.0.dev17 → lockss_pybasic-0.1.0.dev19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lockss-pybasic"
-version = "0.1.0-dev17"
+version = "0.1.0-dev19"
 description = "Basic Python utilities"
 authors = [
     { name = "Thib Guicherd-Callin", email = "thib@cs.stanford.edu" }
@@ -11,6 +11,7 @@ requires-python = ">=3.9,<4.0"
 dependencies = [
     "pydantic (>=2.11.0,<3.0.0)",
     "pydantic-argparse (>=0.10.0,<0.11.0)",
+    "rich-argparse (>=1.7.0,<1.8.0)",
     "tabulate (>=0.9.0,<0.10.0)"
 ]
 

{lockss_pybasic-0.1.0.dev17 → lockss_pybasic-0.1.0.dev19}/src/lockss/pybasic/__init__.py

@@ -36,4 +36,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.1.0-dev17'
+__version__ = '0.1.0-dev19'

{lockss_pybasic-0.1.0.dev17 → lockss_pybasic-0.1.0.dev19}/src/lockss/pybasic/cliutil.py

@@ -32,14 +32,13 @@
 Command line utilities.
 """
 
-from abc import ABC, abstractmethod
 from collections.abc import Callable
 import sys
 from typing import Any, Dict, Generic, Optional, TypeVar
 
 from pydantic.v1 import BaseModel, Field
 from pydantic_argparse import ArgumentParser
-
+from rich_argparse import RichHelpFormatter
 
 class ActionCommand(Callable, BaseModel):
     """
@@ -110,6 +109,7 @@ class BaseCli(Generic[BaseModelT]):
         self._parser: ArgumentParser = ArgumentParser(model=self.extra.get('model'),
                                                       prog=self.extra.get('prog'),
                                                       description=self.extra.get('description'))
+        self._initialize_rich_argparse()
         self._args = self._parser.parse_typed_args()
         self.dispatch()
 
@@ -134,6 +134,21 @@ class BaseCli(Generic[BaseModelT]):
         else:
             self._parser.error(f'unknown command; expected one of {', '.join(field_names)}')
 
+    def _initialize_rich_argparse(self) -> None:
+        for cls in [RichHelpFormatter]:
+            cls.styles.update({
+                'argparse.args': f'bold {cls.styles["argparse.args"]}',
+                'argparse.groups': f'bold {cls.styles["argparse.groups"]}',
+                'argparse.metavar': f'bold {cls.styles["argparse.metavar"]}',
+                'argparse.prog': f'bold {cls.styles["argparse.prog"]}',
+            })
+        def _add_formatter_class(container):
+            container.formatter_class = RichHelpFormatter
+            if container._subcommands:
+                for subcommand in container._subcommands:
+                    _add_formatter_class(subcommand)
+        _add_formatter_class(self._parser)
+
 
 def at_most_one_from_enum(model_cls, values: Dict[str, Any], enum_cls) -> Dict[str, Any]:
     """