lockss-pybasic 0.1.0.dev23__tar.gz → 0.2.0.dev1__tar.gz

{lockss_pybasic-0.1.0.dev23 → lockss_pybasic-0.2.0.dev1}/CHANGELOG.rst

@@ -3,11 +3,17 @@ Release Notes
 =============
 
 -----
-0.1.0
+0.2.0
 -----
 
 Released: ?
 
+-----
+0.1.0
+-----
+
+Released: 2025-07-01
+
 Initial release, including:
 
 *  ``cliutil``

{lockss_pybasic-0.1.0.dev23 → lockss_pybasic-0.2.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.1.0.dev23
+Version: 0.2.0.dev1
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
@@ -12,12 +12,9 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Framework :: Pydantic :: 2
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: System :: Archiving
-Classifier: Topic :: Utilities
 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)
@@ -29,8 +26,8 @@ Description-Content-Type: text/x-rst
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.1.0-dev23
-.. |RELEASE_DATE| replace:: ?
+.. |RELEASE| replace:: 0.1.0
+.. |RELEASE_DATE| replace:: 2025-07-01
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
 

{lockss_pybasic-0.1.0.dev23 → lockss_pybasic-0.2.0.dev1}/README.rst

@@ -2,8 +2,8 @@
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.1.0-dev23
-.. |RELEASE_DATE| replace:: ?
+.. |RELEASE| replace:: 0.1.0
+.. |RELEASE_DATE| replace:: 2025-07-01
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
 

{lockss_pybasic-0.1.0.dev23 → lockss_pybasic-0.2.0.dev1}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-pybasic"
-version = "0.1.0-dev23" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.2.0-dev1" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
 description = "Basic Python utilities"
 license = { text = "BSD-3-Clause" }
 readme = "README.rst"
@@ -50,12 +50,9 @@ classifiers = [
     "Environment :: Console",
     "Framework :: Pydantic :: 2",
     "Intended Audience :: Developers",
-    "Intended Audience :: System Administrators",
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python",
     "Topic :: Software Development :: Libraries",
-    "Topic :: System :: Archiving",
-    "Topic :: Utilities",
 ]
 
 [project.urls]

{lockss_pybasic-0.1.0.dev23 → lockss_pybasic-0.2.0.dev1}/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-dev23'
+__version__ = '0.2.0-dev1'

{lockss_pybasic-0.1.0.dev23 → lockss_pybasic-0.2.0.dev1}/src/lockss/pybasic/cliutil.py

@@ -129,22 +129,25 @@ class BaseCli(Generic[BaseModelT]):
 
     def dispatch(self) -> None:
         """
-        Dispatches from the first field ``x_y_z`` in ``self.args`` that is a
+        Dispatches from the first field ``x_y_z`` in ``self._args`` that is a
         command (i.e. whose value derives from ``BaseModel``) to a method
         called ``_x_y_z``.
         """
-        field_names = self._args.__class__.__fields__.keys()
+        self._dispatch_recursive(self._args, [])
+
+    def _dispatch_recursive(self, base_model: BaseModel, subcommands: list[str]) -> None:
+        field_names = base_model.__class__.__fields__.keys()
         for field_name in field_names:
-            field_value = getattr(self._args, field_name)
+            field_value = getattr(base_model, field_name)
             if issubclass(type(field_value), BaseModel):
-                func = getattr(self, f'_{field_name}')
-                if callable(func):
-                    func(field_value)
-                else:
-                    self._parser.exit(1, f'internal error: no _{field_name} callable for the {field_name} command')
-                break
+                self._dispatch_recursive(field_value, [*subcommands, field_name])
+                return
+        func_name = ''.join(f'_{sub}' for sub in subcommands)
+        func = getattr(self, func_name)
+        if callable(func):
+            func(base_model) # FIXME?
         else:
-            self._parser.error(f'unknown command; expected one of {', '.join(field_names)}')
+            self._parser.exit(1, f'internal error: no {func_name} callable for the {" ".join(sub for sub in subcommands)}')
 
     def _initialize_rich_argparse(self) -> None:
         """