omlish 0.0.0.dev394__tar.gz → 0.0.0.dev395__tar.gz

{omlish-0.0.0.dev394/omlish.egg-info → omlish-0.0.0.dev395}/PKG-INFO

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

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev394'
-__revision__ = 'b3c8aa9fb0aa4cb4683cea8843b22615547cbf03'
+__version__ = '0.0.0.dev395'
+__revision__ = 'be0f7f8395fdc987e285187f15f515e157142da5'
 
 
 #

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/diag/pydevd.py

@@ -124,7 +124,7 @@ def is_present() -> bool:
 
 def get_setup() -> dict | None:
     if is_present():
-        return _pydevd().SetupHolder.setup
+        return check.not_none(_pydevd()).SetupHolder.setup
     else:
         return None
 
@@ -160,7 +160,7 @@ ARGS_ENV_VAR = 'PYDEVD_ARGS'
 def get_args() -> list[str]:
     check.state(is_present())
     setup: ta.Mapping[ta.Any, ta.Any] = check.isinstance(get_setup(), dict)
-    args = [_pydevd().__file__]
+    args = [check.not_none(check.not_none(_pydevd()).__file__)]
 
     for k in [
         'port',

omlish-0.0.0.dev395/omlish/diag/timers.py

@@ -0,0 +1,184 @@
+import atexit
+import contextlib
+import functools
+import sys
+import threading
+import time
+import typing as ta
+
+from .. import check
+from .. import lang
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class _GlobalTimer:
+    def __init__(
+            self,
+            registry: '_GlobalTimerRegistry',
+            name: str,
+            *,
+            clock: ta.Callable[[], float] | None = None,
+            report_at_exit: bool = False,
+            report_out: ta.Any | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._registry = registry
+        self._name = name
+
+        if clock is None:
+            clock = time.monotonic
+        self._clock = clock
+        self._report_out = report_out
+
+        self._lock = threading.Lock()
+
+        self._c = 0
+        self._t = 0.
+
+        if report_at_exit:
+            atexit.register(self.report)
+
+    def report(self) -> None:
+        msg = (
+            f'{self._registry.module_name}::{self._name}: '
+            f'{self._c} calls, '
+            f'{self._t:.3f}s total'
+        )
+
+        print(
+            msg,
+            file=self._report_out if self._report_out is not None else sys.stderr,
+        )
+
+    @contextlib.contextmanager
+    def __call__(self) -> ta.Iterator[None]:
+        start = self._clock()
+
+        try:
+            yield
+
+        finally:
+            end = self._clock()
+            took = end - start
+
+            with self._lock:
+                self._c += 1
+                self._t += took
+
+
+#
+
+
+class _GlobalTimerRegistry:
+    def __init__(
+            self,
+            module_name: str,
+    ) -> None:
+        super().__init__()
+
+        self._module_name = module_name
+
+        self._lock = threading.Lock()
+
+        self._timers: dict[str, _GlobalTimer] = {}
+
+    @property
+    def module_name(self) -> str:
+        return self._module_name
+
+    def get_timer(
+            self,
+            name: str,
+            **kwargs: ta.Any,
+    ) -> _GlobalTimer:
+        return lang.double_check_setdefault(
+            self._lock,
+            self._timers,
+            name,
+            lambda: _GlobalTimer(
+                self,
+                name,
+                **kwargs,
+            ),
+        )
+
+
+_GLOBAL_LOCK = threading.Lock()
+_GLOBAL_ATTR = '__global_timers_registry__'
+
+
+def _get_global_registry(
+        globals: ta.MutableMapping[str, ta.Any],  # noqa
+) -> _GlobalTimerRegistry:
+    reg = lang.double_check_setdefault(
+        _GLOBAL_LOCK,
+        globals,
+        _GLOBAL_ATTR,
+        lambda: _GlobalTimerRegistry(
+            globals['__name__'],
+        ),
+    )
+
+    return check.isinstance(reg, _GlobalTimerRegistry)
+
+
+#
+
+
+@contextlib.contextmanager
+def global_timer_context(
+        globals: ta.MutableMapping[str, ta.Any],  # noqa
+        name: str,
+        **kwargs: ta.Any,
+) -> ta.Iterator[None]:
+    reg = _get_global_registry(globals)
+    timer = reg.get_timer(name, **kwargs)
+    with timer():
+        yield
+
+
+#
+
+
+class _GlobalTimerContextWrapped:
+    def __init__(
+            self,
+            fn: ta.Any,
+            timer: _GlobalTimer,
+    ) -> None:
+        super().__init__()
+
+        self._fn = fn
+        self._timer = timer
+
+        functools.update_wrapper(self, fn)
+
+    def __get__(self, instance, owner=None):
+        return self.__class__(
+            self._fn.__get__(instance, owner),
+            self._timer,
+        )
+
+    def __call__(self, *args, **kwargs):
+        with self._timer():
+            return self._fn(*args, **kwargs)
+
+
+def global_timer_wrap(
+        globals: ta.MutableMapping[str, ta.Any],  # noqa
+        name: str,
+        **kwargs: ta.Any,
+) -> ta.Callable[[T], T]:
+    reg = _get_global_registry(globals)
+    timer = reg.get_timer(name, **kwargs)
+
+    def inner(fn):
+        return _GlobalTimerContextWrapped(fn, timer)
+
+    return inner

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/inject/impl/injector.py

@@ -69,7 +69,7 @@ class InjectorImpl(Injector, lang.Final):
         self._bim = ec.binding_impl_map()
         self._ekbs = ec.eager_keys_by_scope()
         self._pls: tuple[ProvisionListener, ...] = tuple(
-            b.listener
+            b.listener  # type: ignore[attr-defined]
             for b in itertools.chain(
                 ec.elements_of_type(ProvisionListenerBinding),
                 (p._pls if p is not None else ()),  # noqa

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/inject/listeners.py

@@ -14,7 +14,7 @@ from .keys import Key
 ProvisionListener: ta.TypeAlias = ta.Callable[[
     Injector,
     Key,
-    Binding,
+    Binding | None,
     ta.Callable[[], ta.Any],
 ], ta.Callable[[], ta.Any]]
 

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/lang/__init__.py

@@ -142,6 +142,7 @@ from .contextmanagers import (  # noqa
     context_wrapped,
     default_lock,
     disposing,
+    double_check_setdefault,
     maybe_managing,
 )
 

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/lang/cached/function.py

@@ -415,6 +415,16 @@ class _DescriptorCachedFunction(_CachedFunction[T]):
 #
 
 
+@ta.overload
+def cached_function(fn: None = None, **kwargs: ta.Any) -> ta.Callable[[CallableT], CallableT]:
+    ...
+
+
+@ta.overload
+def cached_function(fn: CallableT, **kwargs: ta.Any) -> CallableT:
+    ...
+
+
 def cached_function(fn=None, **kwargs):  # noqa
     if fn is None:
         return functools.partial(cached_function, **kwargs)

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/lang/contextmanagers.py

@@ -13,6 +13,8 @@ import typing as ta
 
 
 T = ta.TypeVar('T')
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
 
 
 ##
@@ -286,3 +288,28 @@ class Timer:
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self._end = self._clock()
+
+
+##
+
+
+def double_check_setdefault(
+        cm: ta.ContextManager,
+        dct: ta.MutableMapping[K, V],
+        k: K,
+        fn: ta.Callable[[], V],
+) -> V:
+    try:
+        return dct[k]
+    except KeyError:
+        pass
+
+    with cm:
+        try:
+            return dct[k]
+        except KeyError:
+            pass
+
+        v = fn()
+        dct[k] = v
+        return v

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish/reflect/subst.py

@@ -1,3 +1,4 @@
+import abc
 import dataclasses as dc
 import types
 import typing as ta
@@ -22,6 +23,9 @@ else:
     cache = lang.proxy_import('.collections.cache', __package__)
 
 
+GenericBasesMap: ta.TypeAlias = ta.Mapping[Type, tuple[Type, ...]]
+
+
 ##
 
 
@@ -69,22 +73,35 @@ def replace_type_vars(
     return rec(ty)
 
 
+##
+
+
+_DEFAULT_SIMPLE_GENERIC_BASES: dict[Type, tuple[Type, ...]] = {}
+DEFAULT_SIMPLE_GENERIC_BASES: GenericBasesMap = _DEFAULT_SIMPLE_GENERIC_BASES
+
+
 class GenericSubstitution:
     def __init__(
             self,
             *,
             update_aliases: bool = False,
             cache_size: int = 0,  # FIXME: ta.Generic isn't weakrefable..
+            simple_generic_bases: GenericBasesMap | None = None,
     ) -> None:
         super().__init__()
 
         self._update_aliases = update_aliases
+        self._simple_generic_bases = simple_generic_bases
 
         if cache_size > 0:
             self.get_generic_bases = cache.cache(weak_keys=True, max_size=cache_size)(self.get_generic_bases)  # type: ignore  # noqa
             self.generic_mro = cache.cache(weak_keys=True, max_size=cache_size)(self.generic_mro)  # type: ignore
 
     def get_generic_bases(self, ty: Type) -> tuple[Type, ...]:
+        if (sgm := self._simple_generic_bases) is not None:
+            if (sgb := sgm.get(ty)) is not None:
+                return sgb
+
         if (cty := get_concrete_type(ty)) is not None:
             rpl = get_type_var_replacements(ty)
             ret: list[Type] = []
@@ -97,6 +114,7 @@ class GenericSubstitution:
                 rty = replace_type_vars(bty, rpl, update_aliases=self._update_aliases)
                 ret.append(rty)
             return tuple(ret)
+
         return ()
 
     def generic_mro(self, obj: ta.Any) -> list[Type]:
@@ -108,9 +126,32 @@ class GenericSubstitution:
         return [ty for ty in mro if get_concrete_type(ty) is not ta.Generic]
 
 
-DEFAULT_GENERIC_SUBSTITUTION = GenericSubstitution()
+DEFAULT_GENERIC_SUBSTITUTION = GenericSubstitution(
+    simple_generic_bases=DEFAULT_SIMPLE_GENERIC_BASES,
+)
 
 get_generic_bases = DEFAULT_GENERIC_SUBSTITUTION.get_generic_bases
 generic_mro = DEFAULT_GENERIC_SUBSTITUTION.generic_mro
 
-ALIAS_UPDATING_GENERIC_SUBSTITUTION = GenericSubstitution(update_aliases=True)
+ALIAS_UPDATING_GENERIC_SUBSTITUTION = GenericSubstitution(
+    update_aliases=True,
+    simple_generic_bases=DEFAULT_SIMPLE_GENERIC_BASES,
+)
+
+
+##
+
+
+_DEFAULT_SIMPLE_GENERIC_BASE_LIST: ta.Sequence[Type] = [
+    object,
+    abc.ABC,
+    lang.Abstract,
+    lang.Sealed,
+    lang.PackageSealed,
+    lang.Final,
+]
+
+_DEFAULT_SIMPLE_GENERIC_BASES.update({
+    b: get_generic_bases(b)
+    for b in _DEFAULT_SIMPLE_GENERIC_BASE_LIST
+})

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/omlish.egg-info/SOURCES.txt

@@ -224,6 +224,7 @@ omlish/diag/ps.py
 omlish/diag/pycharm.py
 omlish/diag/pydevd.py
 omlish/diag/threads.py
+omlish/diag/timers.py
 omlish/diag/_pycharm/__init__.py
 omlish/diag/_pycharm/runhack.py
 omlish/diag/replserver/__init__.py

{omlish-0.0.0.dev394 → omlish-0.0.0.dev395}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev394'
+version = '0.0.0.dev395'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',