lockss-pybasic 0.1.0.dev8__tar.gz → 0.1.0.dev10__tar.gz

{lockss_pybasic-0.1.0.dev8 → lockss_pybasic-0.1.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.1.0.dev8
+Version: 0.1.0.dev10
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin

{lockss_pybasic-0.1.0.dev8 → lockss_pybasic-0.1.0.dev10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lockss-pybasic"
-version = "0.1.0-dev8"
+version = "0.1.0-dev10"
 description = "Basic Python utilities"
 authors = [
     { name = "Thib Guicherd-Callin", email = "thib@cs.stanford.edu" }

{lockss_pybasic-0.1.0.dev8 → lockss_pybasic-0.1.0.dev10}/src/lockss/pybasic/__init__.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
 
+"""
+Basic Python utilities.
+"""
+
 __copyright__ = '''
 Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
 '''.strip()
@@ -32,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-dev8'
+__version__ = '0.1.0-dev10'

{lockss_pybasic-0.1.0.dev8 → lockss_pybasic-0.1.0.dev10}/src/lockss/pybasic/cliutil.py

@@ -28,13 +28,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-'''
+"""
 Command line utilities.
-'''
+"""
 
 from abc import ABC, abstractmethod
 import sys
-from typing import Any, Dict, Generic, List, TypeVar
+from typing import Any, Dict, Generic, List, Optional, TypeVar
 
 from pydantic.v1 import BaseModel, Field
 from pydantic_argparse import ArgumentParser
@@ -96,13 +96,12 @@ ModelT = TypeVar('ModelT')
 
 
 class BaseCli(Generic[ModelT], ABC):
-    args: ModelT
-    extra: Dict[str, Any]
-    parser: ArgumentParser
 
     def __init__(self, **extra):
         super().__init__()
-        self.extra = dict(**extra)
+        self.args: ModelT = None
+        self.parser: ArgumentParser = None
+        self.extra: Dict[str, Any] = dict(**extra)
 
     def run(self):
         self.parser: ArgumentParser = ArgumentParser(model=self.extra.get('model'),
@@ -116,10 +115,27 @@ class BaseCli(Generic[ModelT], ABC):
         pass
 
 
-def exactly_one(values: Dict[str, Any], *names: List[str]):
-    if (length := len([values[name] for name in names if values[name]])) != 1:
+def _matchy_length(values: Dict[str, Any], *names: str) -> int:
+    return len([values[name] for name in names if values[name]])
+
+
+def at_most_one(values: Dict[str, Any], *names: str):
+    if (length := _matchy_length(values, names)) > 1:
+        raise ValueError(f'at most one of {', '.join([option_name(name) for name in names])} is allowed, got {length}')
+    return values
+
+
+def exactly_one(values: Dict[str, Any], *names: str):
+    if (length := _matchy_length(values, names)) != 1:
         raise ValueError(f'exactly one of {', '.join([option_name(name) for name in names])} is required, got {length}')
     return values
 
+
+def one_or_more(values: Dict[str, Any], *names: str):
+    if _matchy_length(values, names) == 0:
+        raise ValueError(f'one or more of {', '.join([option_name(name) for name in names])} is required')
+    return values
+
+
 def option_name(name: str):
     return f'{('-' if len(name) == 1 else '--')}{name.replace('_', '-')}'

{lockss_pybasic-0.1.0.dev8 → lockss_pybasic-0.1.0.dev10}/src/lockss/pybasic/errorutil.py

@@ -28,9 +28,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-'''
+"""
 Error and exception utilities.
-'''
+"""
 
 class InternalError(RuntimeError):
 

{lockss_pybasic-0.1.0.dev8 → lockss_pybasic-0.1.0.dev10}/src/lockss/pybasic/fileutil.py

@@ -28,9 +28,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-'''
+"""
 File and path utilities.
-'''
+"""
 
 from pathlib import Path, PurePath
 import sys