omlish 0.0.0.dev43__py3-none-any.whl → 0.0.0.dev45__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev43'
-__revision__ = '00082c22c620ab906955cc479d2d861116e82c45'
+__version__ = '0.0.0.dev45'
+__revision__ = 'db777c425b0d53ee128b96fca75e6c6f4cd43654'
 
 
 #

omlish/argparse.py

@@ -16,6 +16,9 @@ from . import check
 T = ta.TypeVar('T')
 
 
+##
+
+
 SUPPRESS = argparse.SUPPRESS
 
 OPTIONAL = argparse.OPTIONAL
@@ -45,6 +48,9 @@ Namespace = argparse.Namespace
 ArgumentParser = argparse.ArgumentParser
 
 
+##
+
+
 @dc.dataclass(eq=False)
 class Arg:
     args: ta.Sequence[ta.Any]
@@ -61,6 +67,9 @@ def arg(*args, **kwargs) -> Arg:
     return Arg(args, kwargs)
 
 
+#
+
+
 CommandFn = ta.Callable[[], None]
 
 
@@ -70,6 +79,7 @@ class Command:
     fn: CommandFn
     args: ta.Sequence[Arg] = ()
     parent: ta.Optional['Command'] = None
+    accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
         check.isinstance(self.name, str)
@@ -79,6 +89,7 @@ class Command:
         check.callable(self.fn)
         check.arg(all(isinstance(a, Arg) for a in self.args))
         check.isinstance(self.parent, (Command, None))
+        check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
 
@@ -95,6 +106,7 @@ def command(
         *args: Arg,
         name: str | None = None,
         parent: Command | None = None,
+        accepts_unknown: bool = False,
 ) -> ta.Any:  # ta.Callable[[CommandFn], Command]:  # FIXME
     for arg in args:
         check.isinstance(arg, Arg)
@@ -107,11 +119,15 @@ def command(
             fn,
             args,
             parent=parent,
+            accepts_unknown=accepts_unknown,
         )
 
     return inner
 
 
+##
+
+
 def get_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
     if ann is str:
         return {}
@@ -197,7 +213,8 @@ class Cli(metaclass=_CliMeta):
         super().__init__()
 
         self._argv = argv if argv is not None else sys.argv[1:]
-        self._args = self.get_parser().parse_args(self._argv)
+
+        self._args, self._unknown_args = self.get_parser().parse_known_args(self._argv)
 
     _parser: ta.ClassVar[ArgumentParser]
 
@@ -213,12 +230,25 @@ class Cli(metaclass=_CliMeta):
     def args(self) -> Namespace:
         return self._args
 
+    @property
+    def unknown_args(self) -> ta.Sequence[str]:
+        return self._unknown_args
+
     def _run_cmd(self, cmd: Command) -> None:
         cmd.__get__(self, type(self))()
 
     def __call__(self) -> None:
         cmd = getattr(self.args, '_cmd', None)
+
+        if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
+            msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
+            if (parser := self.get_parser()).exit_on_error:  # type: ignore
+                parser.error(msg)
+            else:
+                raise ArgumentError(None, msg)
+
         if cmd is None:
             self.get_parser().print_help()
             return
+
         self._run_cmd(cmd)

omlish/lang/descriptors.py

@@ -220,8 +220,8 @@ class AccessForbiddenDescriptor:
         raise AccessForbiddenError(self._name)
 
 
-def access_forbidden():  # noqa
-    return AccessForbiddenDescriptor()
+def access_forbidden(name=None):  # noqa
+    return AccessForbiddenDescriptor(name)
 
 
 ##

omlish/reflect/__init__.py

@@ -7,6 +7,7 @@ from .types import (  # noqa
     TYPES,
     Type,
     Union,
+    get_orig_bases,
     get_orig_class,
     get_params,
     is_type,

omlish/reflect/types.py

@@ -61,6 +61,17 @@ _KNOWN_SPECIAL_TYPE_VARS = tuple(
 ##
 
 
+_SIMPLE_GENERIC_ALIAS_TYPES: set[type] = set()
+
+
+def is_simple_generic_alias_type(oty: type) -> bool:
+    return (
+        oty is _GenericAlias or
+        oty is ta.GenericAlias or  # type: ignore  # noqa
+        oty in _SIMPLE_GENERIC_ALIAS_TYPES
+    )
+
+
 def get_params(obj: ta.Any) -> tuple[ta.TypeVar, ...]:
     if isinstance(obj, type):
         if issubclass(obj, ta.Generic):  # type: ignore
@@ -71,10 +82,7 @@ def get_params(obj: ta.Any) -> tuple[ta.TypeVar, ...]:
 
     oty = type(obj)
 
-    if (
-            oty is _GenericAlias or
-            oty is ta.GenericAlias  # type: ignore  # noqa
-    ):
+    if is_simple_generic_alias_type(oty):
         return obj.__dict__.get('__parameters__', ())  # noqa
 
     if oty is _CallableGenericAlias:
@@ -91,6 +99,10 @@ def is_union_type(cls: ta.Any) -> bool:
         return ta.get_origin(cls) in {ta.Union}
 
 
+def get_orig_bases(obj: ta.Any) -> ta.Any:
+    return obj.__orig_bases__  # noqa
+
+
 def get_orig_class(obj: ta.Any) -> ta.Any:
     return obj.__orig_class__  # noqa
 
@@ -195,8 +207,7 @@ def is_type(obj: ta.Any) -> bool:
             isinstance(obj, ta.NewType) or  # noqa
 
             (
-                oty is _GenericAlias or
-                oty is ta.GenericAlias or  # type: ignore  # noqa
+                is_simple_generic_alias_type(oty) or
                 oty is _CallableGenericAlias
             ) or
 
@@ -222,8 +233,7 @@ def type_(obj: ta.Any) -> Type:
         return NewType(obj)
 
     if (
-            oty is _GenericAlias or
-            oty is ta.GenericAlias or  # type: ignore  # noqa
+            is_simple_generic_alias_type(oty) or
             oty is _CallableGenericAlias
     ):
         origin = ta.get_origin(obj)

omlish/specs/__init__.py

@@ -1,9 +1,10 @@
 """
 TODO:
  - avro
+ - iceberg
  - jmespath
+ - jsonnet
  - jsonpatch
  - jsonpointer.py
- - openapi
  - protobuf
 """

{omlish-0.0.0.dev43.dist-info → omlish-0.0.0.dev45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev43
+Version: 0.0.0.dev45
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev43.dist-info → omlish-0.0.0.dev45.dist-info}/RECORD

@@ -1,7 +1,7 @@
 omlish/.manifests.json,sha256=FPSgLg_3QDVzKlNOuqV3dMqhja2KG_TUfKdGmHE8Eg4,803
-omlish/__about__.py,sha256=r89Z8V9DxpOVxM2o7M6f4JV4JEbBfeEO1OjjT6MpsLE,2919
+omlish/__about__.py,sha256=ksJohON1-moGxasw7d_K1YOOVRTb4318HQNolEuZ3zo,2919
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/argparse.py,sha256=QUUS6sv2ftfcmhDj4qU429mEE_lfWa0UN5yYpPG65B0,6265
+omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
 omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
 omlish/check.py,sha256=fgWiBoHvqZlE8tjaxK7OMW4J8z3_rEGRENTka3EohbI,10378
@@ -174,7 +174,7 @@ omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
 omlish/lang/contextmanagers.py,sha256=NEwaTLQMfhKawD5x_0HgI2RpeLXbMa5r9NqWqfDnUXI,10408
 omlish/lang/datetimes.py,sha256=ehI_DhQRM-bDxAavnp470XcekbbXc4Gdw9y1KpHDJT0,223
-omlish/lang/descriptors.py,sha256=OLM1qi14kY7PLGIJnvkd6CBEOzHgD9q8Cs2cB6Kzflk,6602
+omlish/lang/descriptors.py,sha256=tszC_fMICqCz1cUXejJ4beWzt6DlIBulknJFRkSTZp4,6615
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=kkPfcdocg-OmyN7skIqrFxNvqAv89Zc_kXKYAN8vw8g,3895
 omlish/lang/imports.py,sha256=04ugFC8NI5sbL7NH4V0r0q_nFsP_AMkHLz697CVkMtQ,6274
@@ -250,11 +250,11 @@ omlish/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/math/bits.py,sha256=yip1l8agOYzT7bFyMGc0RR3XlnGCfHMpjw_SECLLh1I,3477
 omlish/math/floats.py,sha256=UimhOT7KRl8LXTzOI5cQWoX_9h6WNWe_3vcOuO7-h_8,327
 omlish/math/stats.py,sha256=MegzKVsmv2kra4jDWLOUgV0X7Ee2Tbl5u6ql1v4-dEY,10053
-omlish/reflect/__init__.py,sha256=iWDCNJNP4afPcv-MxZRJSIRQ4NRw6XYPyRHhBXb5YIA,667
+omlish/reflect/__init__.py,sha256=8t2955chuWPzj8yiV7R_jlREAezSz6CVTJ0HKY58Vpk,687
 omlish/reflect/isinstance.py,sha256=x5T9S2634leinBT4hl3CZZkRttvdvvlxChkC_x9Qu2s,1176
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=JM2RGv2-Rcex8wCqhmgvRG59zD242P9jM3O2QLjKWWo,3586
-omlish/reflect/types.py,sha256=R9AH5YnOvdZs6QhzJ6VmjvcvGibQEQi6YqK25f5VUxw,6862
+omlish/reflect/types.py,sha256=Zkcp8nx_vFNH7pBZ5pU5P0wIgQCauj5Nic3BZb5cRik,7030
 omlish/secrets/__init__.py,sha256=VKB2IF9vz4h4RXcZxgXj36KXOLcGBzfqVnxPgPDWpmg,408
 omlish/secrets/crypto.py,sha256=6CsLy0UEqCrBK8Xx_3-iFF6SKtu2GlEqUQ8-MliY3tk,3709
 omlish/secrets/marshal.py,sha256=U9uSRTWzZmumfNZeh_dROwVdGrARsp155TylRbjilP8,2048
@@ -262,7 +262,7 @@ omlish/secrets/openssl.py,sha256=wxA_wIlxtuOUy71ABxAJgavh-UI_taOfm-A0dVlmSwM,621
 omlish/secrets/passwords.py,sha256=3r-vEK6Gp6aq4L5Csnd06QnrjO9xfzHJP-g_7I9W_ao,4101
 omlish/secrets/secrets.py,sha256=ClD7t_mkmWkseVk4ahLzYLuLXeTxiwwPiidYm42vLh4,6871
 omlish/secrets/subprocesses.py,sha256=EcnKlHHtnUMHGrBWXDfu8tv28wlgZx4P4GOiuPW9Vo8,1105
-omlish/specs/__init__.py,sha256=_CSPXx25uGhXkmqLs9CSdcWAkZaQnc3cJk3lb2dadgE,88
+omlish/specs/__init__.py,sha256=R5X62_Iur9gg_gWLWJCgjSK_zec76g15agYPLNgwfGc,99
 omlish/specs/jsonrpc/__init__.py,sha256=E0EogYSKmbj1D-V57tBgPDTyVuD8HosHqVg0Vh1CVwM,416
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
 omlish/specs/jsonrpc/marshal.py,sha256=iXZNR7n0vfL_yiPFFYN-ZyGlzknNXExs2qC1HFChGPU,1913
@@ -328,9 +328,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev43.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev43.dist-info/METADATA,sha256=uuX1PAEvidaoC9uBAqHDBXL1Td-VZiG_xC1MdX_GKKY,3817
-omlish-0.0.0.dev43.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev43.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev43.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev43.dist-info/RECORD,,
+omlish-0.0.0.dev45.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev45.dist-info/METADATA,sha256=Wgmc5z7G_7Nqo7dCn6hUlxya_-xb7yRNAy9kFr16xC0,3817
+omlish-0.0.0.dev45.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev45.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev45.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev45.dist-info/RECORD,,