lockss-pybasic 0.2.0.dev1__py3-none-any.whl → 0.2.0.dev2__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.2.0-dev1'
+__version__ = '0.2.0-dev2'

lockss/pybasic/cliutil.py

@@ -147,7 +147,7 @@ class BaseCli(Generic[BaseModelT]):
         if callable(func):
             func(base_model) # FIXME?
         else:
-            self._parser.exit(1, f'internal error: no {func_name} callable for the {" ".join(sub for sub in subcommands)}')
+            self._parser.exit(1, f'internal error: no {func_name} callable for the {" ".join(sub for sub in subcommands)} command')
 
     def _initialize_rich_argparse(self) -> None:
         """
@@ -179,7 +179,7 @@ class BaseCli(Generic[BaseModelT]):
             })
 
 
-def at_most_one_from_enum(model_cls, values: Dict[str, Any], enum_cls) -> Dict[str, Any]:
+def at_most_one_from_enum(model_cls: type[BaseModel], values: Dict[str, Any], enum_cls) -> Dict[str, Any]:
     """
     Among the fields of a Pydantic-Argparse model whose ``Field`` definition is
     tagged with the ``enum`` keyword set to the given ``Enum`` type, ensures
@@ -195,7 +195,7 @@ def at_most_one_from_enum(model_cls, values: Dict[str, Any], enum_cls) -> Dict[s
     enum_names = [field_name for field_name, model_field in model_cls.__fields__.items() if model_field.field_info.extra.get('enum') == enum_cls]
     ret = [field_name for field_name in enum_names if values.get(field_name)]
     if (length := len(ret)) > 1:
-        raise ValueError(f'at most one of {', '.join([option_name(enum_name) for enum_name in enum_names])} is allowed, got {length} ({', '.join([option_name(enum_name) for enum_name in ret])})')
+        raise ValueError(f'at most one of {', '.join([option_name(model_cls, enum_name) for enum_name in enum_names])} is allowed, got {length} ({', '.join([option_name(enum_name) for enum_name in ret])})')
     return values
 
 
@@ -219,25 +219,29 @@ def get_from_enum(model_inst, enum_cls, default=None):
     return default
 
 
-def at_most_one(values: Dict[str, Any], *names: str):
+def at_most_one(model_cls: type[BaseModel], 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}')
+        raise ValueError(f'at most one of {', '.join([option_name(model_cls, name) for name in names])} is allowed, got {length}')
     return values
 
 
-def exactly_one(values: Dict[str, Any], *names: str):
+def exactly_one(model_cls: type[BaseModel], 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}')
+        raise ValueError(f'exactly one of {', '.join([option_name(model_cls, name) for name in names])} is required, got {length}')
     return values
 
 
-def one_or_more(values: Dict[str, Any], *names: str):
+def one_or_more(model_cls: type[BaseModel], 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')
+        raise ValueError(f'one or more of {', '.join([option_name(model_cls, name) for name in names])} is required')
     return values
 
 
-def option_name(name: str) -> str:
+def option_name(model_cls: type[BaseModel], name: str) -> str:
+    if (info := model_cls.__fields__.get(name)) is None:
+        raise RuntimeError(f'invalid name: {name}')
+    if alias := info.alias:
+        name = alias
     return f'{('-' if len(name) == 1 else '--')}{name.replace('_', '-')}'
 
 

{lockss_pybasic-0.2.0.dev1.dist-info → lockss_pybasic-0.2.0.dev2.dist-info}/METADATA

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

lockss_pybasic-0.2.0.dev2.dist-info/RECORD

@@ -0,0 +1,9 @@
+lockss/pybasic/__init__.py,sha256=5Oqd-wtsasL0pAV0ZY1gPORFhc5DQCAVD4eJgG0J_z8,1678
+lockss/pybasic/cliutil.py,sha256=oJ1j3y816i9Y6VlufP45I2h_k_bgCI51gehkPkuu_jQ,10842
+lockss/pybasic/errorutil.py,sha256=XI84PScZ851_-gfoazivJ8ceieMYWaxQr7qih5ltga0,1951
+lockss/pybasic/fileutil.py,sha256=BpdoPWL70xYTuhyQRBEurScRVnPQg0mX-XW8yyKPGjw,2958
+lockss/pybasic/outpututil.py,sha256=JyXKXlkaCcCGvonUvmDGRdI6PxwN5t7DPVIk64S8-2g,2345
+lockss_pybasic-0.2.0.dev2.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_pybasic-0.2.0.dev2.dist-info/METADATA,sha256=PTqTPK5-cGs_NNTcyO6XnsFq4_GFoWeBsYMMvgZ-MdM,4247
+lockss_pybasic-0.2.0.dev2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_pybasic-0.2.0.dev2.dist-info/RECORD,,

lockss_pybasic-0.2.0.dev1.dist-info/RECORD

@@ -1,9 +0,0 @@
-lockss/pybasic/__init__.py,sha256=eYuJo1k0n0klLe8HFPzmjJvcMcHS7FXQ9JdfQ4WaJVU,1678
-lockss/pybasic/cliutil.py,sha256=gC-Iy2lZX_PNU0GhtSiyPYPokFFjzF9OkMSxGEoB8_c,10503
-lockss/pybasic/errorutil.py,sha256=XI84PScZ851_-gfoazivJ8ceieMYWaxQr7qih5ltga0,1951
-lockss/pybasic/fileutil.py,sha256=BpdoPWL70xYTuhyQRBEurScRVnPQg0mX-XW8yyKPGjw,2958
-lockss/pybasic/outpututil.py,sha256=JyXKXlkaCcCGvonUvmDGRdI6PxwN5t7DPVIk64S8-2g,2345
-lockss_pybasic-0.2.0.dev1.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_pybasic-0.2.0.dev1.dist-info/METADATA,sha256=zowTdcLSf79LdOc2wFBKX2966D41kV02RYTZ8syhla4,4247
-lockss_pybasic-0.2.0.dev1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_pybasic-0.2.0.dev1.dist-info/RECORD,,