omlish 0.0.0.dev450__py3-none-any.whl → 0.0.0.dev452__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev450'
-__revision__ = '06a2dac5a7edcb1d06e2cc83c467c9b78d637e60'
+__version__ = '0.0.0.dev452'
+__revision__ = '85534912bc13f26aa289d4d012b6bf27695609c5'
 
 
 #

omlish/bootstrap/_marshal.py

@@ -8,7 +8,7 @@ from .harness import BOOTSTRAP_TYPES_BY_NAME
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     cfgs_poly = msh.Polymorphism(
         Bootstrap.Config,
         [msh.Impl(b.Config, n) for n, b in BOOTSTRAP_TYPES_BY_NAME.items()],

omlish/diag/pycharm.py

@@ -191,9 +191,23 @@ def pycharm_remote_debugger_attach(prd: PycharmRemoteDebugger) -> None:
     else:
         pydevd_pycharm = _import_pydevd_pycharm(version=version)
 
+    import inspect
+    st_sig = inspect.signature(pydevd_pycharm.settrace)
+
+    kw: dict = {}
+    if 'stdoutToServer' in st_sig.parameters:
+        kw.update(
+            stdoutToServer=True,
+            stderrToServer=True,
+        )
+    else:
+        kw.update(
+            stdout_to_server=True,
+            stderr_to_server=True,
+        )
+
     pydevd_pycharm.settrace(
         host,
         port=prd.port,
-        stdoutToServer=True,
-        stderrToServer=True,
+        **kw,
     )

omlish/diag/pydevd.py

@@ -119,7 +119,19 @@ def _pydevd() -> types.ModuleType | None:
 
 
 def is_present() -> bool:
-    return lang.can_import('pydevd')
+    # FIXME: try to use `lang.can_import('pydevd'), but raises with:
+    # INTERNALERROR>   File "/Users/spinlock/src/wrmsr/omlish/omlish/lang/imports/resolving.py", line 16, in can_import
+    # INTERNALERROR>     spec = importlib.util.find_spec(name, package)
+    # INTERNALERROR>   File "<frozen importlib.util>", line 111, in find_spec
+    # INTERNALERROR> ValueError: pydevd.__spec__ is None
+    # Really want to avoid actually importing pydevd due to side-effects, slowness, and even a pkg_resources deprecation
+    # warning...
+    try:
+        __import__('pydevd')
+    except ImportError:
+        return False
+    else:
+        return True
 
 
 def get_setup() -> dict | None:

omlish/formats/dotenv.py

@@ -584,7 +584,7 @@ def dotenv_values(
     For example, `foo=bar` results in `{"foo": "bar"}` whereas `foo` alone results in
     `{"foo": None}`
 
-    Parameters:
+    Args:
         path: Absolute or relative path to the .env file.
         stream: `StringIO` object with .env content, used if `path` is `None`.
         verbose: Whether to output a warning if the .env file is missing.

omlish/funcs/match.py

@@ -5,6 +5,8 @@ TODO:
  - unify MatchFnClass with dispatch.method?
   - __call__ = mfs.method(); @__call__.register(lambda: ...) def _call_... ?
   - not really the same thing, dispatch is unordered this is necessarily ordered
+  - !! well.. unify interface at least?
+   - guard(*a, **k) -> bool + fn(*a, **k) -> T becomes dispatch(*a, **k) -> (Callable -> T) | None
 """
 import abc
 import dataclasses as dc

omlish/lite/pycharm.py

@@ -6,7 +6,7 @@ import typing as ta
 ##
 
 
-DEFAULT_PYCHARM_VERSION = '242.23726.102'
+DEFAULT_PYCHARM_VERSION = '252.26199.168'
 
 
 @dc.dataclass(frozen=True)

omlish/marshal/__init__.py

@@ -113,6 +113,17 @@ with _lang.auto_proxy_init(globals()):
         OptionalUnmarshaler,
     )
 
+    from .composite.unions import (  # noqa
+        MatchUnionMarshaler,
+        MatchUnionUnmarshaler,
+
+        PRIMITIVE_UNION_TYPES,
+        PrimitiveUnionMarshaler,
+        PrimitiveUnionMarshalerFactory,
+        PrimitiveUnionUnmarshaler,
+        PrimitiveUnionUnmarshalerFactory,
+    )
+
     from .composite.wrapped import (  # noqa
         WrappedMarshaler,
         WrappedUnmarshaler,
@@ -197,6 +208,7 @@ with _lang.auto_proxy_init(globals()):
     )
 
     from .polymorphism.metadata import (  # noqa
+        AutoStripSuffix,
         FieldTypeTagging,
         Impl,
         Impls,
@@ -212,13 +224,8 @@ with _lang.auto_proxy_init(globals()):
     )
 
     from .polymorphism.unions import (  # noqa
-        PRIMITIVE_UNION_TYPES,
         PolymorphismUnionMarshalerFactory,
         PolymorphismUnionUnmarshalerFactory,
-        PrimitiveUnionMarshaler,
-        PrimitiveUnionMarshalerFactory,
-        PrimitiveUnionUnmarshaler,
-        PrimitiveUnionUnmarshalerFactory,
     )
 
     from .polymorphism.unmarshal import (  # noqa

omlish/marshal/base/contexts.py

@@ -47,8 +47,9 @@ class MarshalContext(BaseContext, lang.Final):
 
     def make(self, o: ta.Any) -> 'Marshaler':
         rty = self._reflect(o)
+        fac = check.not_none(self.factory)
         try:
-            return check.not_none(self.factory).make_marshaler(self, rty)
+            return fac.make_marshaler(self, rty)
         except mfs.MatchGuardError:
             raise UnhandledTypeError(rty)  # noqa
 
@@ -62,8 +63,9 @@ class UnmarshalContext(BaseContext, lang.Final):
 
     def make(self, o: ta.Any) -> 'Unmarshaler':
         rty = self._reflect(o)
+        fac = check.not_none(self.factory)
         try:
-            return check.not_none(self.factory).make_unmarshaler(self, rty)
+            return fac.make_unmarshaler(self, rty)
         except mfs.MatchGuardError:
             raise UnhandledTypeError(rty)  # noqa
 

omlish/marshal/base/registries.py

@@ -7,7 +7,6 @@ import dataclasses as dc
 import threading
 import typing as ta
 
-from ... import collections as col
 from ... import lang
 
 
@@ -22,18 +21,6 @@ RegistryItemT = ta.TypeVar('RegistryItemT', bound=RegistryItem)
 RegistryItemU = ta.TypeVar('RegistryItemU', bound=RegistryItem)
 
 
-@dc.dataclass(frozen=True)
-class _KeyRegistryItems(ta.Generic[RegistryItemT]):
-    key: ta.Any
-    items: list[RegistryItemT] = dc.field(default_factory=list)
-    item_lists_by_ty: dict[type[RegistryItemT], list[RegistryItemT]] = dc.field(default_factory=dict)
-
-    def add(self, *items: RegistryItemT) -> None:
-        for i in items:
-            self.items.append(i)
-            self.item_lists_by_ty.setdefault(type(i), []).append(i)
-
-
 class RegistrySealedError(Exception):
     pass
 
@@ -50,14 +37,123 @@ class Registry(ta.Generic[RegistryItemT]):
             lock = threading.RLock()
         self._lock = lock
 
-        self._dct: dict[ta.Any, _KeyRegistryItems[RegistryItemT]] = {}
-        self._id_dct: ta.MutableMapping[ta.Any, _KeyRegistryItems[RegistryItemT]] = col.IdentityKeyDict()
+        self._state: Registry._State[RegistryItemT] = Registry._State(
+            dct={},
+            id_dct={},
+            version=0,
+        )
 
-        self._version = 0
         self._sealed = False
 
     #
 
+    @dc.dataclass(frozen=True)
+    class _KeyItems(ta.Generic[RegistryItemU]):
+        key: ta.Any
+        items: ta.Sequence[RegistryItemU] = ()
+        item_lists_by_ty: ta.Mapping[type[RegistryItemU], ta.Sequence[RegistryItemU]] = dc.field(default_factory=dict)
+
+        def add(self, *items: RegistryItemU) -> 'Registry._KeyItems[RegistryItemU]':
+            item_lists_by_ty: dict[type[RegistryItemU], list[RegistryItemU]] = {}
+
+            for i in items:
+                try:
+                    l = item_lists_by_ty[type(i)]
+                except KeyError:
+                    l = item_lists_by_ty[type(i)] = list(self.item_lists_by_ty.get(type(i), ()))
+                l.append(i)
+
+            return Registry._KeyItems(
+                self.key,
+                (*self.items, *items),
+                {**self.item_lists_by_ty, **item_lists_by_ty},
+            )
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    class _State(ta.Generic[RegistryItemU]):
+        dct: ta.Mapping[ta.Any, 'Registry._KeyItems[RegistryItemU]']
+        id_dct: ta.Mapping[ta.Any, 'Registry._KeyItems[RegistryItemU]']
+        version: int
+
+        #
+
+        def register(
+                self,
+                key: ta.Any,
+                *items: RegistryItemT,
+                identity: bool = False,
+        ) -> 'Registry._State[RegistryItemU]':
+            if not items:
+                return self
+
+            sr_dct: ta.Any = self.dct if not identity else self.id_dct
+            if (sr := sr_dct.get(key)) is None:
+                sr = Registry._KeyItems(key)
+            sr = sr.add(*items)
+            new = {key: sr}
+
+            return Registry._State(
+                dct={**self.dct, **new} if not identity else self.dct,
+                id_dct={**self.id_dct, **new} if identity else self.id_dct,
+                version=self.version + 1,
+            )
+
+        #
+
+        _get_cache: dict[ta.Any, ta.Sequence[RegistryItem]] = dc.field(default_factory=dict)
+
+        def get(
+                self,
+                key: ta.Any,
+                *,
+                identity: bool | None = None,
+        ) -> ta.Sequence[RegistryItem]:
+            if identity is None:
+                try:
+                    return self._get_cache[key]
+                except KeyError:
+                    pass
+
+                ret = self._get_cache[key] = (
+                    *self.get(key, identity=True),
+                    *self.get(key, identity=False),
+                )
+                return ret
+
+            dct: ta.Any = self.dct if not identity else self.id_dct
+            try:
+                return dct[key].items
+            except KeyError:
+                return ()
+
+        _get_of_cache: dict[ta.Any, dict[type, ta.Sequence[RegistryItem]]] = dc.field(default_factory=dict)
+
+        def get_of(
+                self,
+                key: ta.Any,
+                item_ty: type[RegistryItem],
+                *,
+                identity: bool | None = None,
+        ) -> ta.Sequence[RegistryItem]:
+            if identity is None:
+                try:
+                    return self._get_of_cache[key][item_ty]
+                except KeyError:
+                    pass
+
+                ret = self._get_of_cache.setdefault(key, {})[item_ty] = (
+                    *self.get_of(key, item_ty, identity=True),
+                    *self.get_of(key, item_ty, identity=False),
+                )
+                return ret
+
+            dct: ta.Any = self.dct if not identity else self.id_dct
+            try:
+                sr = dct[key]
+            except KeyError:
+                return ()
+            return sr.item_lists_by_ty.get(item_ty, ())
+
     def is_sealed(self) -> bool:
         if self._sealed:
             return True
@@ -92,12 +188,11 @@ class Registry(ta.Generic[RegistryItemT]):
             if self._sealed:
                 raise RegistrySealedError(self)
 
-            dct: ta.Any = self._id_dct if identity else self._dct
-            if (sr := dct.get(key)) is None:
-                sr = dct[key] = _KeyRegistryItems(key)
-            sr.add(*items)
-
-            self._version += 1
+            self._state = self._state.register(
+                key,
+                *items,
+                identity=identity,
+            )
 
         return self
 
@@ -109,17 +204,7 @@ class Registry(ta.Generic[RegistryItemT]):
             *,
             identity: bool | None = None,
     ) -> ta.Sequence[RegistryItem]:
-        if identity is None:
-            return (
-                *self.get(key, identity=True),
-                *self.get(key, identity=False),
-            )
-
-        dct: ta.Any = self._id_dct if identity else self._dct
-        try:
-            return dct[key].items
-        except KeyError:
-            return ()
+        return self._state.get(key, identity=identity)
 
     def get_of(
             self,
@@ -128,15 +213,4 @@ class Registry(ta.Generic[RegistryItemT]):
             *,
             identity: bool | None = None,
     ) -> ta.Sequence[RegistryItemU]:
-        if identity is None:
-            return (
-                *self.get_of(key, item_ty, identity=True),
-                *self.get_of(key, item_ty, identity=False),
-            )
-
-        dct: ta.Any = self._id_dct if identity else self._dct
-        try:
-            sr = dct[key]
-        except KeyError:
-            return ()
-        return sr.item_lists_by_ty.get(item_ty, ())
+        return self._state.get_of(key, item_ty, identity=identity)  # type: ignore[return-value]

omlish/marshal/composite/literals.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - squash literal unions - typing machinery doesn't
+"""
 import dataclasses as dc
 import typing as ta
 
@@ -26,7 +30,7 @@ class LiteralMarshaler(Marshaler):
 
 class LiteralMarshalerFactory(SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, rfl.Literal)
+        return isinstance(rty, rfl.Literal) and len(set(map(type, rty.args))) == 1
 
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
         lty = check.isinstance(rty, rfl.Literal)
@@ -45,7 +49,7 @@ class LiteralUnmarshaler(Unmarshaler):
 
 class LiteralUnmarshalerFactory(SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, rfl.Literal)
+        return isinstance(rty, rfl.Literal) and len(set(map(type, rty.args))) == 1
 
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
         lty = check.isinstance(rty, rfl.Literal)

omlish/marshal/composite/unions.py

@@ -0,0 +1,213 @@
+import typing as ta
+
+from ... import check
+from ... import collections as col
+from ... import dataclasses as dc
+from ... import lang
+from ... import reflect as rfl
+from ...funcs import match as mfs
+from ..base.contexts import MarshalContext
+from ..base.contexts import UnmarshalContext
+from ..base.types import Marshaler
+from ..base.types import Unmarshaler
+from ..base.values import Value
+from ..factories.simple import SimpleMarshalerFactory
+from ..factories.simple import SimpleUnmarshalerFactory
+
+
+##
+
+
+class MatchUnionMarshaler(Marshaler):
+    mmf: mfs.MultiMatchFn[[UnmarshalContext, Value], ta.Any]
+
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        try:
+            m = self.mmf.match(ctx, o)
+        except mfs.AmbiguousMatchesError:
+            raise ValueError(o)  # noqa
+        return m.fn(ctx, o)
+
+
+class MatchUnionUnmarshaler(Unmarshaler):
+    mmf: mfs.MultiMatchFn[[UnmarshalContext, Value], ta.Any]
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
+        try:
+            m = self.mmf.match(ctx, v)
+        except mfs.AmbiguousMatchesError:
+            raise ValueError(v)  # noqa
+        return m.fn(ctx, v)
+
+
+##
+
+
+PRIMITIVE_UNION_TYPES: tuple[type, ...] = (
+    float,
+    int,
+    str,
+    bool,
+)
+
+
+class DestructuredPrimitiveUnionType(ta.NamedTuple):
+    prim: ta.Sequence[type]
+    non_prim: ta.Sequence[rfl.Type]
+
+
+def _destructure_primitive_union_type(
+        rty: rfl.Type,
+        prim_tys: ta.Container[type] = PRIMITIVE_UNION_TYPES,
+) -> DestructuredPrimitiveUnionType | None:
+    if not isinstance(rty, rfl.Union):
+        return None
+
+    pr = col.partition(rty.args, lambda a: isinstance(a, type) and a in prim_tys)
+    if not pr.t or len(pr.f) > 1:
+        return None
+
+    return DestructuredPrimitiveUnionType(*pr)  # type: ignore[arg-type]
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class PrimitiveUnionMarshaler(Marshaler):
+    tys: ta.Sequence[type]
+    x: Marshaler | None = None
+
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        if type(o) not in self.tys:
+            if self.x is not None:
+                return self.x.marshal(ctx, o)
+            raise TypeError(o)
+        return o
+
+
+@dc.dataclass(frozen=True)
+class PrimitiveUnionMarshalerFactory(SimpleMarshalerFactory):
+    tys: ta.Sequence[type] = PRIMITIVE_UNION_TYPES
+
+    def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
+        return _destructure_primitive_union_type(rty, self.tys) is not None
+
+    def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
+        prim, non_prim = check.not_none(_destructure_primitive_union_type(rty, self.tys))
+        return PrimitiveUnionMarshaler(
+            prim,
+            ctx.make(check.single(non_prim)) if non_prim else None,
+        )
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class PrimitiveUnionUnmarshaler(Unmarshaler):
+    tys: ta.Sequence[type]
+    x: Unmarshaler | None = None
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
+        if type(v) not in self.tys:
+            if self.x is not None:
+                return self.x.unmarshal(ctx, v)
+            raise TypeError(v)
+        return v
+
+
+@dc.dataclass(frozen=True)
+class PrimitiveUnionUnmarshalerFactory(SimpleUnmarshalerFactory):
+    tys: ta.Sequence[type] = PRIMITIVE_UNION_TYPES
+
+    def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
+        return _destructure_primitive_union_type(rty, self.tys) is not None
+
+    def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
+        prim, non_prim = check.not_none(_destructure_primitive_union_type(rty, self.tys))
+        return PrimitiveUnionUnmarshaler(
+            prim,
+            ctx.make(check.single(non_prim)) if non_prim else None,
+        )
+
+
+##
+
+
+LITERAL_UNION_TYPES: tuple[type, ...] = (
+    int,
+    str,
+)
+
+
+class DestructuredLiteralUnionType(ta.NamedTuple):
+    v_ty: type
+    lit: rfl.Literal
+    non_lit: rfl.Type
+
+
+def _destructure_literal_union_type(rty: rfl.Type) -> DestructuredLiteralUnionType | None:
+    if not isinstance(rty, rfl.Union):
+        return None
+    lits, non_lits = col.partition(rty.args, lang.isinstance_of(rfl.Literal))  # noqa
+    if len(lits) != 1 or len(non_lits) != 1:
+        return None
+    lit = check.isinstance(check.single(lits), rfl.Literal)
+    v_tys = set(map(type, lit.args))
+    if len(v_tys) != 1:
+        return None
+    [v_ty] = v_tys
+    if v_ty in rty.args or v_ty not in LITERAL_UNION_TYPES:
+        return None
+    return DestructuredLiteralUnionType(v_ty, lit, check.single(non_lits))
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class LiteralUnionMarshaler(Marshaler):
+    v_ty: type
+    l: Marshaler
+    x: Marshaler
+
+    def marshal(self, ctx: MarshalContext, o: ta.Any | None) -> Value:
+        if isinstance(o, self.v_ty):
+            return self.l.marshal(ctx, o)
+        else:
+            return self.x.marshal(ctx, o)
+
+
+class LiteralUnionMarshalerFactory(SimpleMarshalerFactory):
+    def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
+        return _destructure_literal_union_type(rty) is not None
+
+    def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
+        ds = check.not_none(_destructure_literal_union_type(rty))
+        return LiteralUnionMarshaler(ds.v_ty, ctx.make(ds.lit), ctx.make(ds.non_lit))
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class LiteralUnionUnmarshaler(Unmarshaler):
+    v_ty: type
+    l: Unmarshaler
+    x: Unmarshaler
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any | None:
+        if isinstance(v, self.v_ty):
+            return self.l.unmarshal(ctx, v)  # type: ignore[arg-type]
+        else:
+            return self.x.unmarshal(ctx, v)
+
+
+class LiteralUnionUnmarshalerFactory(SimpleUnmarshalerFactory):
+    def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
+        return _destructure_literal_union_type(rty) is not None
+
+    def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
+        ds = check.not_none(_destructure_literal_union_type(rty))
+        return LiteralUnionUnmarshaler(ds.v_ty, ctx.make(ds.lit), ctx.make(ds.non_lit))

omlish/marshal/factories/moduleimport/factories.py

@@ -43,11 +43,11 @@ class _ModuleImportingFactory(mfs.MatchFn[[ContextT, rfl.Type], R]):
         self._callback = callback
 
         self._lock = threading.RLock()
-        self._has_imported = False
+        self._last_mis: ta.Any = None
 
-    def _do_import(self, ctx: ContextT) -> None:
+    def _do_import(self, ctx: ContextT, mis: ta.Sequence[ModuleImport]) -> None:
         c = 0
-        for mi in ctx.config_registry.get_of(None, ModuleImport):
+        for mi in mis:
             if mi.import_if_necessary():
                 c += 1
 
@@ -56,13 +56,11 @@ class _ModuleImportingFactory(mfs.MatchFn[[ContextT, rfl.Type], R]):
                 self._callback()
 
     def _import_if_necessary(self, ctx: ContextT) -> None:
-        # FIXME:
-        # if not self._has_imported:
-        #     with self._lock:
-        #         if not self._has_imported:
-        #             self._do_import(ctx)
-        #             self._has_imported = True
-        self._do_import(ctx)
+        if (mis := ctx.config_registry.get_of(None, ModuleImport)) and mis is not self._last_mis:
+            with self._lock:
+                if (mis := ctx.config_registry.get_of(None, ModuleImport)) and mis is not self._last_mis:
+                    self._do_import(ctx, mis)
+                    self._last_mis = mis
 
     def guard(self, ctx: ContextT, rty: rfl.Type) -> bool:
         self._import_if_necessary(ctx)

omlish/marshal/polymorphism/metadata.py

@@ -107,23 +107,34 @@ class Polymorphism:
         return self._impls
 
 
+class AutoStripSuffix(lang.Marker):
+    pass
+
+
 def polymorphism_from_impls(
         ty: type,
         impls: ta.Iterable[type],
         *,
         naming: Naming | None = None,
-        strip_suffix: bool | ta.Literal['auto'] = False,
+        strip_suffix: bool | type[AutoStripSuffix] | str = False,
 ) -> Polymorphism:
     impls = set(impls)
 
-    if strip_suffix == 'auto':
+    ssx: str | None
+    if strip_suffix is AutoStripSuffix:
         strip_suffix = all(c.__name__.endswith(ty.__name__) for c in impls)
+    if isinstance(strip_suffix, bool):
+        ssx = ty.__name__ if strip_suffix else None
+    elif isinstance(strip_suffix, str):
+        ssx = strip_suffix
+    else:
+        raise TypeError(strip_suffix)
 
     dct: dict[str, Impl] = {}
     for cur in impls:
         name = cur.__name__
-        if strip_suffix:
-            name = lang.strip_suffix(name, ty.__name__)
+        if ssx is not None:
+            name = lang.strip_suffix(name, ssx)
         if naming is not None:
             name = translate_name(name, naming)
         if name in dct:
@@ -141,7 +152,7 @@ def polymorphism_from_subclasses(
         ty: type,
         *,
         naming: Naming | None = None,
-        strip_suffix: bool | ta.Literal['auto'] = False,
+        strip_suffix: bool | type[AutoStripSuffix] | str = False,
 ) -> Polymorphism:
     return polymorphism_from_impls(
         ty,

omlish/marshal/polymorphism/standard.py

@@ -1,9 +1,13 @@
+import typing as ta
+
 from ..base.types import MarshalerFactory
 from ..base.types import UnmarshalerFactory
 from .marshal import PolymorphismMarshalerFactory
 from .metadata import Polymorphism
 from .metadata import TypeTagging
 from .metadata import WrapperTypeTagging
+from .unions import PolymorphismUnionMarshalerFactory
+from .unions import PolymorphismUnionUnmarshalerFactory
 from .unmarshal import PolymorphismUnmarshalerFactory
 
 
@@ -13,8 +17,18 @@ from .unmarshal import PolymorphismUnmarshalerFactory
 def standard_polymorphism_factories(
         poly: Polymorphism,
         tt: TypeTagging = WrapperTypeTagging(),
-) -> tuple[MarshalerFactory, UnmarshalerFactory]:
-    return (
+        *,
+        unions: bool | ta.Literal['partial'] = False,
+) -> ta.Sequence[MarshalerFactory | UnmarshalerFactory]:
+    out: list[MarshalerFactory | UnmarshalerFactory] = [
         PolymorphismMarshalerFactory(poly, tt),
         PolymorphismUnmarshalerFactory(poly, tt),
-    )
+    ]
+
+    if unions:
+        out.extend([
+            PolymorphismUnionMarshalerFactory(poly.impls, tt, allow_partial=unions == 'partial'),
+            PolymorphismUnionUnmarshalerFactory(poly.impls, tt, allow_partial=unions == 'partial'),
+        ])
+
+    return out

omlish/marshal/polymorphism/unions.py

@@ -1,16 +1,12 @@
-import typing as ta
-
 from ... import cached
 from ... import check
 from ... import dataclasses as dc
 from ... import lang
 from ... import reflect as rfl
-from ...funcs import match as mfs
 from ..base.contexts import MarshalContext
 from ..base.contexts import UnmarshalContext
 from ..base.types import Marshaler
 from ..base.types import Unmarshaler
-from ..base.values import Value
 from ..factories.simple import SimpleMarshalerFactory
 from ..factories.simple import SimpleUnmarshalerFactory
 from .marshal import make_polymorphism_marshaler
@@ -23,98 +19,6 @@ from .unmarshal import make_polymorphism_unmarshaler
 ##
 
 
-class MatchUnionMarshaler(Marshaler):
-    mmf: mfs.MultiMatchFn[[UnmarshalContext, Value], ta.Any]
-
-    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        try:
-            m = self.mmf.match(ctx, o)
-        except mfs.AmbiguousMatchesError:
-            raise ValueError(o)  # noqa
-        return m.fn(ctx, o)
-
-
-class MatchUnionUnmarshaler(Unmarshaler):
-    mmf: mfs.MultiMatchFn[[UnmarshalContext, Value], ta.Any]
-
-    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
-        try:
-            m = self.mmf.match(ctx, v)
-        except mfs.AmbiguousMatchesError:
-            raise ValueError(v)  # noqa
-        return m.fn(ctx, v)
-
-
-##
-
-
-PRIMITIVE_UNION_TYPES: tuple[type, ...] = (
-    float,
-    int,
-    str,
-)
-
-
-#
-
-
-@dc.dataclass(frozen=True)
-class PrimitiveUnionMarshaler(Marshaler):
-    tys: ta.Sequence[type]
-
-    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        if type(o) not in self.tys:
-            raise TypeError(o)
-        return o
-
-
-@dc.dataclass(frozen=True)
-class PrimitiveUnionMarshalerFactory(SimpleMarshalerFactory):
-    tys: ta.Sequence[type] = PRIMITIVE_UNION_TYPES
-
-    def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, rfl.Union) and all(a in self.tys for a in rty.args)
-
-    def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
-        args = check.isinstance(rty, rfl.Union).args
-        return PrimitiveUnionMarshaler([t for t in self.tys if t in args])
-
-
-#
-
-
-@dc.dataclass(frozen=True)
-class PrimitiveUnionUnmarshaler(Unmarshaler):
-    tys: ta.Sequence[type]
-
-    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
-        if type(v) not in self.tys:
-            raise TypeError(v)
-        return v
-
-
-@dc.dataclass(frozen=True)
-class PrimitiveUnionUnmarshalerFactory(SimpleUnmarshalerFactory):
-    tys: ta.Sequence[type] = PRIMITIVE_UNION_TYPES
-
-    def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, rfl.Union) and all(a in self.tys for a in rty.args)
-
-    def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
-        args = check.isinstance(rty, rfl.Union).args
-        return PrimitiveUnionUnmarshaler([t for t in self.tys if t in args])
-
-
-#
-
-
-PRIMITIVE_UNION_MARSHALER_FACTORY = PrimitiveUnionMarshalerFactory()
-PRIMITIVE_UNION_UNMARSHALER_FACTORY = PrimitiveUnionUnmarshalerFactory()
-
-
-##
-
-
 @dc.dataclass(frozen=True)
 class _BasePolymorphismUnionFactory(lang.Abstract):
     impls: Impls

omlish/marshal/standard.py

@@ -22,6 +22,10 @@ from .composite.optionals import OptionalMarshalerFactory
 from .composite.optionals import OptionalUnmarshalerFactory
 from .composite.special import SequenceNotStrMarshalerFactory
 from .composite.special import SequenceNotStrUnmarshalerFactory
+from .composite.unions import LiteralUnionMarshalerFactory
+from .composite.unions import LiteralUnionUnmarshalerFactory
+from .composite.unions import PrimitiveUnionMarshalerFactory
+from .composite.unions import PrimitiveUnionUnmarshalerFactory
 from .factories.invalidate import InvalidatableMarshalerFactory
 from .factories.invalidate import InvalidatableUnmarshalerFactory
 from .factories.moduleimport.factories import ModuleImportingMarshalerFactory
@@ -36,8 +40,6 @@ from .objects.dataclasses import DataclassMarshalerFactory
 from .objects.dataclasses import DataclassUnmarshalerFactory
 from .objects.namedtuples import NamedtupleMarshalerFactory
 from .objects.namedtuples import NamedtupleUnmarshalerFactory
-from .polymorphism.unions import PrimitiveUnionMarshalerFactory
-from .polymorphism.unions import PrimitiveUnionUnmarshalerFactory
 from .singular.datetimes import DATETIME_MARSHALER_FACTORY
 from .singular.datetimes import DATETIME_UNMARSHALER_FACTORY
 from .singular.enums import EnumMarshalerFactory
@@ -65,6 +67,7 @@ DEFAULT_STANDARD_FACTORIES = StandardFactories(
         PRIMITIVE_MARSHALER_FACTORY,
         NewtypeMarshalerFactory(),
         OptionalMarshalerFactory(),
+        LiteralUnionMarshalerFactory(),
         PrimitiveUnionMarshalerFactory(),
         DataclassMarshalerFactory(),
         NamedtupleMarshalerFactory(),
@@ -84,6 +87,7 @@ DEFAULT_STANDARD_FACTORIES = StandardFactories(
         PRIMITIVE_UNMARSHALER_FACTORY,
         NewtypeUnmarshalerFactory(),
         OptionalUnmarshalerFactory(),
+        LiteralUnionUnmarshalerFactory(),
         PrimitiveUnionUnmarshalerFactory(),
         DataclassUnmarshalerFactory(),
         NamedtupleUnmarshalerFactory(),

omlish/secrets/marshal.py

@@ -54,7 +54,7 @@ def marshal_secret_field(f: dc.Field) -> dc.Field:
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         msh.ForbiddenTypeMarshalerFactory({Secret}),
         msh.ForbiddenTypeUnmarshalerFactory({Secret}),

omlish/specs/jsonrpc/_marshal.py

@@ -51,7 +51,7 @@ class NotSpecifiedUnionUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         msh.ForbiddenTypeMarshalerFactory({_NOT_SPECIFIED_RTY}),
         msh.ForbiddenTypeUnmarshalerFactory({_NOT_SPECIFIED_RTY}),

omlish/specs/jsonschema/_marshal.py

@@ -22,7 +22,7 @@ class _KeywordsUnmarshaler(msh.Unmarshaler):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         msh.TypeMapMarshalerFactory({Keywords: _KeywordsMarshaler()}),
         msh.TypeMapUnmarshalerFactory({Keywords: _KeywordsUnmarshaler()}),

omlish/specs/openapi/_marshal.py

@@ -138,7 +138,7 @@ class _SchemaUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         _ReferenceUnionMarshalerFactory(),
         _ReferenceUnionUnmarshalerFactory(),

omlish/sql/queries/_marshal.py

@@ -63,7 +63,7 @@ class LowerEnumMarshaler(msh.Marshaler, msh.Unmarshaler):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     for ty, ns in [
         (BinaryOp, BinaryOps),
         (UnaryOp, UnaryOps),
@@ -92,7 +92,7 @@ def _install_standard_marshalling() -> None:
         p = msh.polymorphism_from_subclasses(
             cls,
             naming=msh.Naming.SNAKE,
-            strip_suffix='auto',
+            strip_suffix=msh.AutoStripSuffix,
         )
         msh.install_standard_factories(
             msh.PolymorphismMarshalerFactory(p),

omlish/sql/tabledefs/_marshal.py

@@ -16,6 +16,6 @@ def _install_poly(cls: type) -> None:
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     _install_poly(Dtype)
     _install_poly(Element)

omlish/typedvalues/marshal.py

@@ -19,7 +19,7 @@ def _build_typed_value_poly(rty: rfl.Type) -> msh.Polymorphism:
     return msh.polymorphism_from_subclasses(
         ty,
         naming=msh.Naming.SNAKE,
-        strip_suffix='auto',
+        strip_suffix=msh.AutoStripSuffix,
     )
 
 
@@ -144,7 +144,7 @@ class TypedValuesUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         TypedValueMarshalerFactory(),
         TypedValueUnmarshalerFactory(),

{omlish-0.0.0.dev450.dist-info → omlish-0.0.0.dev452.dist-info}/METADATA

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

{omlish-0.0.0.dev450.dist-info → omlish-0.0.0.dev452.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.omlish-manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=pAgRECTFzk0v1aWP_EMCioDMp_FL4IXyuUAF95ZEw0Q,3613
+omlish/__about__.py,sha256=Ia-k2mCoU1psSy7-YOmB-XdT8JnxIXK5ICScX_nTpxs,3613
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ZNIMl1kwg3qdei4DiUrJPQe5M81S1e76N-GuNSwLBAE,8683
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -48,7 +48,7 @@ omlish/asyncs/ioproxy/proxy.py,sha256=TmWNQb7iOKyEk8ZOG2gZuk0RhziymwypWblZQ5u2QS
 omlish/asyncs/ioproxy/typing.py,sha256=ZM-9HRO4dpy-RqomSkyRha9s901ckL30bwjACi2TJ8s,2475
 omlish/bootstrap/__init__.py,sha256=svuRMcY-rqA31fLnHpTRRAs1uN63MXIeGcKK3NoKhL0,691
 omlish/bootstrap/__main__.py,sha256=GKhsZdPdJtzE4qnjt34-EvL07nLJVZD-d8nxfGl7EEI,188
-omlish/bootstrap/_marshal.py,sha256=aKLeiOyPW6DelVK78dmw0axQzOMHX-ALrSqOOzYh05w,486
+omlish/bootstrap/_marshal.py,sha256=FF2sUEoLZyQ55F53hLmoeox6Y24XJuKryZXAIth-nJs,485
 omlish/bootstrap/base.py,sha256=K9CaPlVO7X5dsvmEp-lZw32Ud52K0DoEbPIWGB7Hgcs,1075
 omlish/bootstrap/diag.py,sha256=nTHKrZBdyEYoTpctwOpwzSMbQ2dROGkxpdzWfoe2xZg,5353
 omlish/bootstrap/harness.py,sha256=qPYW7CXUdLi-a3BK6GvbdAPb91j5IiRlBPcXCjRGzZo,1995
@@ -203,8 +203,8 @@ omlish/diag/lsof.py,sha256=5N5aZQ7UqEBgV-hj3_a8QcvALOeLlVb8otqF2hvucxY,9107
 omlish/diag/procfs.py,sha256=eeB3L9UpNBpAfsax3U6OczayYboPlFzOGplqlQ4gBNY,9700
 omlish/diag/procstats.py,sha256=EJEe2Zc58ykBoTfqMXro7H52aQa_pd6uC2hsIPFceso,825
 omlish/diag/ps.py,sha256=MEpMU6fbkh0bSWrOHh_okOa0JDTUSUQUVSYBdh1TGvE,1672
-omlish/diag/pycharm.py,sha256=9Mgn5T2ZdlEUL3VV-GzVmCBs_ZtIpLwaUzP6pgHEUEo,4712
-omlish/diag/pydevd.py,sha256=4_tKEwjj2tUL3DMNdB1IXZ-zKZjTJd6o75kL0JKEZAk,7593
+omlish/diag/pycharm.py,sha256=_WVmPm1E66cBtR4ukgUAaApe_3rX9Cv3sQRP5PL37P8,5013
+omlish/diag/pydevd.py,sha256=P8izkeCEJWXFLqOWS6X8qUH3rlcfhiE07ZJOPGa5xYU,8203
 omlish/diag/threads.py,sha256=sjtlTl41wxssoVCDkBB6xeLF-9kJEK3eA6hmSFWJSQA,3643
 omlish/diag/timers.py,sha256=cxX3GgjTIjBx9DI4pzCCO5Hfqb1TM3uo22yim7kjfRU,3831
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -237,7 +237,7 @@ omlish/formats/__init__.py,sha256=T0AG1gFnqQ5JiHN0UPQjQ-7g5tnxMIG-mgOvMYExYAM,21
 omlish/formats/cbor.py,sha256=o_Hbe4kthO9CeXK-FySrw0dHVlrdyTo2Y8PpGRDfZ3c,514
 omlish/formats/cloudpickle.py,sha256=16si4yUp_pAdDWGECAWf6HLA2PwSANGGgDoMLGZUem8,579
 omlish/formats/codecs.py,sha256=n_02fv1Qk2ixG9vDkTZKdRHGWPKnvDBDdOMVKfnElOI,1641
-omlish/formats/dotenv.py,sha256=2BjwqsgLgXCmvyNeWq6_xigfH4OIcIoaJbYIuVmul5E,19351
+omlish/formats/dotenv.py,sha256=nDLVPtWHsJaPWKv9Nl8IXSg2R6fayH40nUEBg_7Ozoc,19345
 omlish/formats/logfmt.py,sha256=i_pKnzFFyNAcPiqC4FiTYPC6tJujlaGuw94V2YNVkf8,2639
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=orlqpFG88hL39apzaAOHmNooQv-kbnXX2WggZjdI-U8,18934
@@ -287,7 +287,7 @@ omlish/formats/toml/writer.py,sha256=9NT8sRy3I9KubxFx56Qbislvrdtbd23rEuBT-GSdUYA
 omlish/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/funcs/builders.py,sha256=ZSBQS2xqriXp5x0t074EEZvuTmMp4Yue2YGBoTLAioo,4044
 omlish/funcs/genmachine.py,sha256=BOxO1OTjxZ7ewv_WpqYkY8bwlGQIJIjwjvYMflEFa_M,2571
-omlish/funcs/match.py,sha256=AD0sQs_GIRq--fIQzL5gFYzlvXHplIljvlx7hbhNSEk,6213
+omlish/funcs/match.py,sha256=cBtG7kdpWdxvHwlte5CWlBxXSoJSV48joV4bwJJC3pk,6352
 omlish/funcs/pairs.py,sha256=XhYTJdqooAJKeoGZmEaiKYeFRq5-Dj2_y92IdBl_C20,4371
 omlish/funcs/pipes.py,sha256=E1dQZMBmgT2qautG1vEqy5v3QBsO2Nzryv33j4YAngA,2520
 omlish/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -481,7 +481,7 @@ omlish/lite/marshal.py,sha256=oVqVwqTArFUj9lYhmKg_MVgnqlCAUvOnYgtU3bBu_bk,23020
 omlish/lite/maybes.py,sha256=sJ4dawgBxlZ4oB9dZ3bhBb_8AOJlIW0nVIFgFZ1huXE,4384
 omlish/lite/maysync.py,sha256=Otd-xqWaMzY9xBF5SiLKxu4kG_GaWGk8qTGFDAHXDm4,14803
 omlish/lite/objects.py,sha256=HzN_4J6w6WDLKDrW8jSNUKgfAR5vUsB42rtSCu04oqQ,1921
-omlish/lite/pycharm.py,sha256=FRHGcCDo42UzZXqNwW_DkhI-6kb_CmJKPiQ8F6mYkLA,1174
+omlish/lite/pycharm.py,sha256=fdSTwtdqGRL0P9IkCrDAPqQkJsegq1NfYyVG2N6cy4w,1174
 omlish/lite/reflect.py,sha256=aTRQJ-hgnyRxr0dFxivUTScmUgP7zcw_iDQZIsarG24,2119
 omlish/lite/resources.py,sha256=YNSmX1Ohck1aoWRs55a-o5ChVbFJIQhtbqE-XwF55Oc,326
 omlish/lite/runtime.py,sha256=J59skBq9kwo1H2s36jAk-k87eKPUtua6CmuXh-3dgmE,464
@@ -526,28 +526,29 @@ omlish/manifests/globals.py,sha256=kVqQ-fT4kc7xWzLHoI731GviitFPv2v2yqw-p7t7Exs,2
 omlish/manifests/loading.py,sha256=s6KnhdFQCsI2i0Rus1sMU0so2v8dUBnk59BJkSnxGt8,17514
 omlish/manifests/static.py,sha256=9BaPBLkuzxHmg5A-5k9BjjBFINCdmFOIu06dMFgCfz4,497
 omlish/manifests/types.py,sha256=NeOGuIVrcbqjCDbQ3MnCxxHAgHnw0CkWJsBzo230PWE,453
-omlish/marshal/__init__.py,sha256=uzPPSRIamgMa0syMbY1I_2YJApaABNeDczBmrgm8j7I,6203
+omlish/marshal/__init__.py,sha256=HLC2svV0fqgDhAk2RJ7WWrfn7co45VwXjIZXYuYOJ6g,6340
 omlish/marshal/globals.py,sha256=Q6G18hcUwUDDNnpyRPnR5Tn_XZpZCSIEXo09nYSOaNU,2236
 omlish/marshal/naming.py,sha256=Mk5YrbES836_KflNNRoc5Ajd96iMYLQIMERKx1KpT4g,865
-omlish/marshal/standard.py,sha256=6L4FK7QVgVFAf2jkTQlCvN-15DWK49VCNlNwCBea3-8,6674
+omlish/marshal/standard.py,sha256=UUdg74AMalPafWdQTR_kUY_n46a5G4iRo3BJfniniL8,6870
 omlish/marshal/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/base/configs.py,sha256=y_JRghQgu8mJjPspSZcJQLhjevEuJE2kyxCdu3wGKvo,271
-omlish/marshal/base/contexts.py,sha256=greDE5d4xHrY7NWTSwEgrBh_BSeALAqBqx2-xcAMoIg,2256
+omlish/marshal/base/contexts.py,sha256=yt-CNl2MH-TLiNtTQOvGU7-6AvJcwNf8ggBInKTRnbs,2292
 omlish/marshal/base/errors.py,sha256=jmN3vl_U_hB6L0wAvuO7ORG27vXF7KEUk-1TxxK2mYA,308
 omlish/marshal/base/funcs.py,sha256=OeSb8T3R0HZmEnAI4lOhI1HPRurTAezzV3TZWdGGK9s,1558
 omlish/marshal/base/options.py,sha256=OoDErPmI0kswnqAtr7QYndlPYhIqIDarx833tKFT2R4,23
 omlish/marshal/base/overrides.py,sha256=543hP4_y2JRThUOamCE0dPfgucbepVV8e_YF-_PJk6U,993
-omlish/marshal/base/registries.py,sha256=CHxjr2VPEwh2NwmnCB17AMY3YE9mWT9kUtPNiyTzGM8,3416
+omlish/marshal/base/registries.py,sha256=NRH5X4nE_aF7vcTi4_5qqQpYbYru2Ud6aD0eKfuJ_Ws,5903
 omlish/marshal/base/types.py,sha256=DBczbVhz9z9zM4uux43KUnCEJUIW_JqVNyXMxPd--Cs,2472
 omlish/marshal/base/values.py,sha256=QF6OateG5kjRPHYza08wscThhg20oryf-aVQrxjfkC0,212
 omlish/marshal/composite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/composite/iterables.py,sha256=2VU3sh5TBKMVF1cWPXhDeuELPQzrAYovmTNHzoFLeS4,2704
-omlish/marshal/composite/literals.py,sha256=pXngZKSaZ4f-ANr43AsU1ob_Rj7KTjZRQQvNjdMCKRc,1696
+omlish/marshal/composite/literals.py,sha256=HB2uhkom3D214PqBlE2WXXu7Hjl18V65E7J2TJK-cYM,1840
 omlish/marshal/composite/mappings.py,sha256=hOQ-_UZCFTqW_y70a4hNJsNsr2J9y3MYIePEymZMj94,2861
 omlish/marshal/composite/maybes.py,sha256=Qy0-bxW3fC3jVvDzszNQogGwGSAwmPt61nTXP06l6cY,2273
 omlish/marshal/composite/newtypes.py,sha256=KiDsuBtF7jbWk7A3wy2LAZvuaG7KJzYNF1Y0jKSOZWU,932
 omlish/marshal/composite/optionals.py,sha256=A-0GUaTL5585mxdNO_FcpnP2KFmJ64MkAwMukqng2ls,1596
 omlish/marshal/composite/special.py,sha256=325cEkzGw2XoMq6W0CvvO7n2Dx9I3mDsjdlZ2tN4Bfs,1402
+omlish/marshal/composite/unions.py,sha256=qUVAbUS16YI1toRmq0liyuMUQSq1d2Ox5mAW0zYCdog,6058
 omlish/marshal/composite/wrapped.py,sha256=xC8k21wJOpSkpAn7794hBTPBRw-HPC9sOF3WRlUh_BA,785
 omlish/marshal/factories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/factories/invalidate.py,sha256=Jo0aGNg94LqkexVYnbwxeOscgiLC1ap_kzAgWPvRaKE,3053
@@ -559,7 +560,7 @@ omlish/marshal/factories/typecache.py,sha256=Q8VMGsXJMycKGIuA9NYT6h6NmcNUB8-5A_q
 omlish/marshal/factories/typemap.py,sha256=CxScQbRw3VwILGhf38v2yOiof45YJ9p2LQhZ37SHNj8,1606
 omlish/marshal/factories/moduleimport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/factories/moduleimport/configs.py,sha256=8g6FSPmyo0IOYSWYp5kqfJACZxL9SvzlHzrSzucNZyg,538
-omlish/marshal/factories/moduleimport/factories.py,sha256=LpiH27t6O8x1x-j9v2P5vD8H9TABgVS8Xe9xE4yPGRg,3136
+omlish/marshal/factories/moduleimport/factories.py,sha256=6q3h8V2uOQKXZUNFnrpK2Zo2Huo920cvk6CL-W3U4gE,3198
 omlish/marshal/objects/__init__.py,sha256=F4wej8L_tedC8ETYxAnmKfdPR9TjsqIus9Z3nZofYuc,182
 omlish/marshal/objects/dataclasses.py,sha256=JbtI0aciUH6_eqw9qDz2O9NlbndgSvV9Cxn7SrPG7xM,9511
 omlish/marshal/objects/helpers.py,sha256=hj5I1pILt3QFSVkYJNrSO3wiCaalAopEYWPL17Ip4zs,1102
@@ -569,9 +570,9 @@ omlish/marshal/objects/namedtuples.py,sha256=uzOZuEt2IrWtk7uyo13xaWEmFhxRQ3aKAzo
 omlish/marshal/objects/unmarshal.py,sha256=izhtSwqSrlWSOL5uZS3naPxnfq3rhv25uUPN7_rpO08,3664
 omlish/marshal/polymorphism/__init__.py,sha256=e2UTrSL0qp7w_1vkdxDWd7sXlWhep2KPV49-BB64ma8,130
 omlish/marshal/polymorphism/marshal.py,sha256=ZnayCbRj3451U4py1-9dU99PHvjQuQk-ZQDGgzQjF4U,2292
-omlish/marshal/polymorphism/metadata.py,sha256=c-sOVGvV96OqMfdXUVcVXK8u4xtxHjdHJFXmUx7Km40,3327
-omlish/marshal/polymorphism/standard.py,sha256=6wwFFwL9fTwIDqhynZr05naL8gVNC_RnPux-8vmja8o,587
-omlish/marshal/polymorphism/unions.py,sha256=AWNyzETvgADOjPmXsHloXgbvjZ4GX9b_iNmD6ZdXsT0,4445
+omlish/marshal/polymorphism/metadata.py,sha256=s5lNTzvP487niVorDUy6RFeTB7hde89ENgm-7I_MQg0,3622
+omlish/marshal/polymorphism/standard.py,sha256=sfxKVjFG8tUam_U75_rFMY2-JSWw_l1_HBg2MrXjQHE,1096
+omlish/marshal/polymorphism/unions.py,sha256=YoeDteNF3vKipGCvJDKamkykXQJ43K6R1zxM725T0YU,1963
 omlish/marshal/polymorphism/unmarshal.py,sha256=8bLeI9UxUluoIqkRJSJIbdCsKkXjx3myYe9uWs16QjY,2483
 omlish/marshal/singular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/singular/base64.py,sha256=OZ3Ydwy64S0M-xlktYy5MagzyzTOVYayUXblq8ZK-AE,1164
@@ -627,7 +628,7 @@ omlish/reflect/types.py,sha256=4Plo_1cHIk8-68lu8_c_SUEohy19exTNDsgvuVbOJ5A,16066
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/secrets/all.py,sha256=qBxUFIqxCExADL71taNH_W6FYT9QvOrdcaMeUUPO3aw,298
 omlish/secrets/crypto.py,sha256=q0Hca5oMwvh39r0hrupN_ewxhlllbdDgAgVoloYFmDg,3714
-omlish/secrets/marshal.py,sha256=u90n1OfRfdpH1T2F0xK_pAPH1ENYL6acFt6XdVd3KvI,1986
+omlish/secrets/marshal.py,sha256=RmafPrkmSnO4YEjwLI21z1XQirdg55WMJ8U7zdJ_BqA,1985
 omlish/secrets/openssl.py,sha256=4zp1KZ1EVRNaBS0VIokTqnamy3ZeeC1XN2wSXx4lEcM,6215
 omlish/secrets/pwgen.py,sha256=Z5i1qMKK4idOZvWai5dXkI59gX7pYzFFlFYAj7qEmqA,1706
 omlish/secrets/pwhash.py,sha256=Jctv3QzcMvVPXJsWA3w3LDUlzmyUDGEWG9sLiJz1xaw,4107
@@ -660,12 +661,12 @@ omlish/specs/jmespath/parser.py,sha256=uNk9_xQ9cZJC1h5naoH1HMbCs4B0WhV2jN5AvhdKT
 omlish/specs/jmespath/scope.py,sha256=gsVjmAVF0b7s2SevWb0rBbURayiMSIuXfzO4v1ONIrY,1595
 omlish/specs/jmespath/visitor.py,sha256=6OCi7oa4IsGW5fCqAeFuXYEwn-aLKuMrNMFtQKSpJWo,16951
 omlish/specs/jsonrpc/__init__.py,sha256=u2kcJeo6YWEvFYf7OqDNKThszGLSmXYFNJpqXmXgm1M,504
-omlish/specs/jsonrpc/_marshal.py,sha256=LJ6V6O7iFIfQx5-DeP7GN23Ao_amThECnntqlBv8c2Y,1857
+omlish/specs/jsonrpc/_marshal.py,sha256=I4mw9uGwrlNe5xXoJixpefPuP-fh2QiDZsTBI4gAQZI,1856
 omlish/specs/jsonrpc/conns.py,sha256=zvWnBHuSoGnvbGVk72Usp4IFsLscrzPozqR2hmFjnDI,7029
 omlish/specs/jsonrpc/errors.py,sha256=WxEU7k1TqeZAo_H6eU0LcrXSd-Gi_3fTvtxjXZ9qKww,712
 omlish/specs/jsonrpc/types.py,sha256=Se9ecG-_k-kY_Qlt9QD2t3y26oY4sXTcskp6XZfVans,3054
 omlish/specs/jsonschema/__init__.py,sha256=12JNHdvV-LN0d0Ir80Ch8msVb4JqGSjB0wLSwW1oN2U,1187
-omlish/specs/jsonschema/_marshal.py,sha256=-pmBtNnKC0sxGg3TMVWngTbSSAwG1zQyt0D6aZutd84,873
+omlish/specs/jsonschema/_marshal.py,sha256=LTIMWdBkBQ_1gdVwTszfPu9wIrPYbdG2MGts1bbLFqM,872
 omlish/specs/jsonschema/types.py,sha256=_H7ma99hD3_Xu42BFGHOXRI5p79tY8WBX8QE36k7lbw,472
 omlish/specs/jsonschema/keywords/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/specs/jsonschema/keywords/base.py,sha256=_O_VZySO5j5vnEiQWojk3zwaj7OQowT0e6bk3UYDTeM,3011
@@ -690,7 +691,7 @@ omlish/specs/jsonschema/schemas/draft202012/vocabularies/meta-data.json,sha256=j
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/unevaluated.json,sha256=Lb-8tzmUtnCwl2SSre4f_7RsIWgnhNL1pMpWH54tDLQ,506
 omlish/specs/jsonschema/schemas/draft202012/vocabularies/validation.json,sha256=cBCjHlQfMtK-ch4t40jfdcmzaHaj7TBId_wKvaHTelg,2834
 omlish/specs/openapi/__init__.py,sha256=KS7OHPBlXwBeTvmsUQy0VMzKYdz2RyH3qLF3bU0NXUw,147
-omlish/specs/openapi/_marshal.py,sha256=6CB2LCwFfU5rstqkgN_j4Z5rbnba2glzOxcSd01uffI,4451
+omlish/specs/openapi/_marshal.py,sha256=PYx4Jj8bxnimUwuFi6Y5-Nj1HternkSSx-Rovn-Wp2k,4450
 omlish/specs/openapi/openapi.py,sha256=6KGY_d8HOyG7ssHIWM40MCXgIMzNLiLKHYNggTSpAYM,12027
 omlish/sql/__init__.py,sha256=JjgIiP2YfiHHIANP7qgkJUG0IMIRzzvKntyhdDKeNdY,384
 omlish/sql/abc.py,sha256=3hrCjB4jnPVMef_YXClCblzYUZ9l9yaxJJdd5_Nu9GM,4043
@@ -718,7 +719,7 @@ omlish/sql/api/queries.py,sha256=OVsVqNyXXJQVDPfV3GFE2gwnHyGEenS65rTQRTNGx1Y,735
 omlish/sql/api/resources.py,sha256=RcjnsNoyFWG0VR8YDijwuyZtnxlGQe8jiPQVl_inzIc,2266
 omlish/sql/api/rows.py,sha256=Jo3AA_6Wt7tlwLO6-rp0arzYFqZXSxPudGPkW2xCYgQ,1346
 omlish/sql/queries/__init__.py,sha256=qoikGQZuwDkOBwGKdUVov_Ur3I-mezSDLLdzqwRw6l8,1567
-omlish/sql/queries/_marshal.py,sha256=PwfcCmf-qeKsiL61c_GjUID6flLCiDiltFndPBhQIAM,2992
+omlish/sql/queries/_marshal.py,sha256=dQZsDLVYipKlAZ4TvWtDgeIo4tBKDisZdN2n3C4lnnc,3004
 omlish/sql/queries/base.py,sha256=nsavenCsZgzpITSI1zGEAi95K3cRDfAxRgNJKJmYul0,3502
 omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,2253
 omlish/sql/queries/exprs.py,sha256=dG9L218QtJM1HtDYIMWqHimK03N6AL1WONk3FvVRcXY,1480
@@ -736,7 +737,7 @@ omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,4
 omlish/sql/queries/unary.py,sha256=MEYBDZn_H0bexmUrJeONOv5-gIpYowUaXOsEHeQM4ks,1144
 omlish/sql/queries/unions.py,sha256=w9lKrQ38nMme_gyDPciZNqyCBhwFkLusc9fjmBDu48U,438
 omlish/sql/tabledefs/__init__.py,sha256=eFaO_QQaEv4Z9CLxFSzZgmXqxPI7xKTpDI6outo1VPk,150
-omlish/sql/tabledefs/_marshal.py,sha256=5Z7K433SzfN7-z8Yd7FJRzOV9tJv-ErRMA6inZ2iBCE,475
+omlish/sql/tabledefs/_marshal.py,sha256=1yV2xDNX9iDY1y8QYj1CBDHwlqO6v4xEwDeSGyluMKc,474
 omlish/sql/tabledefs/dtypes.py,sha256=X0N6Y1c2bQ4HC0WA-Yv_jZPvGlSqO7hMIV-towDw3MU,367
 omlish/sql/tabledefs/elements.py,sha256=lP_Ch19hKmiGYPQVeC8HpFaKdTYnXi2FfpfwKMxZOck,1674
 omlish/sql/tabledefs/lower.py,sha256=i4_QkVlVH5U99O6pqokrB661AudNVJ9Q-OwtkKOBleU,1410
@@ -818,13 +819,13 @@ omlish/typedvalues/collection.py,sha256=CK4Vk9kJqAt2V8o6I4zGyv2u9DKov12uSvsGdqEd
 omlish/typedvalues/consumer.py,sha256=lDOE-O_sgGbOvbcBg2g5ZRaV2WixnuEYxFsJBaj18oU,4690
 omlish/typedvalues/generic.py,sha256=ft-x4X3k1oFirtYnDfsvrI3ZQikWM8lGLrvrOEbcGq0,742
 omlish/typedvalues/holder.py,sha256=vu-umn-h1nvUqmtV5T9ZfQ_OoOYsERu8PhI2N48Ryns,1133
-omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0,4956
+omlish/typedvalues/marshal.py,sha256=TWwqiGROaQwcxglGiBt_t5D9AvlWsy3ELm7do-nPeao,4968
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev450.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev450.dist-info/METADATA,sha256=DwUHc-Z09a7IkYIMSrhnyjgwyNUGM9xvFiLSCEQsIXs,19003
-omlish-0.0.0.dev450.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev450.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev450.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev450.dist-info/RECORD,,
+omlish-0.0.0.dev452.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev452.dist-info/METADATA,sha256=6HeJlCFmWua6YWGrp4v6KNC037N-n4-CEcHqBzCBUqc,19003
+omlish-0.0.0.dev452.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev452.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev452.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev452.dist-info/RECORD,,