omlish 0.0.0.dev247__tar.gz → 0.0.0.dev249__tar.gz

{omlish-0.0.0.dev247/omlish.egg-info → omlish-0.0.0.dev249}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev247
+Version: 0.0.0.dev249
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/.manifests.json

@@ -167,7 +167,7 @@
     "module": ".formats.yaml",
     "attr": "_YAML_LAZY_CODEC",
     "file": "omlish/formats/yaml.py",
-    "line": 258,
+    "line": 255,
     "value": {
       "$.codecs.base.LazyLoadedCodec": {
         "mod_name": "omlish.formats.yaml",
@@ -183,7 +183,7 @@
     "module": ".formats.yaml",
     "attr": "_YAML_UNSAFE_LAZY_CODEC",
     "file": "omlish/formats/yaml.py",
-    "line": 265,
+    "line": 262,
     "value": {
       "$.codecs.base.LazyLoadedCodec": {
         "mod_name": "omlish.formats.yaml",

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev247'
-__revision__ = '537438b3d967f194ec6ec7277d9e06205bac12b5'
+__version__ = '0.0.0.dev249'
+__revision__ = '0ad7e21d0ef610493354b1fbd22f7c3be5fc9bea'
 
 
 #

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/collections/cache/descriptor.py

@@ -63,7 +63,6 @@ def _make_key(
 
 
 class Ignore:
-
     def __init__(self, value: ta.Any) -> None:
         super().__init__()
 
@@ -75,7 +74,6 @@ def ignore(value: ta.Any) -> ta.Any:
 
 
 class _CacheDescriptor:
-
     def __init__(
             self,
             fn: ta.Callable,

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/concurrent/executors.py

@@ -8,7 +8,6 @@ P = ta.ParamSpec('P')
 
 
 class ImmediateExecutor(cf.Executor):
-
     def __init__(self, *, immediate_exceptions: bool = False) -> None:
         super().__init__()
         self._immediate_exceptions = immediate_exceptions

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/concurrent/futures.py

@@ -10,7 +10,6 @@ T = ta.TypeVar('T')
 
 
 class FutureError(Exception, ta.Generic[T]):
-
     def __init__(self, future: cf.Future, target: T | None = None) -> None:
         super().__init__()
 

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dataclasses/impl/descriptors.py

@@ -6,7 +6,6 @@ from ... import defs
 
 
 class AbstractFieldDescriptor(abc.ABC):
-
     def __init__(
             self,
             *,
@@ -69,7 +68,6 @@ class AbstractFieldDescriptor(abc.ABC):
 
 
 class PyFieldDescriptor(AbstractFieldDescriptor):
-
     def __init__(
             self,
             attr: str,

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/diag/replserver/server.py

@@ -38,7 +38,6 @@ log = logging.getLogger(__name__)
 
 
 class ReplServer:
-
     CONNECTION_THREAD_NAME = 'ReplServerConnection'
 
     @dc.dataclass(frozen=True)

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dispatch/_dispatch2.py

@@ -2,7 +2,7 @@ import abc
 import typing as ta
 import weakref
 
-from .dispatch import find_impl
+from .impls import find_impl as default_find_impl
 
 
 T = ta.TypeVar('T')
@@ -12,9 +12,13 @@ T = ta.TypeVar('T')
 
 
 class Dispatcher(ta.Generic[T]):
-    def __init__(self) -> None:
+    def __init__(self, find_impl: ta.Callable[[type, ta.Mapping[type, T]], T | None] | None = None) -> None:
         super().__init__()
 
+        if find_impl is None:
+            find_impl = default_find_impl
+        self._find_impl = find_impl
+
         self._impls_by_arg_cls: dict[type, T] = {}
         self._dispatch_cache: dict[ta.Any, T | None] = {}
 
@@ -59,7 +63,7 @@ class Dispatcher(ta.Generic[T]):
         try:
             impl = self._impls_by_arg_cls[cls]
         except KeyError:
-            impl = find_impl(cls, self._impls_by_arg_cls)
+            impl = self._find_impl(cls, self._impls_by_arg_cls)
 
         self._dispatch_cache[weakref.ref(cls, self._cache_remove)] = impl
         return impl

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dispatch/_dispatch3.py

@@ -2,7 +2,7 @@ import abc
 import typing as ta
 import weakref
 
-from .dispatch import find_impl
+from .impls import find_impl as default_find_impl
 
 
 T = ta.TypeVar('T')
@@ -72,9 +72,13 @@ class DispatchCache(DispatchCacheProtocol[T]):
 
 
 class Dispatcher(DispatcherProtocol[T]):
-    def __init__(self) -> None:
+    def __init__(self, find_impl: ta.Callable[[type, ta.Mapping[type, T]], T | None] | None = None) -> None:
         super().__init__()
 
+        if find_impl is None:
+            find_impl = default_find_impl
+        self._find_impl = find_impl
+
         self._impls_by_arg_cls: dict[type, T] = {}
         self._cache: DispatchCache[T | None] = DispatchCache()
 
@@ -98,7 +102,7 @@ class Dispatcher(DispatcherProtocol[T]):
         try:
             impl = self._impls_by_arg_cls[cls]
         except KeyError:
-            impl = find_impl(cls, self._impls_by_arg_cls)
+            impl = self._find_impl(cls, self._impls_by_arg_cls)
 
         self._cache.put(cls, impl)
         return impl

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dispatch/dispatch.py

@@ -3,9 +3,7 @@ import contextlib
 import typing as ta
 import weakref
 
-from .. import c3
-from .. import check
-from .. import reflect as rfl
+from .impls import find_impl as default_find_impl
 
 
 T = ta.TypeVar('T')
@@ -14,69 +12,13 @@ T = ta.TypeVar('T')
 ##
 
 
-_IMPL_FUNC_CLS_SET_CACHE: ta.MutableMapping[ta.Callable, frozenset[type]] = weakref.WeakKeyDictionary()
-
-
-def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
-    with contextlib.suppress(KeyError):
-        return _IMPL_FUNC_CLS_SET_CACHE[func]
-
-    ann = getattr(func, '__annotations__', {})
-    if not ann:
-        raise TypeError(f'Invalid impl func: {func!r}')
-
-    def erase(a):
-        if isinstance(a, rfl.Generic):
-            return a.cls
-        else:
-            return check.isinstance(a, type)
-
-    # Exclude 'return' to support difficult to handle return types - they are unimportant.
-    # TODO: only get hints for first arg - requires inspection, which requires chopping off `self`, which can be tricky.
-    _, cls = next(iter(rfl.get_filtered_type_hints(func, exclude=['return']).items()))
-
-    rty = rfl.type_(cls)
-    if isinstance(rty, rfl.Union):
-        ret = frozenset(erase(arg) for arg in rty.args)
-    else:
-        ret = frozenset([erase(rty)])
-
-    _IMPL_FUNC_CLS_SET_CACHE[func] = ret
-    return ret
-
-
-def find_impl(cls: type, registry: ta.Mapping[type, T]) -> T | None:
-    mro = c3.compose_mro(cls, registry.keys())
-
-    match: type | None = None
-    for t in mro:
-        if match is not None:
-            # If *match* is an implicit ABC but there is another unrelated, equally matching implicit ABC, refuse the
-            # temptation to guess.
-            if (
-                    t in registry
-                    and t not in cls.__mro__
-                    and match not in cls.__mro__
-                    and not issubclass(match, t)
-            ):
-                raise RuntimeError(f'Ambiguous dispatch: {match} or {t}')
-            break
-
-        if t in registry:
-            match = t
-
-    if match is None:
-        return None
-    return registry.get(match)
-
-
-##
-
-
 class Dispatcher(ta.Generic[T]):
-    def __init__(self) -> None:
+    def __init__(self, find_impl: ta.Callable[[type, ta.Mapping[type, T]], T | None] | None = None) -> None:
         super().__init__()
 
+        if find_impl is None:
+            find_impl = default_find_impl
+
         impls_by_arg_cls: dict[type, T] = {}
         self._impls_by_arg_cls = impls_by_arg_cls
 
@@ -142,3 +84,27 @@ class Dispatcher(ta.Generic[T]):
     dispatch: ta.Callable[[type], T | None]
 
     register: ta.Callable[[T, ta.Iterable[type]], T]
+
+
+##
+
+
+# from x.dispatch import _gpto1_2 as _dispatch  # noqa
+#
+#
+# class Dispatcher(ta.Generic[T]):  # noqa
+#     def __init__(self, find_impl: ta.Callable[[type, ta.Mapping[type, T]], T | None] | None = None) -> None:
+#         super().__init__()
+#
+#         if find_impl is None:
+#             find_impl = default_find_impl
+#         self._x = _dispatch.Dispatcher(find_impl)
+#
+#     def cache_size(self) -> int:
+#         return self._x.cache_size()
+#
+#     def dispatch(self, cls: type) -> T | None:
+#         return self._x.dispatch(cls)
+#
+#     def register(self, impl: T, cls_col: ta.Iterable[type]) -> T:
+#         return self._x.register(impl, cls_col)

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dispatch/functions.py

@@ -3,7 +3,7 @@ import typing as ta
 
 from .. import check
 from .dispatch import Dispatcher
-from .dispatch import get_impl_func_cls_set
+from .impls import get_impl_func_cls_set
 
 
 # USE_EXTENSION = True

omlish-0.0.0.dev249/omlish/dispatch/impls.py

@@ -0,0 +1,69 @@
+import contextlib
+import typing as ta
+import weakref
+
+from .. import c3
+from .. import check
+from .. import reflect as rfl
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+_IMPL_FUNC_CLS_SET_CACHE: ta.MutableMapping[ta.Callable, frozenset[type]] = weakref.WeakKeyDictionary()
+
+
+def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
+    with contextlib.suppress(KeyError):
+        return _IMPL_FUNC_CLS_SET_CACHE[func]
+
+    ann = getattr(func, '__annotations__', {})
+    if not ann:
+        raise TypeError(f'Invalid impl func: {func!r}')
+
+    def erase(a):
+        if isinstance(a, rfl.Generic):
+            return a.cls
+        else:
+            return check.isinstance(a, type)
+
+    # Exclude 'return' to support difficult to handle return types - they are unimportant.
+    # TODO: only get hints for first arg - requires inspection, which requires chopping off `self`, which can be tricky.
+    _, cls = next(iter(rfl.get_filtered_type_hints(func, exclude=['return']).items()))
+
+    rty = rfl.type_(cls)
+    if isinstance(rty, rfl.Union):
+        ret = frozenset(erase(arg) for arg in rty.args)
+    else:
+        ret = frozenset([erase(rty)])
+
+    _IMPL_FUNC_CLS_SET_CACHE[func] = ret
+    return ret
+
+
+def find_impl(cls: type, registry: ta.Mapping[type, T]) -> T | None:
+    mro = c3.compose_mro(cls, registry.keys())
+
+    match: type | None = None
+    for t in mro:
+        if match is not None:
+            # If *match* is an implicit ABC but there is another unrelated, equally matching implicit ABC, refuse the
+            # temptation to guess.
+            if (
+                    t in registry
+                    and t not in cls.__mro__
+                    and match not in cls.__mro__
+                    and not issubclass(match, t)
+            ):
+                raise RuntimeError(f'Ambiguous dispatch: {match} or {t}')
+            break
+
+        if t in registry:
+            match = t
+
+    if match is None:
+        return None
+    return registry.get(match)

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dispatch/methods.py

@@ -12,7 +12,7 @@ import weakref
 from .. import check
 from .. import lang
 from .dispatch import Dispatcher
-from .dispatch import get_impl_func_cls_set
+from .impls import get_impl_func_cls_set
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/dynamic.py

@@ -46,7 +46,6 @@ class UnboundVarError(ValueError):
 
 
 class Var(ta.Generic[T]):
-
     def __init__(
             self,
             default: type[MISSING] | T = MISSING,
@@ -152,7 +151,6 @@ class Var(ta.Generic[T]):
 
 
 class Binding(ta.Generic[T]):
-
     _frame: types.FrameType
     _frame_bindings: ta.MutableMapping[int, 'Binding']
     _level: int
@@ -207,7 +205,6 @@ class Binding(ta.Generic[T]):
 
 
 class _GeneratorContextManager(contextlib._GeneratorContextManager):  # noqa
-
     @hoist(2)
     def __enter__(self):
         return super().__enter__()

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/formats/json/stream/build.py

@@ -19,6 +19,8 @@ class JsonObjectBuilder:
             *,
             yield_object_lists: bool = False,
     ) -> None:
+        super().__init__()
+
         self._stack: list[JsonStreamObject | list | Key] = []
         self._yield_object_lists = yield_object_lists
 

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/formats/yaml.py

@@ -45,7 +45,6 @@ class NodeWrapped(lang.Final, ta.Generic[T]):
 
 
 class NodeUnwrapper:
-
     seq_types: tuple[type, ...] = (
         list,
         set,
@@ -95,7 +94,6 @@ def unwrap(nw: NodeWrapped[T]) -> T:
 
 
 class NodeWrappingConstructorMixin:
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -159,7 +157,6 @@ class _cached_class_property:  # noqa
 
 
 class WrappedLoaders(lang.Namespace):
-
     @staticmethod
     def _wrap(cls):  # noqa
         return type('NodeWrapping$' + cls.__name__, (NodeWrappingConstructorMixin, cls), {})

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/graphs/dags.py

@@ -51,7 +51,6 @@ def invert_symmetric_set_map(src: ta.Mapping[T, ta.Iterable[T]]) -> dict[T, set[
 
 
 class Dag(ta.Generic[T]):
-
     def __init__(self, input_its_by_outputs: ta.Mapping[T, ta.Iterable[T]]) -> None:
         super().__init__()
 
@@ -70,7 +69,6 @@ class Dag(ta.Generic[T]):
 
 
 class Subdag(ta.Generic[U]):
-
     def __init__(
             self,
             dag: 'Dag[U]',

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/graphs/domination.py

@@ -13,7 +13,6 @@ SetMap = ta.Mapping[MK, ta.AbstractSet[MV]]
 
 
 class DirectedGraph(ta.Generic[V], lang.Abstract):
-
     @abc.abstractmethod
     def get_successors(self, vertex: V) -> ta.Collection[V]:
         raise NotImplementedError
@@ -24,7 +23,6 @@ class DirectedGraph(ta.Generic[V], lang.Abstract):
 
 
 class ListDictDirectedGraph(DirectedGraph[V]):
-
     def __init__(self, items: ta.Iterable[tuple[V, ta.Iterable[V]]]) -> None:
         super().__init__()
 
@@ -59,7 +57,6 @@ class ListDictDirectedGraph(DirectedGraph[V]):
 
 
 class DominatorTree(ta.Generic[V]):
-
     def __init__(self, graph: DirectedGraph[V], root: V) -> None:
         super().__init__()
 
@@ -138,7 +135,6 @@ class DominatorTree(ta.Generic[V]):
 
 
 class _Dfs(ta.Generic[V]):
-
     def __init__(self, graph: DirectedGraph[V], root: V) -> None:
         super().__init__()
 
@@ -191,7 +187,6 @@ class _Dfs(ta.Generic[V]):
 
 
 class _ImmediateDominanceComputer(ta.Generic[V]):
-
     def __init__(self, dfs: _Dfs[V]) -> None:
         super().__init__()
 

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/graphs/dot/items.py

@@ -17,7 +17,6 @@ class Item(dc.Frozen, lang.Abstract, lang.Sealed):
 
 
 class Value(Item, lang.Abstract):
-
     @classmethod
     def of(cls, obj: ta.Union['Value', str, ta.Sequence]) -> 'Value':
         if isinstance(obj, Value):

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/graphs/dot/rendering.py

@@ -21,7 +21,6 @@ from .items import Text
 
 
 class Renderer:
-
     def __init__(self, out: ta.TextIO) -> None:
         super().__init__()
 

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/graphs/trees.py

@@ -40,7 +40,6 @@ class UnknownNodeError(NodeError[NodeT]):
 
 
 class BasicTreeAnalysis(ta.Generic[NodeT]):
-
     def __init__(
             self,
             root: NodeT,

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/inject/binder.py

@@ -1,13 +1,3 @@
-"""
-TODO:
- - multis?
-
-class SetBinding(Element, lang.Final):
-class SetProvider(Provider):
-
-class MapBinding(Element, lang.Final):
-class MapProvider(Provider):
-"""
 import functools
 import inspect
 import types

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/iterators/iterators.py

@@ -9,7 +9,6 @@ _MISSING = object()
 
 
 class PeekIterator(ta.Iterator[T]):
-
     def __init__(self, it: ta.Iterable[T]) -> None:
         super().__init__()
 
@@ -78,7 +77,6 @@ class PeekIterator(ta.Iterator[T]):
 
 
 class ProxyIterator(ta.Iterator[T]):
-
     def __init__(self, fn: ta.Callable[[], T]) -> None:
         self._fn = fn
 
@@ -90,7 +88,6 @@ class ProxyIterator(ta.Iterator[T]):
 
 
 class PrefetchIterator(ta.Iterator[T]):
-
     def __init__(self, fn: ta.Callable[[], T] | None = None) -> None:
         super().__init__()
 
@@ -113,7 +110,6 @@ class PrefetchIterator(ta.Iterator[T]):
 
 
 class RetainIterator(ta.Iterator[T]):
-
     def __init__(self, fn: ta.Callable[[], T]) -> None:
         super().__init__()
 

{omlish-0.0.0.dev247 → omlish-0.0.0.dev249}/omlish/lang/__init__.py

@@ -78,6 +78,7 @@ from .cmp import (  # noqa
 )
 
 from .collections import (  # noqa
+    empty_map,
     merge_dicts,
     yield_dict_init,
 )
@@ -208,6 +209,19 @@ from .objects import (  # noqa
     super_meta,
 )
 
+from .params import (  # noqa
+    ArgsParam,
+    KwOnlyParam,
+    KwargsParam,
+    Param,
+    ParamSeparator,
+    ParamSpec,
+    PosOnlyParam,
+    ValueParam,
+    VariadicParam,
+    param_render,
+)
+
 from .resolving import (  # noqa
     Resolvable,
     ResolvableClassNameError,