lockss-pybasic 0.1.0.dev17__py3-none-any.whl → 0.1.0.dev19__py3-none-any.whl

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/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]:
     """

{lockss_pybasic-0.1.0.dev17.dist-info → lockss_pybasic-0.1.0.dev19.dist-info}/METADATA

@@ -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.dev19.dist-info/RECORD

@@ -0,0 +1,9 @@
+lockss/pybasic/__init__.py,sha256=HIiBFRW-RMybbiiGcRP2VWZOBnsAIa8-8UqzQHKRFpc,1679
+lockss/pybasic/cliutil.py,sha256=guNTRmb2Bs0oeHWykEhg712MSRBvFIy4fblXTgZbjpc,8824
+lockss/pybasic/errorutil.py,sha256=OJqRGOjzKK8_OTJCq77u0_XZ5ti2BoVidk5jSTMB6xg,1882
+lockss/pybasic/fileutil.py,sha256=O_EcxobrHPLeD7lAlvtYOkd0R2NOIvpGK6mZOZTxyG4,2856
+lockss/pybasic/outpututil.py,sha256=S2Jpcj7IctXoA10OFGueNzcd7fMjj6RARpc6s15_xLY,2347
+lockss_pybasic-0.1.0.dev19.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_pybasic-0.1.0.dev19.dist-info/METADATA,sha256=I6jRBqvUNJXfl8WbHctxWJi6xRJG8OrNVmjMAY9Y7AU,784
+lockss_pybasic-0.1.0.dev19.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_pybasic-0.1.0.dev19.dist-info/RECORD,,

lockss_pybasic-0.1.0.dev17.dist-info/RECORD

@@ -1,9 +0,0 @@
-lockss/pybasic/__init__.py,sha256=Z6kGfWk8EPpp7MkwWbxCYoJfSQ2C9NPPqlWVs2OBzic,1679
-lockss/pybasic/cliutil.py,sha256=izAtG4UNAEorJ-GXauADMvBMLb10zT1EWrQRyLTa7U0,8045
-lockss/pybasic/errorutil.py,sha256=OJqRGOjzKK8_OTJCq77u0_XZ5ti2BoVidk5jSTMB6xg,1882
-lockss/pybasic/fileutil.py,sha256=O_EcxobrHPLeD7lAlvtYOkd0R2NOIvpGK6mZOZTxyG4,2856
-lockss/pybasic/outpututil.py,sha256=S2Jpcj7IctXoA10OFGueNzcd7fMjj6RARpc6s15_xLY,2347
-lockss_pybasic-0.1.0.dev17.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_pybasic-0.1.0.dev17.dist-info/METADATA,sha256=2_ncU7iE0bDFesesUBbBalYm0Wjss66LS6VvPuW7roI,738
-lockss_pybasic-0.1.0.dev17.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_pybasic-0.1.0.dev17.dist-info/RECORD,,