omlish 0.0.0.dev372__tar.gz → 0.0.0.dev374__tar.gz

{omlish-0.0.0.dev372/omlish.egg-info → omlish-0.0.0.dev374}/PKG-INFO

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

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev372'
-__revision__ = '033823538cee9fc13c4075a41150dafd56975200'
+__version__ = '0.0.0.dev374'
+__revision__ = '7a173b571acabc80999972c98a5fb486b6be9464'
 
 
 #

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish/lang/__init__.py

@@ -174,7 +174,6 @@ from .enums import (  # noqa
 )
 
 from .functions import (  # noqa
-    Args,
     VoidError,
     as_async,
     call_with,
@@ -359,6 +358,10 @@ from .typing import (  # noqa
 
 ##
 
+from ..lite.args import (  # noqa
+    Args,
+)
+
 from ..lite.contextmanagers import (  # noqa
     AsyncExitStacked,
     ExitStacked,

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish/lang/functions.py

@@ -1,4 +1,3 @@
-import dataclasses as dc
 import functools
 import time
 import types
@@ -210,37 +209,6 @@ def periodically(
 ##
 
 
-@dc.dataclass(init=False)
-class Args:
-    args: ta.Sequence[ta.Any]
-    kwargs: ta.Mapping[str, ta.Any]
-
-    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
-        super().__init__()
-
-        self.args = args
-        self.kwargs = kwargs
-
-    def __bool__(self) -> bool:
-        return bool(self.args) or bool(self.kwargs)
-
-    def update(self, *args: ta.Any, **kwargs: ta.Any) -> 'Args':
-        return Args(
-            *self.args,
-            *args,
-            **{
-                **self.kwargs,
-                **kwargs,
-            },
-        )
-
-    def __call__(self, fn: ta.Callable[..., T]) -> T:
-        return fn(*self.args, **self.kwargs)
-
-
-##
-
-
 def coalesce(*vs: T | None) -> T:
     for v in vs:
         if v is not None:

omlish-0.0.0.dev374/omlish/lite/args.py

@@ -0,0 +1,36 @@
+import dataclasses as dc
+import typing as ta
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+@dc.dataclass(init=False)
+class Args:
+    args: ta.Sequence[ta.Any]
+    kwargs: ta.Mapping[str, ta.Any]
+
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__()
+
+        self.args = args
+        self.kwargs = kwargs
+
+    def __bool__(self) -> bool:
+        return bool(self.args) or bool(self.kwargs)
+
+    def update(self, *args: ta.Any, **kwargs: ta.Any) -> 'Args':
+        return Args(
+            *self.args,
+            *args,
+            **{
+                **self.kwargs,
+                **kwargs,
+            },
+        )
+
+    def __call__(self, fn: ta.Callable[..., T]) -> T:
+        return fn(*self.args, **self.kwargs)

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish/lite/marshal.py

@@ -1,7 +1,6 @@
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 # ruff: noqa: UP006 UP007 UP045
@@ -24,7 +23,6 @@ from .check import check
 from .reflect import deep_subclasses
 from .reflect import get_literal_type_args
 from .reflect import get_new_type_supertype
-from .reflect import get_optional_alias_arg
 from .reflect import is_generic_alias
 from .reflect import is_literal_type
 from .reflect import is_new_type
@@ -144,6 +142,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -342,6 +362,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -490,8 +517,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -511,7 +546,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
+                uts = frozenset(ta.get_args(ty))
+                if None in uts or type(None) in uts:
+                    is_opt = True
+                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+                else:
+                    is_opt = False
+
+                um: ObjMarshaler
+                if not uts:
+                    raise TypeError(ty)
+                elif len(uts) == 1:
+                    um = rec(check.single(uts))
+                else:
+                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                    if not np_uts:
+                        um = PrimitiveUnionObjMarshaler(pt)
+                    elif len(np_uts) == 1:
+                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
+                    else:
+                        raise TypeError(ty)
+
+                if is_opt:
+                    um = OptionalObjMarshaler(um)
+                return um
 
         raise TypeError(ty)
 

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish/testing/unittest/main.py

@@ -2,6 +2,9 @@
 """
 https://docs.python.org/3/library/unittest.html#command-line-interface
 ~ https://github.com/python/cpython/tree/f66c75f11d3aeeb614600251fd5d3fe1a34b5ff1/Lib/unittest
+
+TODO:
+ - giving it filenames doesn't work
 """
 # PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 # --------------------------------------------

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish/text/minja.py

@@ -49,10 +49,15 @@ class MinjaTemplateParam:
         return cls(name, dfl)
 
 
+class MinjaTemplateFn(ta.Protocol):
+    def __call__(self, **kwargs: ta.Any) -> str:
+        ...
+
+
 class MinjaTemplate:
     def __init__(
             self,
-            fn: ta.Callable,
+            fn: MinjaTemplateFn,
             params: ta.Sequence[MinjaTemplateParam],
     ) -> None:
         super().__init__()
@@ -71,6 +76,16 @@ class MinjaTemplate:
 ##
 
 
+class MinjaFunctionBuilder(ta.Protocol):
+    def __call__(
+            self,
+            name: str,
+            src: str,
+            ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
+    ) -> ta.Callable:
+        ...
+
+
 class MinjaTemplateCompiler:
     """
     Compiles a template string into a Python function. The returned function takes a dictionary 'context' and returns
@@ -96,6 +111,7 @@ class MinjaTemplateCompiler:
             fragment_processor: ta.Optional[ta.Callable[[MinjaTemplateFragmentKind, str], str]] = None,
             strict_strings: bool = False,
             stringifier: ta.Optional[ta.Callable[[ta.Any], str]] = None,
+            function_builder: ta.Optional[MinjaFunctionBuilder] = None,
     ) -> None:
         super().__init__()
 
@@ -120,6 +136,10 @@ class MinjaTemplateCompiler:
                 stringifier = lambda o: str(o)
         self._stringifier = stringifier
 
+        if function_builder is None:
+            function_builder = self._build_function
+        self._function_builder = function_builder
+
         self._stack: ta.List[ta.Literal['for', 'if']] = []
 
     @staticmethod
@@ -128,6 +148,18 @@ class MinjaTemplateCompiler:
             raise TypeError(o)
         return o
 
+    @staticmethod
+    def _build_function(
+            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]
+
     #
 
     _TAG_PAT = re.compile(
@@ -210,11 +242,13 @@ class MinjaTemplateCompiler:
             lines.append(f'def {self._RENDER_FN_NAME}():')
         else:
             lines.append(f'def {self._RENDER_FN_NAME}(')
+            lines.append(self._indent('*,'))
             for p in self._params:
                 if p.default.present:
                     check.not_in(p.name, ns)
-                    ns[p.name] = p.default.must()
-                    lines.append(self._indent(f'{p.name}={p.name},'))
+                    dn = f'__minja__default__{p.name}'
+                    ns[dn] = p.default.must()
+                    lines.append(self._indent(f'{p.name}={dn},'))
                 else:
                     lines.append(self._indent(f'{p.name},'))
             lines.append('):')
@@ -269,19 +303,6 @@ class MinjaTemplateCompiler:
 
     #
 
-    @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]
-
     def compile(
             self,
             ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
@@ -294,14 +315,14 @@ class MinjaTemplateCompiler:
                 raise KeyError(k)
             ns[k] = v
 
-        render_fn = self._make_fn(
+        render_fn = self._function_builder(
             self._RENDER_FN_NAME,
             rendered.src,
             ns,
         )
 
         return MinjaTemplate(
-            render_fn,
+            ta.cast(MinjaTemplateFn, check.callable(render_fn)),
             self._params,
         )
 

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/omlish.egg-info/SOURCES.txt

@@ -473,6 +473,7 @@ omlish/lifecycles/manager.py
 omlish/lifecycles/states.py
 omlish/lifecycles/transitions.py
 omlish/lite/__init__.py
+omlish/lite/args.py
 omlish/lite/cached.py
 omlish/lite/check.py
 omlish/lite/configs.py

{omlish-0.0.0.dev372 → omlish-0.0.0.dev374}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev372'
+version = '0.0.0.dev374'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',