omlish 0.0.0.dev43__tar.gz → 0.0.0.dev45__tar.gz

{omlish-0.0.0.dev43/omlish.egg-info → omlish-0.0.0.dev45}/PKG-INFO

@@ -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 → omlish-0.0.0.dev45}/omlish/__about__.py

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

{omlish-0.0.0.dev43 → omlish-0.0.0.dev45}/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-0.0.0.dev43 → omlish-0.0.0.dev45}/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-0.0.0.dev43 → omlish-0.0.0.dev45}/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-0.0.0.dev43 → omlish-0.0.0.dev45}/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-0.0.0.dev43 → omlish-0.0.0.dev45}/omlish/specs/__init__.py

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

{omlish-0.0.0.dev43 → omlish-0.0.0.dev45/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev45}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev43'
+version = '0.0.0.dev45'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',