omlish 0.0.0.dev178__tar.gz → 0.0.0.dev180__tar.gz

{omlish-0.0.0.dev178/omlish.egg-info → omlish-0.0.0.dev180}/PKG-INFO

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

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev178'
-__revision__ = 'fd8b9c2c51797566d0d9a52a8b347895029c82f5'
+__version__ = '0.0.0.dev180'
+__revision__ = '61f5a9f8edf9c1c743e1ce24b9cec06fffcf55a0'
 
 
 #

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/omlish/argparse/all.py

@@ -5,9 +5,9 @@ from .cli import (  # noqa
     ArgparseArg as Arg,
     argparse_arg as arg,
 
-    ArgparseCommandFn as CommandFn,
-    ArgparseCommand as Command,
-    argparse_command as command,
+    ArgparseCmdFn as CmdFn,
+    ArgparseCmd as Cmd,
+    argparse_cmd as cmd,
 
     ArgparseCli as Cli,
 )

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/omlish/argparse/cli.py

@@ -21,7 +21,7 @@ from ..lite.reflect import is_optional_alias
 T = ta.TypeVar('T')
 
 
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 
 ##
@@ -47,15 +47,15 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
 
 
 @dc.dataclass(eq=False)
-class ArgparseCommand:
+class ArgparseCmd:
     name: str
-    fn: ArgparseCommandFn
+    fn: ArgparseCmdFn
     args: ta.Sequence[ArgparseArg] = ()  # noqa
 
     # _: dc.KW_ONLY
 
     aliases: ta.Optional[ta.Sequence[str]] = None
-    parent: ta.Optional['ArgparseCommand'] = None
+    parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
@@ -70,7 +70,7 @@ class ArgparseCommand:
 
         check.arg(callable(self.fn))
         check.arg(all(isinstance(a, ArgparseArg) for a in self.args))
-        check.isinstance(self.parent, (ArgparseCommand, type(None)))
+        check.isinstance(self.parent, (ArgparseCmd, type(None)))
         check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
@@ -84,21 +84,21 @@ class ArgparseCommand:
         return self.fn(*args, **kwargs)
 
 
-def argparse_command(
+def argparse_cmd(
         *args: ArgparseArg,
         name: ta.Optional[str] = None,
         aliases: ta.Optional[ta.Iterable[str]] = None,
-        parent: ta.Optional[ArgparseCommand] = None,
+        parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
-) -> ta.Any:  # ta.Callable[[ArgparseCommandFn], ArgparseCommand]:  # FIXME
+) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
-    check.isinstance(parent, (ArgparseCommand, type(None)))
+    check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
 
     def inner(fn):
-        return ArgparseCommand(
+        return ArgparseCmd(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
@@ -153,7 +153,7 @@ class ArgparseCli:
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
             bseen = set()  # type: ignore
             for k, v in bns.items():
-                if isinstance(v, (ArgparseCommand, ArgparseArg)):
+                if isinstance(v, (ArgparseCmd, ArgparseArg)):
                     check.not_in(v, bseen)
                     bseen.add(v)
                     objs[k] = v
@@ -180,7 +180,7 @@ class ArgparseCli:
         subparsers = parser.add_subparsers()
 
         for att, obj in objs.items():
-            if isinstance(obj, ArgparseCommand):
+            if isinstance(obj, ArgparseCmd):
                 if obj.parent is not None:
                     raise NotImplementedError
 
@@ -242,7 +242,7 @@ class ArgparseCli:
 
     #
 
-    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
         return cmd.__get__(self, type(self))
 
     def prepare_cli_run(self) -> ta.Optional[ta.Callable]:

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/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.dev178 → omlish-0.0.0.dev180}/omlish/http/coro/fdio.py

@@ -7,7 +7,7 @@ from ...io.buffers import IncrementalWriteBuffer
 from ...io.buffers import ReadableListBuffer
 from ...io.fdio.handlers import SocketFdioHandler
 from ...lite.check import check
-from ...lite.socket import SocketAddress
+from ...sockets.addresses import SocketAddress
 from ..handlers import HttpHandler
 from .server import CoroHttpServer
 

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/omlish/http/coro/server.py

@@ -64,8 +64,8 @@ import time
 import typing as ta
 
 from ...lite.check import check
-from ...lite.socket import SocketAddress
-from ...lite.socket import SocketHandler
+from ...sockets.addresses import SocketAddress
+from ...sockets.handlers import SocketHandler
 from ..handlers import HttpHandler
 from ..handlers import HttpHandlerRequest
 from ..handlers import UnsupportedMethodHttpHandlerError

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/omlish/http/handlers.py

@@ -4,7 +4,7 @@ import dataclasses as dc
 import http.server
 import typing as ta
 
-from ..lite.socket import SocketAddress
+from ..sockets.addresses import SocketAddress
 from .parsing import HttpHeaders
 
 

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/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.dev178 → omlish-0.0.0.dev180}/omlish/io/fdio/handlers.py

@@ -4,7 +4,7 @@ import socket
 import typing as ta
 
 from ...lite.check import check
-from ...lite.socket import SocketAddress
+from ...sockets.addresses import SocketAddress
 
 
 class FdioHandler(abc.ABC):

omlish-0.0.0.dev180/omlish/lite/__init__.py

@@ -0,0 +1,5 @@
+# @omlish-lite
+"""
+These are the 'core' lite modules. These generally have a 'full' equivalent, in which case non-lite code should prefer
+that.
+"""

{omlish-0.0.0.dev178 → omlish-0.0.0.dev180}/omlish/lite/inject.py

@@ -291,30 +291,6 @@ def as_injector_bindings(*args: InjectorBindingOrBindings) -> InjectorBindings:
 ##
 
 
-@dc.dataclass(frozen=True)
-class OverridesInjectorBindings(InjectorBindings):
-    p: InjectorBindings
-    m: ta.Mapping[InjectorKey, InjectorBinding]
-
-    def bindings(self) -> ta.Iterator[InjectorBinding]:
-        for b in self.p.bindings():
-            yield self.m.get(b.key, b)
-
-
-def injector_override(p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
-    m: ta.Dict[InjectorKey, InjectorBinding] = {}
-
-    for b in as_injector_bindings(*args).bindings():
-        if b.key in m:
-            raise DuplicateInjectorKeyError(b.key)
-        m[b.key] = b
-
-    return OverridesInjectorBindings(p, m)
-
-
-##
-
-
 def build_injector_provider_map(bs: InjectorBindings) -> ta.Mapping[InjectorKey, InjectorProvider]:
     pm: ta.Dict[InjectorKey, InjectorProvider] = {}
     am: ta.Dict[InjectorKey, ta.List[InjectorProvider]] = {}
@@ -338,6 +314,31 @@ def build_injector_provider_map(bs: InjectorBindings) -> ta.Mapping[InjectorKey,
     return pm
 
 
+###
+# overrides
+
+
+@dc.dataclass(frozen=True)
+class OverridesInjectorBindings(InjectorBindings):
+    p: InjectorBindings
+    m: ta.Mapping[InjectorKey, InjectorBinding]
+
+    def bindings(self) -> ta.Iterator[InjectorBinding]:
+        for b in self.p.bindings():
+            yield self.m.get(b.key, b)
+
+
+def injector_override(p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
+    m: ta.Dict[InjectorKey, InjectorBinding] = {}
+
+    for b in as_injector_bindings(*args).bindings():
+        if b.key in m:
+            raise DuplicateInjectorKeyError(b.key)
+        m[b.key] = b
+
+    return OverridesInjectorBindings(p, m)
+
+
 ###
 # scopes
 
@@ -362,7 +363,7 @@ class InjectorScope(abc.ABC):  # noqa
     @dc.dataclass(frozen=True)
     class State:
         seeds: ta.Dict[InjectorKey, ta.Any]
-        prvs: ta.Dict[InjectorKey, ta.Any] = dc.field(default_factory=dict)
+        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)
@@ -442,11 +443,11 @@ class ScopedInjectorProvider(InjectorProvider):
         def pfn(i: Injector) -> ta.Any:
             st = i[self.sc].state()
             try:
-                return st.prvs[self.k]
+                return st.provisions[self.k]
             except KeyError:
                 pass
             v = ufn(i)
-            st.prvs[self.k] = v
+            st.provisions[self.k] = v
             return v
 
         ufn = self.p.provider_fn()
@@ -470,9 +471,7 @@ class _ScopeSeedInjectorProvider(InjectorProvider):
 
 
 def bind_injector_scope(sc: ta.Type[InjectorScope]) -> InjectorBindingOrBindings:
-    return as_injector_bindings(
-        InjectorBinder.bind(sc, singleton=True),
-    )
+    return InjectorBinder.bind(sc, singleton=True)
 
 
 #
@@ -1012,6 +1011,8 @@ 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)
 

{omlish-0.0.0.dev178/omlish/lite → omlish-0.0.0.dev180/omlish}/shlex.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 import shlex
 
 

omlish-0.0.0.dev178/omlish/lite/socket.py → omlish-0.0.0.dev180/omlish/sockets/addresses.py

@@ -1,10 +1,10 @@
 # ruff: noqa: UP006 UP007
+# @omlish-lite
 """
 TODO:
  - SocketClientAddress family / tuple pairs
   + codification of https://docs.python.org/3/library/socket.html#socket-families
 """
-import abc
 import dataclasses as dc
 import socket
 import typing as ta
@@ -13,9 +13,6 @@ import typing as ta
 SocketAddress = ta.Any
 
 
-SocketHandlerFactory = ta.Callable[[SocketAddress, ta.BinaryIO, ta.BinaryIO], 'SocketHandler']
-
-
 ##
 
 
@@ -54,24 +51,3 @@ def get_best_socket_family(
     )
     ai = SocketAddressInfo(*next(iter(infos)))
     return ai.family, ai.sockaddr
-
-
-##
-
-
-class SocketHandler(abc.ABC):
-    def __init__(
-            self,
-            client_address: SocketAddress,
-            rfile: ta.BinaryIO,
-            wfile: ta.BinaryIO,
-    ) -> None:
-        super().__init__()
-
-        self._client_address = client_address
-        self._rfile = rfile
-        self._wfile = wfile
-
-    @abc.abstractmethod
-    def handle(self) -> None:
-        raise NotImplementedError

omlish-0.0.0.dev180/omlish/sockets/handlers.py

@@ -0,0 +1,30 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import abc
+import typing as ta
+
+from .addresses import SocketAddress
+
+
+SocketHandlerFactory = ta.Callable[[SocketAddress, ta.BinaryIO, ta.BinaryIO], 'SocketHandler']
+
+
+##
+
+
+class SocketHandler(abc.ABC):
+    def __init__(
+            self,
+            client_address: SocketAddress,
+            rfile: ta.BinaryIO,
+            wfile: ta.BinaryIO,
+    ) -> None:
+        super().__init__()
+
+        self._client_address = client_address
+        self._rfile = rfile
+        self._wfile = wfile
+
+    @abc.abstractmethod
+    def handle(self) -> None:
+        raise NotImplementedError

omlish-0.0.0.dev178/omlish/lite/socketserver.py → omlish-0.0.0.dev180/omlish/sockets/server.py

@@ -1,12 +1,13 @@
 # ruff: noqa: UP006 UP007
+# @omlish-lite
 import socket
 import socketserver
 import typing as ta
 
 from omlish.lite.check import check
 
-from .socket import SocketAddress
-from .socket import SocketHandlerFactory
+from .addresses import SocketAddress
+from .handlers import SocketHandlerFactory
 
 
 ##

omlish-0.0.0.dev180/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.dev178 → omlish-0.0.0.dev180/omlish.egg-info}/PKG-INFO

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