lockss-turtles 0.6.0.dev13__tar.gz → 0.6.0.dev15__tar.gz

{lockss_turtles-0.6.0.dev13 → lockss_turtles-0.6.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-turtles
-Version: 0.6.0.dev13
+Version: 0.6.0.dev15
 Summary: Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
@@ -18,9 +18,10 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: System :: Archiving
 Classifier: Topic :: Utilities
+Requires-Dist: exceptiongroup (>=1.3.0,<1.4.0)
 Requires-Dist: java-manifest (>=1.1.0,<1.2.0)
 Requires-Dist: lockss-pybasic (>=0.1.0,<0.2.0)
-Requires-Dist: pydantic (>=2.11.0,<3.0.0)
+Requires-Dist: pydantic (>=2.11.0,<2.12.0)
 Requires-Dist: pyyaml (>=6.0.0,<6.1.0)
 Requires-Dist: xdg (>=6.0.0,<6.1.0)
 Project-URL: Documentation, https://docs.lockss.org/en/latest/software/turtles

{lockss_turtles-0.6.0.dev13 → lockss_turtles-0.6.0.dev15}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-turtles"
-version = "0.6.0-dev13" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.6.0-dev15" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
 description = "Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin registries"
 license = { text = "BSD-3-Clause" }
 readme = "README.rst"
@@ -40,11 +40,12 @@ maintainers = [
     { name = "Thib Guicherd-Callin",  email = "thib@cs.stanford.edu" }
 ]
 dependencies = [
+    "exceptiongroup (>=1.3.0,<1.4.0)",
     "java-manifest (>=1.1.0,<1.2.0)",
     "lockss-pybasic (>=0.1.0,<0.2.0)",
     "pyyaml (>=6.0.0,<6.1.0)",
     "xdg (>=6.0.0,<6.1.0)",
-    "pydantic (>=2.11.0,<3.0.0)",
+    "pydantic (>=2.11.0,<2.12.0)",
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",

{lockss_turtles-0.6.0.dev13 → lockss_turtles-0.6.0.dev15}/src/lockss/turtles/__init__.py

@@ -5,7 +5,7 @@ Library and command line tool to manage LOCKSS plugin sets and LOCKSS plugin
 registries.
 """
 
-__version__ = '0.6.0-dev13'
+__version__ = '0.6.0-dev15'
 
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University

{lockss_turtles-0.6.0.dev13 → lockss_turtles-0.6.0.dev15}/src/lockss/turtles/app.py

@@ -36,10 +36,11 @@ from collections.abc import Callable, Iterable
 from pathlib import Path
 from typing import ClassVar, Literal, Optional, Union
 
-import yaml
+from exceptiongroup import ExceptionGroup
 from lockss.pybasic.fileutil import path
-from pydantic import BaseModel, Field
+from pydantic import Field, ValidationError
 import xdg
+import yaml
 
 from .plugin import Plugin, PluginIdentifier
 from .plugin_registry import PluginRegistry, PluginRegistryCatalog, PluginRegistryCatalogKind, PluginRegistryKind, PluginRegistryLayerIdentifier
@@ -104,56 +105,115 @@ class TurtlesApp(object):
         plugin_registry_path = path(plugin_registry_path_or_str)
         if plugin_registry_path in map(lambda pr: pr.get_root(), self._plugin_registries):
             raise ValueError(f'Plugin registries already loaded from: {plugin_registry_path!s}')
+        errs, at_least_one = [], False
         with plugin_registry_path.open('r') as fpr:
             for yaml_obj in yaml.safe_load_all(fpr):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginRegistryKind.__args__:
-                    plugin_registry = PluginRegistry(**yaml_obj).initialize(plugin_registry_path.parent)
-                    self._plugin_registries.append(plugin_registry)
+                    try:
+                        plugin_registry = PluginRegistry(**yaml_obj).initialize(plugin_registry_path.parent)
+                        self._plugin_registries.append(plugin_registry)
+                        at_least_one = True
+                    except ValidationError as ve:
+                        errs.append(ve)
+        if errs:
+            raise ExceptionGroup(f'Errors while loading plugin registries from: {plugin_registry_path!s}', errs)
+        if not at_least_one:
+            raise ValueError(f'No plugin registries found in: {plugin_registry_path!s}')
         return self
 
     def load_plugin_registry_catalogs(self, plugin_registry_catalog_path_or_str: PathOrStr) -> TurtlesApp:
         plugin_registry_catalog_path = path(plugin_registry_catalog_path_or_str)
         if plugin_registry_catalog_path in map(lambda prc: prc.get_root(), self._plugin_registry_catalogs):
             raise ValueError(f'Plugin registry catalogs already loaded from: {plugin_registry_catalog_path!s}')
+        errs, at_least_one = [], False
         with plugin_registry_catalog_path.open('r') as fprc:
             for yaml_obj in yaml.safe_load_all(fprc):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginRegistryCatalogKind.__args__:
-                    plugin_registry_catalog = PluginRegistryCatalog(**yaml_obj).initialize(plugin_registry_catalog_path.parent)
-                    self._plugin_registry_catalogs.append(plugin_registry_catalog)
-                    for plugin_registry_file in plugin_registry_catalog.get_plugin_registry_files():
-                        self.load_plugin_registries(plugin_registry_catalog_path.joinpath(plugin_registry_file))
+                    try:
+                        plugin_registry_catalog = PluginRegistryCatalog(**yaml_obj).initialize(plugin_registry_catalog_path.parent)
+                        self._plugin_registry_catalogs.append(plugin_registry_catalog)
+                        at_least_one = True
+                        for plugin_registry_file in plugin_registry_catalog.get_plugin_registry_files():
+                            try:
+                                self.load_plugin_registries(plugin_registry_catalog_path.joinpath(plugin_registry_file))
+                            except ValueError as ve:
+                                errs.append(ve)
+                            except ExceptionGroup as eg:
+                                errs.extend(eg.exceptions)
+                    except ValidationError as ve:
+                        errs.append(ve)
+        if errs:
+            raise ExceptionGroup(f'Errors while loading plugin registry catalogs from: {plugin_registry_catalog_path!s}', errs)
+        if not at_least_one:
+            raise ValueError(f'No plugin registry catalogs found in: {plugin_registry_catalog_path!s}')
         return self
 
     def load_plugin_set_catalogs(self, plugin_set_catalog_path_or_str: PathOrStr) -> TurtlesApp:
         plugin_set_catalog_path = path(plugin_set_catalog_path_or_str)
         if plugin_set_catalog_path in map(lambda psc: psc.get_root(), self._plugin_set_catalogs):
             raise ValueError(f'Plugin set catalogs already loaded from: {plugin_set_catalog_path!s}')
+        errs, at_least_one = [], False
         with plugin_set_catalog_path.open('r') as fpsc:
             for yaml_obj in yaml.safe_load_all(fpsc):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginSetCatalogKind.__args__:
-                    plugin_set_catalog = PluginSetCatalog(**yaml_obj).initialize(plugin_set_catalog_path.parent)
-                    self._plugin_set_catalogs.append(plugin_set_catalog)
-                    for plugin_set_file in plugin_set_catalog.get_plugin_set_files():
-                        self.load_plugin_sets(plugin_set_catalog_path.joinpath(plugin_set_file))
+                    try:
+                        plugin_set_catalog = PluginSetCatalog(**yaml_obj).initialize(plugin_set_catalog_path.parent)
+                        self._plugin_set_catalogs.append(plugin_set_catalog)
+                        at_least_one = True
+                        for plugin_set_file in plugin_set_catalog.get_plugin_set_files():
+                            try:
+                                self.load_plugin_sets(plugin_set_catalog_path.joinpath(plugin_set_file))
+                            except ValueError as ve:
+                                errs.append(ve)
+                            except ExceptionGroup as eg:
+                                errs.extend(eg.exceptions)
+                    except ValidationError as ve:
+                        errs.append(ve)
+        if errs:
+            raise ExceptionGroup(f'Errors while loading plugin set catalogs from: {plugin_set_catalog_path!s}', errs)
+        if not at_least_one:
+            raise ValueError(f'No plugin set catalogs found in: {plugin_set_catalog_path!s}')
         return self
 
     def load_plugin_sets(self, plugin_set_path_or_str: PathOrStr) -> TurtlesApp:
         plugin_set_path = path(plugin_set_path_or_str)
         if plugin_set_path in map(lambda ps: ps.get_root(), self._plugin_sets):
             raise ValueError(f'Plugin sets already loaded from: {plugin_set_path!s}')
+        errs, at_least_one = [], False
         with plugin_set_path.open('r') as fps:
             for yaml_obj in yaml.safe_load_all(fps):
                 if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginSetKind.__args__:
-                    plugin_set = PluginSet(**yaml_obj).initialize(plugin_set_path.parent)
-                    self._plugin_sets.append(plugin_set)
+                    try:
+                        plugin_set = PluginSet(**yaml_obj).initialize(plugin_set_path.parent)
+                        self._plugin_sets.append(plugin_set)
+                        at_least_one = True
+                    except ValidationError as ve:
+                        errs.append(ve)
+        if errs:
+            raise ExceptionGroup(f'Errors while loading plugin sets from: {plugin_set_path!s}', errs)
+        if not at_least_one:
+            raise ValueError(f'No plugin sets found in: {plugin_set_path!s}')
         return self
 
     def load_plugin_signing_credentials(self, plugin_signing_credentials_path_or_str: PathOrStr) -> TurtlesApp:
         plugin_signing_credentials_path = path(plugin_signing_credentials_path_or_str)
         if self._plugin_signing_credentials:
             raise ValueError(f'Plugin signing credentials already loaded from: {self._plugin_signing_credentials.get_root()!s}')
+        found = 0
         with plugin_signing_credentials_path.open('r') as fpsc:
-            self._plugin_signing_credentials = PluginSigningCredentials(**yaml.safe_load(fpsc)).initialize(plugin_signing_credentials_path.parent)
+            for yaml_obj in yaml.safe_load_all(fpsc):
+                if isinstance(yaml_obj, dict) and yaml_obj.get('kind') in PluginSigningCredentialsKind.__args__:
+                    found = found + 1
+                    if not self._plugin_signing_credentials:
+                        try:
+                            plugin_signing_credentials = PluginSigningCredentials(**yaml.safe_load(fpsc)).initialize(plugin_signing_credentials_path.parent)
+                            self._plugin_signing_credentials = plugin_signing_credentials
+                        except ValidationError as ve:
+                            raise ExceptionGroup(f'Errors while loading plugin signing credentials from: {plugin_signing_credentials_path!s}', [ve])
+        if found == 0:
+            raise ValueError(f'No plugin signing credentials found in: {plugin_signing_credentials_path!s}')
+        if found > 1:
+            raise ValueError(f'Multiple plugin signing credentials found in: {plugin_signing_credentials_path!s}')
         return self
 
     def release_plugin(self, plugin_ids: list[PluginIdentifier], layer_ids: list[PluginRegistryLayerIdentifier], interactive: bool=False) -> dict[str, list[tuple[str, str, Path, Plugin]]]:

{lockss_turtles-0.6.0.dev13 → lockss_turtles-0.6.0.dev15}/src/lockss/turtles/cli.py

@@ -35,6 +35,7 @@ Tool for managing LOCKSS plugin sets and LOCKSS plugin registries
 from getpass import getpass
 from pathlib import Path
 
+from exceptiongroup import ExceptionGroup
 from lockss.pybasic.cliutil import BaseCli, StringCommand, COPYRIGHT_DESCRIPTION, LICENSE_DESCRIPTION, VERSION_DESCRIPTION
 from lockss.pybasic.fileutil import file_lines, path
 from lockss.pybasic.outpututil import OutputFormatOptions
@@ -239,11 +240,29 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
         return self._build_plugin(build_plugin_command)
 
     def _build_plugin(self, build_plugin_command: BuildPluginCommand) -> None:
+        errs = []
         for psc in build_plugin_command.get_plugin_set_catalogs():
-            self._app.load_plugin_set_catalogs(psc)
+            try:
+                self._app.load_plugin_set_catalogs(psc)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
         for ps in build_plugin_command.get_plugin_sets():
-            self._app.load_plugin_sets(ps)
-        self._app.load_plugin_signing_credentials(build_plugin_command.get_plugin_signing_credentials())
+            try:
+                self._app.load_plugin_sets(ps)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
+        try:
+            self._app.load_plugin_signing_credentials(build_plugin_command.get_plugin_signing_credentials())
+        except ValueError as ve:
+            errs.append(ve)
+        except ExceptionGroup as eg:
+            errs.extend(eg.exceptions)
+        if errs:
+            raise ExceptionGroup(f'Errors while setting up the environment for building plugins', errs)
         self._obtain_password(build_plugin_command, non_interactive=build_plugin_command.non_interactive)
         # Action
         # ... plugin_id -> (set_id, jar_path, plugin)
@@ -257,10 +276,23 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
         self._do_string_command(string_command)
 
     def _deploy_plugin(self, deploy_plugin_command: DeployPluginCommand) -> None:
+        errs = []
         for prc in deploy_plugin_command.get_plugin_registry_catalogs():
-            self._app.load_plugin_registry_catalogs(prc)
+            try:
+                self._app.load_plugin_registry_catalogs(prc)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
         for pr in deploy_plugin_command.get_plugin_registries():
-            self._app.load_plugin_registries(pr)
+            try:
+                self._app.load_plugin_registries(pr)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
+        if errs:
+            raise ExceptionGroup(f'Errors while setting up the environment for deploying plugins', errs)
         # Action
         # ... (src_path, plugin_id) -> list of (registry_id, layer_id, dst_path, plugin)
         ret = self._app.deploy_plugin(deploy_plugin_command.get_plugin_jars(),
@@ -290,15 +322,43 @@ class TurtlesCli(BaseCli[TurtlesCommand]):
         self._app.set_password(lambda: _p)
 
     def _release_plugin(self, release_plugin_command: ReleasePluginCommand) -> None:
+        errs = []
         for psc in release_plugin_command.get_plugin_set_catalogs():
-            self._app.load_plugin_set_catalogs(psc)
+            try:
+                self._app.load_plugin_set_catalogs(psc)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
         for ps in release_plugin_command.get_plugin_sets():
-            self._app.load_plugin_sets(ps)
+            try:
+                self._app.load_plugin_sets(ps)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
         for prc in release_plugin_command.get_plugin_registry_catalogs():
-            self._app.load_plugin_registry_catalogs(prc)
+            try:
+                self._app.load_plugin_registry_catalogs(prc)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
         for pr in release_plugin_command.get_plugin_registries():
-            self._app.load_plugin_registries(pr)
-        self._app.load_plugin_signing_credentials(release_plugin_command.get_plugin_signing_credentials())
+            try:
+                self._app.load_plugin_registries(pr)
+            except ValueError as ve:
+                errs.append(ve)
+            except ExceptionGroup as eg:
+                errs.extend(eg.exceptions)
+        try:
+            self._app.load_plugin_signing_credentials(release_plugin_command.get_plugin_signing_credentials())
+        except ValueError as ve:
+            errs.append(ve)
+        except ExceptionGroup as eg:
+            errs.extend(eg.exceptions)
+        if errs:
+            raise ExceptionGroup(f'Errors while setting up the environment for deploying plugins', errs)
         self._obtain_password(release_plugin_command, non_interactive=release_plugin_command.non_interactive)
         # Action
         # ... plugin_id -> list of (registry_id, layer_id, dst_path, plugin)

{lockss_turtles-0.6.0.dev13 → lockss_turtles-0.6.0.dev15}/src/lockss/turtles/plugin_registry.py

@@ -146,7 +146,7 @@ class RcsPluginRegistryLayout(DirectoryPluginRegistryLayout):
     def _copy_jar(self, src_path: Path, dst_path: Path, interactive: bool=False) -> None:
         dst_dir, basename = dst_path.parent, dst_path.name
         plugin = Plugin.from_jar(src_path)
-        rcs_path = dst_path.joinpath('RCS', f'{basename},v')
+        rcs_path = dst_dir.joinpath('RCS', f'{basename},v')
         # Maybe do co -l before the parent's copy
         if dst_path.exists() and rcs_path.is_file():
             cmd = ['co', '-l', basename]