omlish 0.0.0.dev177__tar.gz → 0.0.0.dev179__tar.gz

{omlish-0.0.0.dev177/omlish.egg-info → omlish-0.0.0.dev179}/PKG-INFO

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

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev177'
-__revision__ = '3c81e0413acb397557436f3f66780dd6e8555500'
+__version__ = '0.0.0.dev179'
+__revision__ = '40949c92a73910f364c60391f73bb2fcf9538caf'
 
 
 #

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179}/omlish/dataclasses/impl/hashing.py

@@ -50,7 +50,8 @@ class HashProcessor(Processor):
         if self._info.params_extras.cache_hash:
             body = [
                 f'try: return self.{self.CACHED_HASH_ATTR}',
-                f'except AttributeError: object.__setattr__(self, {self.CACHED_HASH_ATTR!r}, h := hash({self_tuple}))',
+                f'except AttributeError: pass',
+                f'object.__setattr__(self, {self.CACHED_HASH_ATTR!r}, h := hash({self_tuple}))',
                 f'return h',
             ]
         else:

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179}/omlish/inject/elements.py

@@ -1,7 +1,6 @@
 import abc
 import typing as ta
 
-from .. import check
 from .. import dataclasses as dc
 from .. import lang
 from .impl.origins import HasOriginsImpl
@@ -19,8 +18,8 @@ class ElementGenerator(lang.Abstract, lang.PackageSealed):
 
 @dc.dataclass(frozen=True)
 class Elements(lang.Final):
-    es: frozenset[Element] | None = dc.xfield(None, coerce=check.of_isinstance((frozenset, None)))
-    cs: frozenset['Elements'] | None = dc.xfield(None, coerce=check.of_isinstance((frozenset, None)))
+    es: ta.Collection[Element] | None = None
+    cs: ta.Collection['Elements'] | None = None
 
     def __iter__(self) -> ta.Generator[Element, None, None]:
         if self.es:
@@ -38,14 +37,14 @@ Elemental = ta.Union[  # noqa
 
 
 def as_elements(*args: Elemental) -> Elements:
-    es: set[Element] = set()
-    cs: set[Elements] = set()
+    es: list[Element] = []
+    cs: list[Elements] = []
 
     def rec(a):
         if isinstance(a, Element):
-            es.add(a)
+            es.append(a)
         elif isinstance(a, Elements):
-            cs.add(a)
+            cs.append(a)
         elif isinstance(a, ElementGenerator):
             for n in a:
                 rec(n)
@@ -59,6 +58,6 @@ def as_elements(*args: Elemental) -> Elements:
         return next(iter(cs))
 
     return Elements(
-        frozenset(es) if es else None,
-        frozenset(cs) if cs else None,
+        es if es else None,
+        cs if cs else None,
     )

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179}/omlish/inject/scopes.py

@@ -80,7 +80,7 @@ class ScopeSeededProvider(Provider):
         return self.key.ty
 
 
-def bind_scope_seed(ss: SeededScope, k: ta.Any) -> Element:
+def bind_scope_seed(k: ta.Any, ss: SeededScope) -> Element:
     k = as_key(k)
     return Binding(k, ScopeSeededProvider(ss, k))
 

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179}/omlish/lite/inject.py

@@ -1,6 +1,7 @@
 # ruff: noqa: UP006 UP007
 import abc
 import contextlib
+import contextvars
 import dataclasses as dc
 import functools
 import inspect
@@ -70,6 +71,10 @@ class InjectorBinding:
     key: InjectorKey
     provider: InjectorProvider
 
+    def __post_init__(self) -> None:
+        check.isinstance(self.key, InjectorKey)
+        check.isinstance(self.provider, InjectorProvider)
+
 
 class InjectorBindings(abc.ABC):
     @abc.abstractmethod
@@ -286,6 +291,33 @@ def as_injector_bindings(*args: InjectorBindingOrBindings) -> InjectorBindings:
 ##
 
 
+def build_injector_provider_map(bs: InjectorBindings) -> ta.Mapping[InjectorKey, InjectorProvider]:
+    pm: ta.Dict[InjectorKey, InjectorProvider] = {}
+    am: ta.Dict[InjectorKey, ta.List[InjectorProvider]] = {}
+
+    for b in bs.bindings():
+        if b.key.array:
+            al = am.setdefault(b.key, [])
+            if isinstance(b.provider, ArrayInjectorProvider):
+                al.extend(b.provider.ps)
+            else:
+                al.append(b.provider)
+        else:
+            if b.key in pm:
+                raise KeyError(b.key)
+            pm[b.key] = b.provider
+
+    if am:
+        for k, aps in am.items():
+            pm[k] = ArrayInjectorProvider(aps)
+
+    return pm
+
+
+###
+# overrides
+
+
 @dc.dataclass(frozen=True)
 class OverridesInjectorBindings(InjectorBindings):
     p: InjectorBindings
@@ -307,30 +339,160 @@ def injector_override(p: InjectorBindings, *args: InjectorBindingOrBindings) ->
     return OverridesInjectorBindings(p, m)
 
 
-##
+###
+# scopes
 
 
-def build_injector_provider_map(bs: InjectorBindings) -> ta.Mapping[InjectorKey, InjectorProvider]:
-    pm: ta.Dict[InjectorKey, InjectorProvider] = {}
-    am: ta.Dict[InjectorKey, ta.List[InjectorProvider]] = {}
+class InjectorScope(abc.ABC):  # noqa
+    def __init__(
+            self,
+            *,
+            _i: Injector,
+    ) -> None:
+        check.not_in(abc.ABC, type(self).__bases__)
 
-    for b in bs.bindings():
-        if b.key.array:
-            al = am.setdefault(b.key, [])
-            if isinstance(b.provider, ArrayInjectorProvider):
-                al.extend(b.provider.ps)
-            else:
-                al.append(b.provider)
+        super().__init__()
+
+        self._i = _i
+
+        all_seeds: ta.Iterable[_InjectorScopeSeed] = self._i.provide(InjectorKey(_InjectorScopeSeed, array=True))
+        self._sks = {s.k for s in all_seeds if s.sc is type(self)}
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class State:
+        seeds: ta.Dict[InjectorKey, ta.Any]
+        provisions: ta.Dict[InjectorKey, ta.Any] = dc.field(default_factory=dict)
+
+    def new_state(self, vs: ta.Mapping[InjectorKey, ta.Any]) -> State:
+        vs = dict(vs)
+        check.equal(set(vs.keys()), self._sks)
+        return InjectorScope.State(vs)
+
+    #
+
+    @abc.abstractmethod
+    def state(self) -> State:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def enter(self, vs: ta.Mapping[InjectorKey, ta.Any]) -> ta.ContextManager[None]:
+        raise NotImplementedError
+
+
+class ExclusiveInjectorScope(InjectorScope, abc.ABC):
+    _st: ta.Optional[InjectorScope.State] = None
+
+    def state(self) -> InjectorScope.State:
+        return check.not_none(self._st)
+
+    @contextlib.contextmanager
+    def enter(self, vs: ta.Mapping[InjectorKey, ta.Any]) -> ta.Iterator[None]:
+        check.none(self._st)
+        self._st = self.new_state(vs)
+        try:
+            yield
+        finally:
+            self._st = None
+
+
+class ContextvarInjectorScope(InjectorScope, abc.ABC):
+    _cv: contextvars.ContextVar
+
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+        check.not_in(abc.ABC, cls.__bases__)
+        check.state(not hasattr(cls, '_cv'))
+        cls._cv = contextvars.ContextVar(f'{cls.__name__}_cv')
+
+    def state(self) -> InjectorScope.State:
+        return self._cv.get()
+
+    @contextlib.contextmanager
+    def enter(self, vs: ta.Mapping[InjectorKey, ta.Any]) -> ta.Iterator[None]:
+        try:
+            self._cv.get()
+        except LookupError:
+            pass
         else:
-            if b.key in pm:
-                raise KeyError(b.key)
-            pm[b.key] = b.provider
+            raise RuntimeError(f'Scope already entered: {self}')
+        st = self.new_state(vs)
+        tok = self._cv.set(st)
+        try:
+            yield
+        finally:
+            self._cv.reset(tok)
 
-    if am:
-        for k, aps in am.items():
-            pm[k] = ArrayInjectorProvider(aps)
 
-    return pm
+#
+
+
+@dc.dataclass(frozen=True)
+class ScopedInjectorProvider(InjectorProvider):
+    p: InjectorProvider
+    k: InjectorKey
+    sc: ta.Type[InjectorScope]
+
+    def __post_init__(self) -> None:
+        check.isinstance(self.p, InjectorProvider)
+        check.isinstance(self.k, InjectorKey)
+        check.issubclass(self.sc, InjectorScope)
+
+    def provider_fn(self) -> InjectorProviderFn:
+        def pfn(i: Injector) -> ta.Any:
+            st = i[self.sc].state()
+            try:
+                return st.provisions[self.k]
+            except KeyError:
+                pass
+            v = ufn(i)
+            st.provisions[self.k] = v
+            return v
+
+        ufn = self.p.provider_fn()
+        return pfn
+
+
+@dc.dataclass(frozen=True)
+class _ScopeSeedInjectorProvider(InjectorProvider):
+    k: InjectorKey
+    sc: ta.Type[InjectorScope]
+
+    def __post_init__(self) -> None:
+        check.isinstance(self.k, InjectorKey)
+        check.issubclass(self.sc, InjectorScope)
+
+    def provider_fn(self) -> InjectorProviderFn:
+        def pfn(i: Injector) -> ta.Any:
+            st = i[self.sc].state()
+            return st.seeds[self.k]
+        return pfn
+
+
+def bind_injector_scope(sc: ta.Type[InjectorScope]) -> InjectorBindingOrBindings:
+    return InjectorBinder.bind(sc, singleton=True)
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class _InjectorScopeSeed:
+    sc: ta.Type['InjectorScope']
+    k: InjectorKey
+
+    def __post_init__(self) -> None:
+        check.issubclass(self.sc, InjectorScope)
+        check.isinstance(self.k, InjectorKey)
+
+
+def bind_injector_scope_seed(k: ta.Any, sc: ta.Type[InjectorScope]) -> InjectorBindingOrBindings:
+    kk = as_injector_key(k)
+    return as_injector_bindings(
+        InjectorBinding(kk, _ScopeSeedInjectorProvider(kk, sc)),
+        InjectorBinder.bind(_InjectorScopeSeed(sc, kk), array=True),
+    )
 
 
 ###
@@ -477,13 +639,21 @@ _INJECTOR_EAGER_ARRAY_KEY: InjectorKey[_InjectorEager] = InjectorKey(_InjectorEa
 
 
 class _Injector(Injector):
+    _DEFAULT_BINDINGS: ta.ClassVar[ta.List[InjectorBinding]] = []
+
     def __init__(self, bs: InjectorBindings, p: ta.Optional[Injector] = None) -> None:
         super().__init__()
 
         self._bs = check.isinstance(bs, InjectorBindings)
         self._p: ta.Optional[Injector] = check.isinstance(p, (Injector, type(None)))
 
-        self._pfm = {k: v.provider_fn() for k, v in build_injector_provider_map(bs).items()}
+        self._pfm = {
+            k: v.provider_fn()
+            for k, v in build_injector_provider_map(as_injector_bindings(
+                *self._DEFAULT_BINDINGS,
+                bs,
+            )).items()
+        }
 
         if _INJECTOR_INJECTOR_KEY in self._pfm:
             raise DuplicateInjectorKeyError(_INJECTOR_INJECTOR_KEY)
@@ -650,6 +820,7 @@ class InjectorBinder:
             to_const: ta.Any = None,
             to_key: ta.Any = None,
 
+            in_: ta.Optional[ta.Type[InjectorScope]] = None,
             singleton: bool = False,
 
             eager: bool = False,
@@ -659,12 +830,12 @@ class InjectorBinder:
         if isinstance(obj, cls._BANNED_BIND_TYPES):
             raise TypeError(obj)
 
-        ##
+        #
 
         if key is not None:
             key = as_injector_key(key)
 
-        ##
+        #
 
         has_to = (
             to_fn is not None or
@@ -694,7 +865,7 @@ class InjectorBinder:
                 key = InjectorKey(type(obj))
         del has_to
 
-        ##
+        #
 
         if tag is not None:
             if key.tag is not None:
@@ -704,7 +875,7 @@ class InjectorBinder:
         if array is not None:
             key = dc.replace(key, array=array)
 
-        ##
+        #
 
         providers: ta.List[InjectorProvider] = []
         if to_fn is not None:
@@ -719,23 +890,34 @@ class InjectorBinder:
             raise TypeError('Must specify provider')
         if len(providers) > 1:
             raise TypeError('May not specify multiple providers')
-        provider, = providers
+        provider = check.single(providers)
 
-        ##
+        #
 
+        pws: ta.List[ta.Any] = []
+        if in_ is not None:
+            check.issubclass(in_, InjectorScope)
+            check.not_in(abc.ABC, in_.__bases__)
+            pws.append(functools.partial(ScopedInjectorProvider, k=key, sc=in_))
         if singleton:
-            provider = SingletonInjectorProvider(provider)
+            pws.append(SingletonInjectorProvider)
+        if len(pws) > 1:
+            raise TypeError('May not specify multiple provider wrappers')
+        elif pws:
+            provider = check.single(pws)(provider)
+
+        #
 
         binding = InjectorBinding(key, provider)
 
-        ##
+        #
 
         extras: ta.List[InjectorBinding] = []
 
         if eager:
             extras.append(bind_injector_eager_key(key))
 
-        ##
+        #
 
         if extras:
             return as_injector_bindings(binding, *extras)
@@ -808,7 +990,8 @@ def bind_injector_eager_key(key: ta.Any) -> InjectorBinding:
     return InjectorBinding(_INJECTOR_EAGER_ARRAY_KEY, ConstInjectorProvider(_InjectorEager(as_injector_key(key))))
 
 
-##
+###
+# api
 
 
 class InjectionApi:
@@ -828,9 +1011,19 @@ class InjectionApi:
     def as_bindings(self, *args: InjectorBindingOrBindings) -> InjectorBindings:
         return as_injector_bindings(*args)
 
+    # overrides
+
     def override(self, p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
         return injector_override(p, *args)
 
+    # scopes
+
+    def bind_scope(self, sc: ta.Type[InjectorScope]) -> InjectorBindingOrBindings:
+        return bind_injector_scope(sc)
+
+    def bind_scope_seed(self, k: ta.Any, sc: ta.Type[InjectorScope]) -> InjectorBindingOrBindings:
+        return bind_injector_scope_seed(k, sc)
+
     # injector
 
     def create_injector(self, *args: InjectorBindingOrBindings, parent: ta.Optional[Injector] = None) -> Injector:
@@ -851,6 +1044,7 @@ class InjectionApi:
             to_const: ta.Any = None,
             to_key: ta.Any = None,
 
+            in_: ta.Optional[ta.Type[InjectorScope]] = None,
             singleton: bool = False,
 
             eager: bool = False,
@@ -867,6 +1061,7 @@ class InjectionApi:
             to_const=to_const,
             to_key=to_key,
 
+            in_=in_,
             singleton=singleton,
 
             eager=eager,

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179}/omlish/testing/pytest/inject/harness.py

@@ -54,7 +54,7 @@ class Harness:
             *[
                 inj.as_elements(
                     inj.bind_scope(ss),
-                    inj.bind_scope_seed(ss, inj.Key(pytest.FixtureRequest, tag=pts)),
+                    inj.bind_scope_seed(inj.Key(pytest.FixtureRequest, tag=pts), ss),
                 )
                 for pts, ss in _SCOPES_BY_PYTEST_SCOPE.items()
             ],

omlish-0.0.0.dev179/omlish/text/minja.py

@@ -0,0 +1,223 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - raw
+ - blocks / inheritance
+"""
+import io
+import re
+import typing as ta
+
+from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
+
+
+##
+
+
+class MinjaTemplate:
+    def __init__(self, fn: ta.Callable) -> None:
+        super().__init__()
+
+        self._fn = fn
+
+    def __call__(self, **kwargs: ta.Any) -> str:
+        return self._fn(**kwargs)
+
+
+##
+
+
+class MinjaTemplateCompiler:
+    """
+    Compiles a template string into a Python function. The returned function takes a dictionary 'context' and returns
+    the rendered string.
+
+    Supported syntax:
+    - Literal text remains literal.
+    - {{ expr }}: Evaluates 'expr' in the given context and writes its str() to output.
+    - {% code %}: Executes the given Python code (e.g. 'for x in items:'), must be terminated appropriately.
+    - {% endfor %} to close for loops.
+    - {% endif %} to close if blocks.
+    - {# comment #}: Ignored completely.
+    """
+
+    DEFAULT_INDENT: str = '  '
+
+    def __init__(
+            self,
+            src: str,
+            args: ta.Sequence[str],
+            *,
+            indent: str = DEFAULT_INDENT,
+    ) -> None:
+        super().__init__()
+
+        self._src = check.isinstance(src, str)
+        self._args = check.not_isinstance(args, str)
+        self._indent_str: str = check.non_empty_str(indent)
+
+        self._stack: ta.List[ta.Literal['for', 'if']] = []
+        self._lines: ta.List[str] = []
+
+    #
+
+    _TAG_PAT = re.compile(
+        r'({{.*?}}|{%.*?%}|{#.*?#})',
+        flags=re.DOTALL,
+    )
+
+    @classmethod
+    def _split_tags(cls, src: str) -> ta.List[ta.Tuple[str, str]]:
+        raw = cls._TAG_PAT.split(src)
+
+        #
+
+        parts: ta.List[ta.Tuple[str, str]] = []
+        for s in raw:
+            if not s:
+                continue
+
+            for g, l, r in [
+                ('{', '{{', '}}'),
+                ('%', '{%', '%}'),
+                ('#', '{#', '#}'),
+            ]:
+                if s.startswith(l) and s.endswith(r):
+                    parts.append((g, s[len(l):-len(r)]))
+                    break
+            else:
+                parts.append(('', s))
+
+        #
+
+        for i, (g, s) in enumerate(parts):
+            if s.startswith('-'):
+                if i > 0:
+                    lg, ls = parts[i - 1]
+                    parts[i - 1] = (lg, ls.rstrip())
+                s = s[1:].lstrip()
+
+            if s.endswith('-'):
+                if i < len(parts) - 1:
+                    rg, rs = parts[i + 1]
+                    parts[i + 1] = (rg, rs.lstrip())
+                s = s[:-1].rstrip()
+
+            parts[i] = (g, s)
+
+        #
+
+        parts = [(g, s) for g, s in parts if g or s]
+
+        #
+
+        return parts
+
+    #
+
+    def _indent(self, line: str, ofs: int = 0) -> str:
+        return self._indent_str * (len(self._stack) + 1 + ofs) + line
+
+    #
+
+    _RENDER_FN_NAME = '__render'
+
+    @cached_nullary
+    def render(self) -> ta.Tuple[str, ta.Mapping[str, ta.Any]]:
+        parts = self._split_tags(self._src)
+
+        self._lines.append(f'def {self._RENDER_FN_NAME}({", ".join(self._args)}):')
+        self._lines.append(self._indent('__output = __StringIO()'))
+
+        for g, s in parts:
+            if g == '{':
+                expr = s.strip()
+                self._lines.append(self._indent(f'__output.write(str({expr}))'))
+
+            elif g == '%':
+                stmt = s.strip()
+
+                if stmt.startswith('for '):
+                    self._lines.append(self._indent(stmt + ':'))
+                    self._stack.append('for')
+                elif stmt.startswith('endfor'):
+                    check.equal(self._stack.pop(), 'for')
+
+                elif stmt.startswith('if '):
+                    self._lines.append(self._indent(stmt + ':'))
+                    self._stack.append('if')
+                elif stmt.startswith('elif '):
+                    check.equal(self._stack[-1], 'if')
+                    self._lines.append(self._indent(stmt + ':', -1))
+                elif stmt.strip() == 'else':
+                    check.equal(self._stack[-1], 'if')
+                    self._lines.append(self._indent('else:', -1))
+                elif stmt.startswith('endif'):
+                    check.equal(self._stack.pop(), 'if')
+
+                else:
+                    self._lines.append(self._indent(stmt))
+
+            elif g == '#':
+                pass
+
+            elif not g:
+                if s:
+                    safe_text = s.replace('"""', '\\"""')
+                    self._lines.append(self._indent(f'__output.write("""{safe_text}""")'))
+
+            else:
+                raise KeyError(g)
+
+        check.empty(self._stack)
+
+        self._lines.append(self._indent('return __output.getvalue()'))
+
+        ns = {
+            '__StringIO': io.StringIO,
+        }
+
+        return ('\n'.join(self._lines), ns)
+
+    #
+
+    @classmethod
+    def _make_fn(
+            cls,
+            name: str,
+            src: str,
+            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+    ) -> ta.Callable:
+        glo: dict = {}
+        if ns:
+            glo.update(ns)
+        exec(src, glo)
+        return glo[name]
+
+    #
+
+    @cached_nullary
+    def compile(self) -> MinjaTemplate:
+        render_src, render_ns = self.render()
+
+        render_fn = self._make_fn(
+            self._RENDER_FN_NAME,
+            render_src,
+            render_ns,
+        )
+
+        return MinjaTemplate(render_fn)
+
+
+##
+
+
+def compile_minja_template(src: str, args: ta.Sequence[str] = ()) -> MinjaTemplate:
+    return MinjaTemplateCompiler(src, args).compile()
+
+
+def render_minja_template(src: str, **kwargs: ta.Any) -> str:
+    tmpl = compile_minja_template(src, list(kwargs))
+    return tmpl(**kwargs)

{omlish-0.0.0.dev177 → omlish-0.0.0.dev179/omlish.egg-info}/PKG-INFO

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