omlish 0.0.0.dev340__tar.gz → 0.0.0.dev342__tar.gz

{omlish-0.0.0.dev340/omlish.egg-info → omlish-0.0.0.dev342}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev340
+Version: 0.0.0.dev342
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev340'
-__revision__ = 'de9a88b0e8d5578e5348e4f23db01e09dd3ebbd0'
+__version__ = '0.0.0.dev342'
+__revision__ = '37c634909aaecb50fcea253cc6c335d8d906c25f'
 
 
 #

omlish-0.0.0.dev342/omlish/check.py

@@ -0,0 +1,271 @@
+"""
+While the core functionality lives in `lite/check.py` and is available in lite code, this module re-exports the contents
+of its `check` API object as module-globals for convenience. It also sets up some non-lite integration, most notably
+`ArgsRenderer` for rendering the AST's and values of failed checks (if the necessary optional dependencies are present).
+"""
+import typing as ta
+
+from .lite.check import CheckArgsRenderer as ArgsRenderer  # noqa
+from .lite.check import CheckExceptionFactory as ExceptionFactory  # noqa
+from .lite.check import CheckLateConfigureFn as LateConfigureFn  # noqa
+from .lite.check import CheckMessage as Message  # noqa
+from .lite.check import CheckOnRaiseFn as OnRaiseFn  # noqa
+from .lite.check import Checks
+from .lite.check import check
+
+
+T = ta.TypeVar('T')
+SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
+
+
+_isinstance = isinstance
+_issubclass = issubclass
+_callable = callable
+
+
+##
+
+
+def register_on_raise(fn: OnRaiseFn) -> None:
+    check.register_on_raise(fn)
+
+
+def unregister_on_raise(fn: OnRaiseFn) -> None:
+    check.unregister_on_raise(fn)
+
+
+##
+
+
+def _try_get_args_rendering() -> ArgsRenderer | None:
+    try:
+        from .diag.asts import ArgsRenderer
+
+        ArgsRenderer.smoketest()
+
+    except Exception:  # noqa
+        return None
+
+    def _real_render_args(fmt: str, *args: ta.Any) -> str | None:
+        ra = ArgsRenderer(back=3).render_args(*args)
+        if ra is None:
+            return None
+
+        return fmt % tuple(str(a) for a in ra)
+
+    return _real_render_args
+
+
+def _try_enable_args_rendering(c: Checks) -> None:
+    if (rf := _try_get_args_rendering()) is not None:
+        c.set_args_renderer(rf)
+
+
+check.register_late_configure(_try_enable_args_rendering)
+
+
+##
+# The following code manually proxies to the lite code, as opposed to simply assigning global names to instance methods
+# of `check`, to assist type analysis in tools - pycharm for example has a hard time deducing the return types in such
+# cases. The functions are however dynamically overwritten below with direct references to the method to remove one
+# layer of call indirection at runtime.
+
+
+_CHECK_PROXY_FUNCTIONS: dict[str, ta.Any] = {}
+
+
+def _check_proxy_function(fn: T) -> T:
+    name = fn.__name__  # type: ignore[attr-defined]
+    if name in _CHECK_PROXY_FUNCTIONS:
+        raise NameError(fn)
+    _CHECK_PROXY_FUNCTIONS[name] = fn
+    return fn
+
+
+##
+
+
+@ta.overload
+def isinstance(v: ta.Any, spec: type[T], msg: Message = None) -> T:  # noqa
+    ...
+
+
+@ta.overload
+def isinstance(v: ta.Any, spec: ta.Any, msg: Message = None) -> ta.Any:  # noqa
+    ...
+
+
+@_check_proxy_function
+def isinstance(v, spec, msg=None):  # noqa
+    return check.isinstance(v, spec, msg=msg)
+
+
+@ta.overload
+def of_isinstance(spec: type[T], msg: Message = None) -> ta.Callable[[ta.Any], T]:
+    ...
+
+
+@ta.overload
+def of_isinstance(spec: ta.Any, msg: Message = None) -> ta.Callable[[ta.Any], ta.Any]:
+    ...
+
+
+@_check_proxy_function
+def of_isinstance(spec, msg=None):
+    return check.of_isinstance(spec, msg=msg)
+
+
+@_check_proxy_function
+def cast(v: ta.Any, cls: type[T], msg: Message = None) -> T:
+    return check.cast(v, cls, msg=msg)
+
+
+@_check_proxy_function
+def of_cast(cls: type[T], msg: Message = None) -> ta.Callable[[T], T]:
+    return check.of_cast(cls, msg=msg)
+
+
+@_check_proxy_function
+def not_isinstance(v: T, spec: ta.Any, msg: Message = None) -> T:
+    return check.not_isinstance(v, spec, msg=msg)
+
+
+@_check_proxy_function
+def of_not_isinstance(spec: ta.Any, msg: Message = None) -> ta.Callable[[T], T]:
+    return check.of_not_isinstance(spec, msg=msg)
+
+
+#
+
+
+@_check_proxy_function
+def issubclass(v: type[T], spec: ta.Any, msg: Message = None) -> type[T]:  # noqa
+    return check.issubclass(v, spec, msg=msg)
+
+
+@_check_proxy_function
+def not_issubclass(v: type[T], spec: ta.Any, msg: Message = None) -> type[T]:
+    return check.not_issubclass(v, spec, msg=msg)
+
+
+#
+
+
+@_check_proxy_function
+def in_(v: T, c: ta.Container[T], msg: Message = None) -> T:
+    return check.in_(v, c, msg=msg)
+
+
+@_check_proxy_function
+def not_in(v: T, c: ta.Container[T], msg: Message = None) -> T:
+    return check.not_in(v, c, msg=msg)
+
+
+@_check_proxy_function
+def empty(v: SizedT, msg: Message = None) -> SizedT:
+    return check.empty(v, msg=msg)
+
+
+@_check_proxy_function
+def iterempty(v: ta.Iterable[T], msg: Message = None) -> ta.Iterable[T]:
+    return check.iterempty(v, msg=msg)
+
+
+@_check_proxy_function
+def not_empty(v: SizedT, msg: Message = None) -> SizedT:
+    return check.not_empty(v, msg=msg)
+
+
+@_check_proxy_function
+def unique(it: ta.Iterable[T], msg: Message = None) -> ta.Iterable[T]:
+    return check.unique(it, msg=msg)
+
+
+@_check_proxy_function
+def single(obj: ta.Iterable[T], msg: Message = None) -> T:
+    return check.single(obj, msg=msg)
+
+
+@_check_proxy_function
+def opt_single(obj: ta.Iterable[T], msg: Message = None) -> T | None:
+    return check.opt_single(obj, msg=msg)
+
+
+#
+
+
+@_check_proxy_function
+def none(v: ta.Any, msg: Message = None) -> None:
+    return check.none(v, msg=msg)
+
+
+@_check_proxy_function
+def not_none(v: T | None, msg: Message = None) -> T:
+    return check.not_none(v, msg=msg)
+
+
+#
+
+
+@_check_proxy_function
+def equal(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.equal(v, o, msg=msg)
+
+
+@_check_proxy_function
+def not_equal(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.not_equal(v, o, msg=msg)
+
+
+@_check_proxy_function
+def is_(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.is_(v, o, msg=msg)
+
+
+@_check_proxy_function
+def is_not(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.is_not(v, o, msg=msg)
+
+
+@_check_proxy_function
+def callable(v: T, msg: Message = None) -> T:  # noqa
+    return check.callable(v, msg=msg)
+
+
+@_check_proxy_function
+def non_empty_str(v: str | None, msg: Message = None) -> str:
+    return check.non_empty_str(v, msg=msg)
+
+
+@_check_proxy_function
+def replacing(expected: ta.Any, old: ta.Any, new: T, msg: Message = None) -> T:
+    return check.replacing(expected, old, new, msg=msg)
+
+
+@_check_proxy_function
+def replacing_none(old: ta.Any, new: T, msg: Message = None) -> T:
+    return check.replacing_none(old, new, msg=msg)
+
+
+#
+
+
+@_check_proxy_function
+def arg(v: bool, msg: Message = None) -> None:
+    return check.arg(v, msg=msg)
+
+
+@_check_proxy_function
+def state(v: bool, msg: Message = None) -> None:
+    return check.state(v, msg=msg)
+
+
+##
+
+
+def _install_direct_check_proxy_functions() -> None:
+    for n in _CHECK_PROXY_FUNCTIONS:
+        globals()[n] = getattr(check, n)
+
+
+_install_direct_check_proxy_functions()

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/lite/check.py

@@ -177,7 +177,7 @@ class Checks:
 
         return inner
 
-    def cast(self, v: ta.Any, cls: ta.Type[T], msg: CheckMessage = None) -> T:  # noqa
+    def cast(self, v: ta.Any, cls: ta.Type[T], msg: CheckMessage = None) -> T:
         if not isinstance(v, cls):
             self._raise(
                 TypeError,
@@ -226,7 +226,7 @@ class Checks:
 
         return v
 
-    def not_issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None) -> ta.Type[T]:  # noqa
+    def not_issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None) -> ta.Type[T]:
         if issubclass(v, spec):
             self._raise(
                 TypeError,
@@ -317,21 +317,21 @@ class Checks:
 
         return it
 
-    def single(self, obj: ta.Iterable[T], message: CheckMessage = None) -> T:
+    def single(self, obj: ta.Iterable[T], msg: CheckMessage = None) -> T:
         try:
             [value] = obj
         except ValueError:
             self._raise(
                 ValueError,
                 'Must be single',
-                message,
+                msg,
                 Checks._ArgsKwargs(obj),
                 render_fmt='%s',
             )
 
         return value
 
-    def opt_single(self, obj: ta.Iterable[T], message: CheckMessage = None) -> ta.Optional[T]:
+    def opt_single(self, obj: ta.Iterable[T], msg: CheckMessage = None) -> ta.Optional[T]:
         it = iter(obj)
         try:
             value = next(it)
@@ -346,7 +346,7 @@ class Checks:
         self._raise(
             ValueError,
             'Must be empty or single',
-            message,
+            msg,
             Checks._ArgsKwargs(obj),
             render_fmt='%s',
         )

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/logs/standard.py

@@ -39,7 +39,7 @@ class StandardLogFormatter(logging.Formatter):
     converter = datetime.datetime.fromtimestamp  # type: ignore
 
     def formatTime(self, record, datefmt=None):
-        ct = self.converter(record.created)  # type: ignore
+        ct = self.converter(record.created)
         if datefmt:
             return ct.strftime(datefmt)  # noqa
         else:

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/reflect/types.py

@@ -385,17 +385,19 @@ class Reflector:
                     obj,
                 )
 
+            r_args = tuple(self.type(a) for a in args)
+
             if _is_immediate_protocol(origin):
                 return Protocol(
                     origin,
-                    args,
+                    r_args,
                     params,
                     obj,
                 )
 
             return Generic(
                 origin,
-                tuple(self.type(a) for a in args),
+                r_args,
                 params,
                 obj,
             )

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/typedvalues/__init__.py

@@ -6,12 +6,17 @@ from .collection import (  # noqa
     DuplicateUniqueTypedValueError,
 
     TypedValues,
+
+    collect,
+    as_collection,
 )
 
 from .consumer import (  # noqa
     UnconsumedTypedValuesError,
 
     TypedValuesConsumer,
+
+    consume,
 )
 
 from .generic import (  # noqa

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/typedvalues/collection.py

@@ -205,3 +205,13 @@ class TypedValues(
         ret = tuple(tv for tv in self if isinstance(tv, cls))
         any_dct[cls] = ret
         return ret
+
+
+collect = TypedValues
+
+
+def as_collection(src: ta.Sequence[TypedValueT]) -> TypedValues[TypedValueT]:
+    if isinstance(src, TypedValues):
+        return src
+    else:
+        return TypedValues(*src)

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/omlish/typedvalues/consumer.py

@@ -173,3 +173,15 @@ class TypedValuesConsumer(ta.Generic[TypedValueT]):
                 continue
             dct[k] = v.v  # type: ignore[attr-defined]
         return dct
+
+
+def consume(
+    *tvs: TypedValueT,
+    override: bool = False,
+    check_type: type | tuple[type, ...] | None = None,
+) -> TypedValuesConsumer[TypedValueT]:
+    return tvc.TypedValues(
+        *tvs,
+        override=override,
+        check_type=check_type,
+    ).consume()

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev340
+Version: 0.0.0.dev342
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev340 → omlish-0.0.0.dev342}/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.dev340'
+version = '0.0.0.dev342'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev340/omlish/check.py

@@ -1,104 +0,0 @@
-"""
-While the core functionality lives in `lite/check.py` and is available in lite code, this module re-exports the contents
-of its `check` API object as module-globals for convenience. It also sets up some non-lite integration, most notably
-`ArgsRenderer` for rendering the AST's and values of failed checks (if the necessary optional dependencies are present).
-"""
-import typing as ta
-
-from .lite.check import CheckArgsRenderer as ArgsRenderer  # noqa
-from .lite.check import CheckExceptionFactory as ExceptionFactory  # noqa
-from .lite.check import CheckLateConfigureFn as LateConfigureFn  # noqa
-from .lite.check import CheckMessage as Message  # noqa
-from .lite.check import CheckOnRaiseFn as OnRaiseFn  # noqa
-from .lite.check import Checks
-from .lite.check import check
-
-
-_isinstance = isinstance
-_issubclass = issubclass
-_callable = callable
-
-
-##
-
-
-register_on_raise = check.register_on_raise
-unregister_on_raise = check.unregister_on_raise
-
-
-##
-
-
-def _try_get_args_rendering() -> ArgsRenderer | None:
-    try:
-        from .diag.asts import ArgsRenderer
-
-        ArgsRenderer.smoketest()
-
-    except Exception:  # noqa
-        return None
-
-    def _real_render_args(fmt: str, *args: ta.Any) -> str | None:
-        ra = ArgsRenderer(back=3).render_args(*args)
-        if ra is None:
-            return None
-
-        return fmt % tuple(str(a) for a in ra)
-
-    return _real_render_args
-
-
-def _try_enable_args_rendering(c: Checks) -> None:
-    if (rf := _try_get_args_rendering()) is not None:
-        c.set_args_renderer(rf)
-
-
-check.register_late_configure(_try_enable_args_rendering)
-
-
-##
-
-
-isinstance = check.isinstance  # noqa
-of_isinstance = check.of_isinstance
-cast = check.cast
-of_cast = check.of_cast
-not_isinstance = check.not_isinstance
-of_not_isinstance = check.of_not_isinstance
-
-#
-
-issubclass = check.issubclass  # noqa
-not_issubclass = check.not_issubclass
-
-#
-
-in_ = check.in_
-not_in = check.not_in
-empty = check.empty
-iterempty = check.iterempty
-not_empty = check.not_empty
-unique = check.unique
-single = check.single
-opt_single = check.opt_single
-
-#
-
-none = check.none
-not_none = check.not_none
-
-#
-
-equal = check.equal
-not_equal = check.not_equal
-is_ = check.is_
-is_not = check.is_not
-callable = check.callable  # noqa
-non_empty_str = check.non_empty_str
-replacing = check.replacing
-replacing_none = check.replacing_none
-
-#
-
-arg = check.arg
-state = check.state