omlish 0.0.0.dev51__py3-none-any.whl → 0.0.0.dev53__py3-none-any.whl

omlish/.manifests.json

@@ -42,7 +42,10 @@
     "line": 1,
     "value": {
       "$omdev.cli.types.CliModule": {
-        "cmd_name": "jp",
+        "cmd_name": [
+          "jmespath",
+          "jp"
+        ],
         "mod_name": "omlish.specs.jmespath.__main__"
       }
     }

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev51'
-__revision__ = 'a9d714d2c1bc65f8d907b3e3bc7ad7d71f942d29'
+__version__ = '0.0.0.dev53'
+__revision__ = 'b933fe4d493e86c4f8b6531c82d6510916625619'
 
 
 #
@@ -28,6 +28,8 @@ class Project(ProjectBase):
     name = 'omlish'
     description = 'omlish'
 
+    #
+
     optional_dependencies = {
         'async': [
             'anyio ~= 4.6',
@@ -61,7 +63,7 @@ class Project(ProjectBase):
 
             'json5 ~= 0.9',
 
-            'pyyaml ~= 5.0',
+            'pyyaml ~= 6.0',
 
             'cbor2 ~= 5.6',
 
@@ -109,6 +111,32 @@ class Project(ProjectBase):
         ],
     }
 
+    #
+
+    _plus_dependencies = [
+        'anyio',
+        'sniffio',
+
+        'asttokens',
+        'executing',
+
+        'orjson',
+        'pyyaml',
+
+        'wrapt',
+    ]
+
+    _dependency_specs_by_name = (lambda od: {  # noqa
+        s.split()[0]: s
+        for l in od.values() for s in l
+    })(optional_dependencies)
+
+    optional_dependencies['plus'] = (lambda ds, pd: [  # noqa
+        ds[n] for n in pd
+    ])(_dependency_specs_by_name, _plus_dependencies)
+
+    #
+
     entry_points = {
         'omlish.manifests': {name: name},
     }
@@ -134,6 +162,7 @@ class SetuptoolsBase:
             '*.c',
             '*.cc',
             '*.cu',
+            '*.g4',
             '*.h',
 
             '.manifests.json',

omlish/bootstrap/sys.py

@@ -29,7 +29,7 @@ else:
     libc = lang.proxy_import('..libc', __package__)
     logs = lang.proxy_import('..logs', __package__)
     osu = lang.proxy_import('..os', __package__)
-    dotenv = lang.proxy_import('.formats.dotenv', __package__)
+    dotenv = lang.proxy_import('..formats.dotenv', __package__)
 
 
 ##

omlish/dataclasses/__init__.py

@@ -89,15 +89,19 @@ from .impl.reflect import (  # noqa
 )
 
 from .utils import (  # noqa
-    chain_metadata,
-    deep_replace,
-    field_modifier,
-    fields_dict,
     maybe_post_init,
+
     opt_repr,
+    truthy_repr,
+
+    fields_dict,
+    field_modifier,
+    chain_metadata,
     update_class_metadata,
-    update_field_extras,
     update_field_metadata,
+    update_field_extras,
     update_fields,
     update_fields_metadata,
+
+    deep_replace,
 )

omlish/dataclasses/impl/api.py

@@ -33,7 +33,7 @@ def field(  # noqa
         derive: ta.Callable[..., ta.Any] | None = None,
         coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None,
         validate: ta.Callable[[ta.Any], bool] | None = None,
-        check_type: bool | type | None = None,
+        check_type: bool | type | tuple[type | None, ...] | None = None,
         override: bool = False,
         repr_fn: ta.Callable[[ta.Any], str | None] | None = None,
         frozen: bool | None = None,

omlish/dataclasses/impl/fields.py

@@ -193,7 +193,10 @@ def field_init(
 
     if fx.check_type:
         cn = f'__dataclass_check_type__{f.name}__'
-        if isinstance(fx.check_type, type):
+        ct: ta.Any
+        if isinstance(fx.check_type, tuple):
+            ct = tuple(type(None) if e is None else check_.isinstance(e, type) for e in fx.check_type)
+        elif isinstance(fx.check_type, (type, tuple)):
             ct = fx.check_type
         # FIXME:
         # elif info.params_extras.generic_init:

omlish/dataclasses/impl/params.py

@@ -45,7 +45,7 @@ class FieldExtras(lang.Final):
     derive: ta.Callable[..., ta.Any] | None = None  # TODO
     coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None
     validate: ta.Callable[[ta.Any], bool] | None = None
-    check_type: bool | type | None = None
+    check_type: bool | type | tuple[type | None, ...] | None = None
     override: bool = False
     repr_fn: ta.Callable[[ta.Any], str | None] | None = None
     frozen: bool | None = None  # TODO

omlish/dataclasses/utils.py

@@ -33,6 +33,10 @@ def opt_repr(o: ta.Any) -> str | None:
     return repr(o) if o is not None else None
 
 
+def truthy_repr(o: ta.Any) -> str | None:
+    return repr(o) if o else None
+
+
 #
 
 

omlish/marshal/__init__.py

@@ -24,7 +24,8 @@ from .base import (  # noqa
     RecursiveMarshalerFactory,
     RecursiveUnmarshalerFactory,
 
-    SetType,
+    Override,
+    ReflectOverride,
 )
 
 from .exceptions import (  # noqa
@@ -44,6 +45,8 @@ from .naming import (  # noqa
 )
 
 from .global_ import (  # noqa
+    GLOBAL_REGISTRY,
+
     marshal,
     unmarshal,
 )
@@ -56,10 +59,12 @@ from .helpers import (  # noqa
 
 from .objects import (  # noqa
     FieldInfo,
+    FieldInfos,
     FieldMetadata,
     FieldOptions,
     ObjectMarshaler,
     ObjectMetadata,
+    ObjectSpecials,
     ObjectUnmarshaler,
     SimpleObjectMarshalerFactory,
     SimpleObjectUnmarshalerFactory,

omlish/marshal/base.py

@@ -81,11 +81,11 @@ https://github.com/yukinarit/pyserde
  - Flatten
 """
 import abc
-import dataclasses as dc
 import typing as ta
 
 from .. import check
 from .. import collections as col
+from .. import dataclasses as dc
 from .. import lang
 from .. import matchfns as mfs
 from .. import reflect as rfl
@@ -163,13 +163,18 @@ class BaseContext(lang.Abstract):
     registry: Registry
     options: col.TypeMap[Option] = col.TypeMap()
 
+    def _reflect(self, o: ta.Any) -> rfl.Type:
+        if (ovr := self.registry.get_of(o, ReflectOverride)):
+            return ovr[-1].rty
+        return rfl.type_(o)
+
 
 @dc.dataclass(frozen=True)
 class MarshalContext(BaseContext, lang.Final):
     factory: MarshalerFactory | None = None
 
     def make(self, o: ta.Any) -> Marshaler:
-        rty = rfl.type_(o)
+        rty = self._reflect(o)
         try:
             return check.not_none(self.factory)(self, rty)  # type: ignore
         except mfs.MatchGuardError:
@@ -181,7 +186,7 @@ class UnmarshalContext(BaseContext, lang.Final):
     factory: UnmarshalerFactory | None = None
 
     def make(self, o: ta.Any) -> Unmarshaler:
-        rty = rfl.type_(o)
+        rty = self._reflect(o)
         try:
             return check.not_none(self.factory)(self, rty)  # type: ignore
         except mfs.MatchGuardError:
@@ -214,10 +219,15 @@ class RecursiveUnmarshalerFactory(RecursiveTypeFactory[UnmarshalContext, Unmarsh
 ##
 
 
-@dc.dataclass(frozen=True)
-class SetType(RegistryItem, lang.Final):
-    marshaler: Marshaler | None = None
+@dc.dataclass(frozen=True, kw_only=True)
+class Override(RegistryItem, lang.Final):
+    marshaler: Marshaler | None = dc.xfield(None, check_type=(Marshaler, None))
     marshaler_factory: MarshalerFactory | None = None
 
-    unmarshaler: Unmarshaler | None = None
+    unmarshaler: Unmarshaler | None = dc.xfield(None, check_type=(Unmarshaler, None))
     unmarshaler_factory: UnmarshalerFactory | None = None
+
+
+@dc.dataclass(frozen=True)
+class ReflectOverride(RegistryItem, lang.Final):
+    rty: rfl.Type

omlish/marshal/dataclasses.py

@@ -1,8 +1,13 @@
+"""
+TODO:
+ - tangled with objects - Field/ObjectMetadata defined over there but unused
+"""
 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 .base import MarshalContext
 from .base import Marshaler
@@ -16,6 +21,7 @@ from .naming import translate_name
 from .objects import DEFAULT_FIELD_OPTIONS
 from .objects import FIELD_OPTIONS_KWARGS
 from .objects import FieldInfo
+from .objects import FieldInfos
 from .objects import FieldMetadata
 from .objects import FieldOptions
 from .objects import ObjectMarshaler
@@ -37,7 +43,7 @@ def get_dataclass_metadata(ty: type) -> ObjectMetadata:
 def get_field_infos(
         ty: type,
         opts: col.TypeMap[Option] = col.TypeMap(),
-) -> ta.Sequence[FieldInfo]:
+) -> FieldInfos:
     dc_md = get_dataclass_metadata(ty)
     dc_naming = dc_md.field_naming or opts.get(Naming)
 
@@ -96,6 +102,15 @@ def get_field_infos(
                 unmarshal_names=[n + '_' for n in fi_kw['unmarshal_names']],
             )
 
+        if fo_kw.get('no_marshal'):
+            fi_kw.update(
+                marshal_name=None,
+            )
+        if fo_kw.get('no_unmarshal'):
+            fi_kw.update(
+                unmarshal_names=(),
+            )
+
         ret.append(
             FieldInfo(
                 options=FieldOptions(**fo_kw),
@@ -103,7 +118,7 @@ def get_field_infos(
             ),
         )
 
-    return ret
+    return FieldInfos(ret)
 
 
 def _make_field_obj(ctx, ty, obj, fac):
@@ -119,22 +134,25 @@ def _make_field_obj(ctx, ty, obj, fac):
 
 class DataclassMarshalerFactory(MarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, type) and dc.is_dataclass(rty)
+        return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
         ty = check.isinstance(rty, type)
         check.state(dc.is_dataclass(ty))
+        check.state(not lang.is_abstract_class(ty))
 
         dc_md = get_dataclass_metadata(ty)
+        fis = get_field_infos(ty, ctx.options)
 
         fields = [
             (fi, _make_field_obj(ctx, fi.type, fi.metadata.marshaler, fi.metadata.marshaler_factory))
-            for fi in get_field_infos(ty, ctx.options)
+            for fi in fis
+            if fi.name not in dc_md.specials.set
         ]
 
         return ObjectMarshaler(
             fields,
-            unknown_field=dc_md.unknown_field,
+            specials=dc_md.specials,
         )
 
 
@@ -143,12 +161,15 @@ class DataclassMarshalerFactory(MarshalerFactory):
 
 class DataclassUnmarshalerFactory(UnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, type) and dc.is_dataclass(rty)
+        return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
         ty = check.isinstance(rty, type)
         check.state(dc.is_dataclass(ty))
+        check.state(not lang.is_abstract_class(ty))
+
         dc_md = get_dataclass_metadata(ty)
+        fis = get_field_infos(ty, ctx.options)
 
         d: dict[str, tuple[FieldInfo, Unmarshaler]] = {}
         defaults: dict[str, ta.Any] = {}
@@ -161,7 +182,9 @@ class DataclassUnmarshalerFactory(UnmarshalerFactory):
             if fi.options.embed:
                 e_ty = check.isinstance(fi.type, type)
                 check.state(dc.is_dataclass(e_ty))
-                # e_dc_md = get_dataclass_metadata(e_ty)
+                e_dc_md = get_dataclass_metadata(e_ty)
+                if e_dc_md.specials.set:
+                    raise Exception(f'Embedded fields cannot have specials: {e_ty}')
 
                 embeds[fi.name] = e_ty
                 for e_fi in get_field_infos(e_ty, ctx.options):
@@ -185,14 +208,17 @@ class DataclassUnmarshalerFactory(UnmarshalerFactory):
 
             return ret
 
-        for fi in get_field_infos(ty, ctx.options):
+        for fi in fis:
+            if fi.name in dc_md.specials.set:
+                continue
             add_field(fi)
 
         return ObjectUnmarshaler(
             ty,
             d,
-            unknown_field=dc_md.unknown_field,
+            specials=dc_md.specials,
             defaults=defaults,
             embeds=embeds,
             embeds_by_unmarshal_name=embeds_by_unmarshal_name,
+            ignore_unknown=dc_md.ignore_unknown,
         )

omlish/marshal/global_.py

@@ -17,7 +17,7 @@ T = ta.TypeVar('T')
 ##
 
 
-GLOBAL_REGISTRY = Registry()
+GLOBAL_REGISTRY: Registry = Registry()
 
 
 ##

omlish/marshal/objects.py

@@ -8,7 +8,9 @@ TODO:
 import collections.abc
 import typing as ta
 
+from .. import cached
 from .. import check
+from .. import collections as col
 from .. import dataclasses as dc
 from .. import lang
 from .. import reflect as rfl
@@ -33,6 +35,9 @@ class FieldOptions:
 
     embed: bool = False
 
+    no_marshal: bool = False
+    no_unmarshal: bool = False
+
 
 DEFAULT_FIELD_OPTIONS = FieldOptions()
 FIELD_OPTIONS_KWARGS: frozenset[str] = frozenset(dc.fields_dict(FieldOptions).keys())
@@ -45,10 +50,10 @@ class FieldMetadata:
 
     options: FieldOptions = DEFAULT_FIELD_OPTIONS
 
-    marshaler: Marshaler | None = None
+    marshaler: Marshaler | None = dc.xfield(None, check_type=(Marshaler, None))
     marshaler_factory: MarshalerFactory | None = None
 
-    unmarshaler: Unmarshaler | None = None
+    unmarshaler: Unmarshaler | None = dc.xfield(None, check_type=(Unmarshaler, None))
     unmarshaler_factory: UnmarshalerFactory | None = None
 
     def update(self, **kwargs: ta.Any) -> 'FieldMetadata':
@@ -66,9 +71,29 @@ class ObjectMetadata:
     field_naming: Naming | None = None
 
     unknown_field: str | None = None
+    source_field: str | None = None
+
+    @cached.property
+    def specials(self) -> 'ObjectSpecials':
+        return ObjectSpecials(
+            unknown=self.unknown_field,
+            source=self.source_field,
+        )
 
     field_defaults: FieldMetadata = FieldMetadata()
 
+    ignore_unknown: bool = False
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ObjectSpecials:
+    unknown: str | None = None
+    source: str | None = None
+
+    @cached.property
+    def set(self) -> frozenset[str]:
+        return frozenset(k for k, v in dc.asdict(self).items() if v is not None)
+
 
 ##
 
@@ -78,7 +103,7 @@ class FieldInfo:
     name: str
     type: ta.Any
 
-    marshal_name: str
+    marshal_name: str | None
     unmarshal_names: ta.Sequence[str]
 
     metadata: FieldMetadata = FieldMetadata()
@@ -86,6 +111,32 @@ class FieldInfo:
     options: FieldOptions = FieldOptions()
 
 
+@dc.dataclass(frozen=True)
+class FieldInfos:
+    lst: ta.Sequence[FieldInfo]
+
+    def __iter__(self) -> ta.Iterator[FieldInfo]:
+        return iter(self.lst)
+
+    def __len__(self) -> int:
+        return len(self.lst)
+
+    @cached.property
+    @dc.init
+    def by_name(self) -> ta.Mapping[str, FieldInfo]:
+        return col.make_map(((fi.name, fi) for fi in self), strict=True)
+
+    @cached.property
+    @dc.init
+    def by_marshal_name(self) -> ta.Mapping[str, FieldInfo]:
+        return col.make_map(((fi.marshal_name, fi) for fi in self if fi.marshal_name is not None), strict=True)
+
+    @cached.property
+    @dc.init
+    def by_unmarshal_name(self) -> ta.Mapping[str, FieldInfo]:
+        return col.make_map(((n, fi) for fi in self for n in fi.unmarshal_names), strict=True)
+
+
 ##
 
 
@@ -95,7 +146,7 @@ class ObjectMarshaler(Marshaler):
 
     _: dc.KW_ONLY
 
-    unknown_field: str | None = None
+    specials: ObjectSpecials = ObjectSpecials()
 
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
         ret: dict[str, ta.Any] = {}
@@ -105,17 +156,24 @@ class ObjectMarshaler(Marshaler):
             if fi.options.omit_if is not None and fi.options.omit_if(v):
                 continue
 
+            if fi.name in self.specials.set:
+                continue
+
+            mn = fi.marshal_name
+            if mn is None:
+                continue
+
             mv = m.marshal(ctx, v)
 
             if fi.options.embed:
                 for ek, ev in check.isinstance(mv, collections.abc.Mapping).items():
-                    ret[fi.marshal_name + check.non_empty_str(ek)] = ev  # type: ignore
+                    ret[mn + check.non_empty_str(ek)] = ev  # type: ignore
 
             else:
-                ret[fi.marshal_name] = mv
+                ret[mn] = mv
 
-        if self.unknown_field is not None:
-            if (ukf := getattr(o, self.unknown_field)):
+        if self.specials.unknown is not None:
+            if (ukf := getattr(o, self.specials.unknown)):
                 if (dks := set(ret) & set(ukf)):
                     raise KeyError(f'Unknown field keys duplicate fields: {dks!r}')
 
@@ -130,7 +188,7 @@ class SimpleObjectMarshalerFactory(MarshalerFactory):
 
     _: dc.KW_ONLY
 
-    unknown_field: str | None = None
+    specials: ObjectSpecials = ObjectSpecials()
 
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and rty in self.dct
@@ -138,7 +196,7 @@ class SimpleObjectMarshalerFactory(MarshalerFactory):
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
         ty = check.isinstance(rty, type)
 
-        flds = self.dct[ty]
+        flds = FieldInfos(self.dct[ty])
 
         fields = [
             (fi, ctx.make(fi.type))
@@ -147,7 +205,7 @@ class SimpleObjectMarshalerFactory(MarshalerFactory):
 
         return ObjectMarshaler(
             fields,
-            unknown_field=self.unknown_field,
+            specials=self.specials,
         )
 
 
@@ -161,13 +219,15 @@ class ObjectUnmarshaler(Unmarshaler):
 
     _: dc.KW_ONLY
 
-    unknown_field: str | None = None
+    specials: ObjectSpecials = ObjectSpecials()
 
     defaults: ta.Mapping[str, ta.Any] | None = None
 
     embeds: ta.Mapping[str, type] | None = None
     embeds_by_unmarshal_name: ta.Mapping[str, tuple[str, str]] | None = None
 
+    ignore_unknown: bool = False
+
     def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
         ma = check.isinstance(v, collections.abc.Mapping)
 
@@ -177,8 +237,11 @@ class ObjectUnmarshaler(Unmarshaler):
 
         ekws: dict[str, dict[str, ta.Any]] = {en: {} for en in self.embeds or ()}
 
-        if self.unknown_field is not None:
-            kw[self.unknown_field] = ukf = {}
+        if self.specials.source is not None:
+            kw[self.specials.source] = v
+
+        if self.specials.unknown is not None:
+            kw[self.specials.unknown] = ukf = {}
 
         for k, mv in ma.items():
             ks = check.isinstance(k, str)
@@ -190,6 +253,10 @@ class ObjectUnmarshaler(Unmarshaler):
                 if ukf is not None:
                     ukf[ks] = mv  # FIXME: unmarshal?
                     continue
+
+                if self.ignore_unknown:
+                    continue
+
                 raise
 
             if self.embeds_by_unmarshal_name and (en := self.embeds_by_unmarshal_name.get(ks)):
@@ -220,7 +287,7 @@ class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
 
     _: dc.KW_ONLY
 
-    unknown_field: str | None = None
+    specials: ObjectSpecials = ObjectSpecials()
 
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and rty in self.dct
@@ -228,7 +295,7 @@ class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
         ty = check.isinstance(rty, type)
 
-        flds = self.dct[ty]
+        flds = FieldInfos(self.dct[ty])
 
         fields_by_unmarshal_name = {
             n: (fi, ctx.make(fi.type))
@@ -245,6 +312,6 @@ class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
         return ObjectUnmarshaler(
             ty,
             fields_by_unmarshal_name,
-            unknown_field=self.unknown_field,
+            specials=self.specials,
             defaults=defaults,
         )

omlish/marshal/registries.py

@@ -1,10 +1,13 @@
+"""
+TODO:
+ - inheritance
+"""
 import dataclasses as dc
 import threading
 import typing as ta
 
-from .. import check
+from .. import collections as col
 from .. import lang
-from .. import reflect as rfl
 
 
 class RegistryItem(lang.Abstract):
@@ -15,8 +18,8 @@ RegistryItemT = ta.TypeVar('RegistryItemT', bound=RegistryItem)
 
 
 @dc.dataclass(frozen=True)
-class _TypeRegistry:
-    rty: rfl.Type
+class _KeyRegistryItems:
+    key: ta.Any
     items: list[RegistryItem] = dc.field(default_factory=list)
     item_lists_by_ty: dict[type[RegistryItem], list[RegistryItem]] = dc.field(default_factory=dict)
 
@@ -30,28 +33,54 @@ class Registry:
     def __init__(self) -> None:
         super().__init__()
         self._mtx = threading.Lock()
-        self._dct: dict[rfl.Type, _TypeRegistry] = {}
-        self._ps: ta.Sequence[Registry] = []
+        self._idct: ta.MutableMapping[ta.Any, _KeyRegistryItems] = col.IdentityKeyDict()
+        self._dct: dict[ta.Any, _KeyRegistryItems] = {}
 
-    def register(self, rty: rfl.Type, *items: RegistryItem) -> 'Registry':
-        check.isinstance(rty, rfl.TYPES)
+    def register(
+            self,
+            key: ta.Any,
+            *items: RegistryItem,
+            identity: bool = False,
+    ) -> 'Registry':
         with self._mtx:
-            if (sr := self._dct.get(rty)) is None:
-                sr = self._dct[rty] = _TypeRegistry(rty)
+            dct: ta.Any = self._idct if identity else self._dct
+            if (sr := dct.get(key)) is None:
+                sr = dct[key] = _KeyRegistryItems(key)
             sr.add(*items)
         return self
 
-    def get(self, rty: rfl.Type) -> ta.Sequence[RegistryItem]:
-        check.isinstance(rty, rfl.TYPES)
+    def get(
+            self,
+            key: ta.Any,
+            *,
+            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._idct if identity else self._dct
         try:
-            return self._dct[rty].items
+            return dct[key].items
         except KeyError:
             return ()
 
-    def get_of(self, rty: rfl.Type, item_ty: type[RegistryItemT]) -> ta.Sequence[RegistryItemT]:
-        check.isinstance(rty, rfl.TYPES)
+    def get_of(
+            self,
+            key: ta.Any,
+            item_ty: type[RegistryItemT],
+            *,
+            identity: bool | None = None,
+    ) -> ta.Sequence[RegistryItemT]:
+        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._idct if identity else self._dct
         try:
-            sr = self._dct[rty]
+            sr = dct[key]
         except KeyError:
             return ()
-        return sr.item_lists_by_ty.get(item_ty, ())  # type: ignore
+        return sr.item_lists_by_ty.get(item_ty, ())

omlish/secrets/__init__.py

@@ -7,6 +7,7 @@ from .secrets import (  # noqa
     FnSecrets,
     LoggingSecrets,
     MappingSecrets,
+    Secret,
     SecretRef,
     SecretRefOrStr,
     Secrets,

omlish/secrets/secrets.py

@@ -99,6 +99,12 @@ class Secrets(lang.Abstract):
         else:
             return Secret(key=key, value=raw)
 
+    def try_get(self, key: str) -> Secret | None:
+        try:
+            return self.get(key)
+        except KeyError:
+            return None
+
     @abc.abstractmethod
     def _get_raw(self, key: str) -> str:
         raise NotImplementedError
@@ -119,15 +125,36 @@ EMPTY_SECRETS = EmptySecrets()
 
 
 class MappingSecrets(Secrets):
-    def __init__(self, dct: ta.Mapping[str, str]) -> None:
+    def __init__(
+            self,
+            dct: ta.Mapping[str, str | Secret],
+            no_copy: bool = False,
+    ) -> None:
         super().__init__()
+
+        if not no_copy:
+            dct = {
+                k: v if isinstance(v, Secret) else Secret(key=k, value=v)
+                for k, v in dct.items()
+            }
+
         self._dct = dct
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}({{{", ".join(map(repr, self._dct.keys()))}}})'
 
     def _get_raw(self, key: str) -> str:
-        return self._dct[key]
+        try:
+            e = self._dct[key]
+        except KeyError:  # noqa
+            raise
+        else:
+            if isinstance(e, Secret):
+                return e.reveal()
+            elif isinstance(e, str):
+                return e
+            else:
+                raise TypeError(e)
 
 
 ##
@@ -167,7 +194,7 @@ class CachingSecrets(Secrets):
     ) -> None:
         super().__init__()
         self._child = child
-        self._dct: dict[str, str] = {}
+        self._dct: dict[str, Secret] = {}
         self._ttl_s = ttl_s
         self._clock = clock
         self._deque: collections.deque[tuple[str, float]] = collections.deque()
@@ -187,15 +214,17 @@ class CachingSecrets(Secrets):
     def _get_raw(self, key: str) -> str:
         self.evict()
         try:
-            return self._dct[key]
+            e = self._dct[key]
         except KeyError:
             pass
-        out = self._child._get_raw(key)  # noqa
+        else:
+            return e.reveal()
+        out = self._child.get(key)  # noqa
         self._dct[key] = out
         if self._ttl_s is not None:
             dl = self._clock() + self._ttl_s
             self._deque.append((key, dl))
-        return out
+        return out.reveal()
 
 
 ##

omlish/specs/jmespath/__main__.py

@@ -1,6 +1,6 @@
 # @omlish-manifest
 _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'jp',
+    'cmd_name': ['jmespath', 'jp'],
     'mod_name': __name__,
 }}
 

omlish/testing/pytest/inject/harness.py

@@ -172,21 +172,17 @@ def register(*args: inj.Element | inj.Elements) -> None:
     _HARNESS_ELEMENTS_LIST.append(inj.as_elements(*args))
 
 
-TypeT = ta.TypeVar('TypeT', bound=type)
-
-
 def bind(
         scope: PytestScope | str = PytestScope.SESSION,
         *,
         eager: bool = False,  # FIXME
-) -> ta.Callable[[TypeT], TypeT]:
-    def inner(cls):
+) -> ta.Callable[[T], T]:
+    def inner(obj):
         pts = scope if isinstance(scope, PytestScope) else PytestScope[check.isinstance(scope, str).upper()]
-        check.isinstance(cls, type)
         register(inj.as_elements(
-            inj.bind(cls, in_=_SCOPES_BY_PYTEST_SCOPE[pts]),
+            inj.bind(obj, in_=_SCOPES_BY_PYTEST_SCOPE[pts]),
         ))
-        return cls
+        return obj
     return inner
 
 

{omlish-0.0.0.dev51.dist-info → omlish-0.0.0.dev53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev51
+Version: 0.0.0.dev53
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -26,7 +26,7 @@ Requires-Dist: psutil ~=6.0 ; extra == 'all'
 Requires-Dist: orjson ~=3.10 ; extra == 'all'
 Requires-Dist: ujson ~=5.10 ; extra == 'all'
 Requires-Dist: json5 ~=0.9 ; extra == 'all'
-Requires-Dist: pyyaml ~=5.0 ; extra == 'all'
+Requires-Dist: pyyaml ~=6.0 ; extra == 'all'
 Requires-Dist: cbor2 ~=5.6 ; extra == 'all'
 Requires-Dist: cloudpickle ~=3.0 ; extra == 'all'
 Requires-Dist: httpx[http2] ~=0.27 ; extra == 'all'
@@ -61,13 +61,21 @@ Provides-Extra: formats
 Requires-Dist: orjson ~=3.10 ; extra == 'formats'
 Requires-Dist: ujson ~=5.10 ; extra == 'formats'
 Requires-Dist: json5 ~=0.9 ; extra == 'formats'
-Requires-Dist: pyyaml ~=5.0 ; extra == 'formats'
+Requires-Dist: pyyaml ~=6.0 ; extra == 'formats'
 Requires-Dist: cbor2 ~=5.6 ; extra == 'formats'
 Requires-Dist: cloudpickle ~=3.0 ; extra == 'formats'
 Provides-Extra: http
 Requires-Dist: httpx[http2] ~=0.27 ; extra == 'http'
 Provides-Extra: misc
 Requires-Dist: wrapt ~=1.14 ; extra == 'misc'
+Provides-Extra: plus
+Requires-Dist: anyio ~=4.6 ; extra == 'plus'
+Requires-Dist: sniffio ~=1.3 ; extra == 'plus'
+Requires-Dist: asttokens ~=2.4 ; extra == 'plus'
+Requires-Dist: executing ~=2.1 ; extra == 'plus'
+Requires-Dist: orjson ~=3.10 ; extra == 'plus'
+Requires-Dist: pyyaml ~=6.0 ; extra == 'plus'
+Requires-Dist: wrapt ~=1.14 ; extra == 'plus'
 Provides-Extra: secrets
 Requires-Dist: cryptography ~=43.0 ; extra == 'secrets'
 Provides-Extra: sqlalchemy

{omlish-0.0.0.dev51.dist-info → omlish-0.0.0.dev53.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omlish/.manifests.json,sha256=sAddTbCUKdX0UYA4PeZ_z9JKF0vyzEpFYWq1tAAl9bw,1091
-omlish/__about__.py,sha256=jc5K7hc6tkDx6B2eK-ieJvhYrFDbPJ4znzwOrHgZmW0,2919
+omlish/.manifests.json,sha256=Xj-NnBpowZX7faAyhZ2j7g4fPFFw9Da7ITTC8AojNlM,1135
+omlish/__about__.py,sha256=4iuzysEDi0v06iklWiEVu40-L9v4vnDdEPsxeJVo3eU,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -34,7 +34,7 @@ omlish/bootstrap/diag.py,sha256=x_BKS_uhfW8QFk1NeH_VIocHif-A6FVTZ37262qCgZ0,5052
 omlish/bootstrap/harness.py,sha256=vDnpM0ZLSJaylxQNA4u2lwQwiU-KXZDb7MlkrhchFJY,2022
 omlish/bootstrap/main.py,sha256=u-TfxO4GkAK3LbRweQERogtO4kT0z3gqXRjnXvtJzC8,5328
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
-omlish/bootstrap/sys.py,sha256=U0MFxO9tLFV3cdN5Y-Zrink6_45sFvzPUYQXyBk7-ns,8741
+omlish/bootstrap/sys.py,sha256=i6veZeE83wO0HTl9b6ykj_pEN05fqu0enoAv4sw5Ayc,8742
 omlish/collections/__init__.py,sha256=tGUzvS_ZjiqALsLRy7JX3h4KZRQX2CmtdAfTRD7UwMk,1677
 omlish/collections/_abc.py,sha256=sP7BpTVhx6s6C59mTFeosBi4rHOWC6tbFBYbxdZmvh0,2365
 omlish/collections/_io_abc.py,sha256=Cxs8KB1B_69rxpUYxI-MTsilAmNooJJn3w07DKqYKkE,1255
@@ -64,16 +64,16 @@ omlish/configs/__init__.py,sha256=3uh09ezodTwkMI0nRmAMP0eEuJ_0VdF-LYyNmPjHiCE,77
 omlish/configs/classes.py,sha256=GLbB8xKjHjjoUQRCUQm3nEjM8z1qNTx9gPV7ODSt5dg,1317
 omlish/configs/flattening.py,sha256=AOlRpBHm449MxwMp3CiIRGunStOC1DUNs1f3CLou0wc,4731
 omlish/configs/strings.py,sha256=0brx1duL85r1GpfbNvbHcSvH4jWzutwuvMFXda9NeI0,2651
-omlish/dataclasses/__init__.py,sha256=LALx4dXSvBWAKzmZxb3rkNdoR7kOaXeGcVypTnECvcw,1354
-omlish/dataclasses/utils.py,sha256=Ewd6w31uXy1sVUj59sxmXfGuI0CgsAbcfNXx0tsrNco,3347
+omlish/dataclasses/__init__.py,sha256=k358fyF6LWsiWfd7u1d4CHDn2F4wQZCb5hXtSSc1Hck,1374
+omlish/dataclasses/utils.py,sha256=MzEeF8W6Yr5BjOVJOM0Au4YIMGAarXWxT0C6gzlhmfU,3425
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
 omlish/dataclasses/impl/__init__.py,sha256=0hgOm3_u3yimjEkB-9fRMqX9rAW6kQC5t8XL0lpvffQ,410
-omlish/dataclasses/impl/api.py,sha256=6QtUAbP3DQZw8WEkgpsYfYKTn4CQBV9v0z2B4fTcR80,6405
+omlish/dataclasses/impl/api.py,sha256=p7W519_EnDAWlkOVS-4BpP4SxadWIiUzC3RldSoB28o,6431
 omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX0,2598
 omlish/dataclasses/impl/copy.py,sha256=Tn8_n6Vohs-w4otbGdubBEvhd3TsSTaM3EfNGdS2LYo,591
 omlish/dataclasses/impl/descriptors.py,sha256=rEYE1Len99agTQCC25hSPMnM19BgPr0ZChABGi58Fdk,2476
 omlish/dataclasses/impl/exceptions.py,sha256=DeiM6rcjgncudn-XVuph9TDbVDEwBtyYb1bcbO3FFcA,193
-omlish/dataclasses/impl/fields.py,sha256=NIu30OggZvKhqQaZWad9dAE-B9yt9qvWtPR5U_TJIbQ,6281
+omlish/dataclasses/impl/fields.py,sha256=iXA8j3q8GFQoj-6MgAKVLGG9GSSNOLGgyVtogCQ5q1E,6459
 omlish/dataclasses/impl/frozen.py,sha256=x87DSM8FIMZ3c_BIUE8NooCkExFjPsabeqIueEP5qKs,2988
 omlish/dataclasses/impl/hashing.py,sha256=FKnHuXCg9ylrzK2TLGqO5yfRN4HX3F415CSLlVYXtYE,3190
 omlish/dataclasses/impl/init.py,sha256=IgxO9nwHaHF8jGrUAk-Y5xke9uV2OwzfEe-88McE1Wg,6161
@@ -82,7 +82,7 @@ omlish/dataclasses/impl/main.py,sha256=Ti0PKbFKraKvfmoPuR-G7nLVNzRC8mvEuXhCuC-M2
 omlish/dataclasses/impl/metaclass.py,sha256=dlQEIN9MHBirll7Nx3StpzxYxXjrqxJ-QsorMcCNt7w,2828
 omlish/dataclasses/impl/metadata.py,sha256=4veWwTr-aA0KP-Y1cPEeOcXHup9EKJTYNJ0ozIxtzD4,1401
 omlish/dataclasses/impl/order.py,sha256=zWvWDkSTym8cc7vO1cLHqcBhhjOlucHOCUVJcdh4jt0,1369
-omlish/dataclasses/impl/params.py,sha256=IDM9VK-b5x7VauwYwXtwb9cg94UNpRUoZ0OH-Bv_kmM,2674
+omlish/dataclasses/impl/params.py,sha256=-RDsDDHmTjXY-7bSJzKlRJJdyf1pNUfqwcswS4ZZhH0,2700
 omlish/dataclasses/impl/processing.py,sha256=DFxyFjL_h3awRyF_5eyTnB8QkuApx7Zc4QFnVoltlao,459
 omlish/dataclasses/impl/reflect.py,sha256=a19BbNxrmjNTbXzWuAl_794RCIQSMYyVqQ2Bf-DnNnM,5305
 omlish/dataclasses/impl/replace.py,sha256=wS9GHX4fIwaPv1JBJzIewdBfXyK3X3V7_t55Da87dYo,1217
@@ -219,28 +219,28 @@ omlish/logs/formatters.py,sha256=q79nMnR2mRIStPyGrydQHpYTXgC5HHptt8lH3W2Wwbs,671
 omlish/logs/handlers.py,sha256=nyuFgmO05By_Xwq7es58ClzS51-F53lJL7gD0x5IqAg,228
 omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
-omlish/marshal/__init__.py,sha256=_vx3txFh09j3SoxSfSS4AwwnDa9jgAWzXYjluIitGWA,1969
+omlish/marshal/__init__.py,sha256=Aiux91y66MpEy4NiecWgASK8RB8vGXpc4GZ4HgbdwCg,2049
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
-omlish/marshal/base.py,sha256=ceNjOFxCwLNuxkmxofk3Sh5rE39JGxnc4giN7NNr9kA,6121
+omlish/marshal/base.py,sha256=I7IOzFGn_DFeBRFCH8F0ONBa-NzM4mmMDld6bmoW-rc,6501
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
-omlish/marshal/dataclasses.py,sha256=B21hFukA9pNhp-PzBWG7rxz_F5BjNzMxU3nFURRrGXo,6037
+omlish/marshal/dataclasses.py,sha256=G6Uh8t4vvNBAx2BhzH8ksj8Hq_bo6npFphQhyF298VU,6892
 omlish/marshal/datetimes.py,sha256=0ffg8cEvx9SMKIXZGD9b7MqpLfmgw0uKKdn6YTfoqok,3714
 omlish/marshal/enums.py,sha256=-0fKutBbyz8ygEaA0_P_8IOJrI9jMGigmnPbutV9Bg4,1464
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=UV2Svjok-lTWsRqKGh-CeuAhvlohw9uJe7ZLyoKMvTM,2968
 omlish/marshal/forbidden.py,sha256=BNshzm4lN5O8sUZ1YvxrSYq3WPklq9NMQCRZ7RC3DLM,865
-omlish/marshal/global_.py,sha256=8XCjPcIjA65StESshzNfQiSyuckVaEiiWROmC3qk0mo,1117
+omlish/marshal/global_.py,sha256=K76wB1-pdg4VWgiqR7wyxRNYr-voJApexYW2nV-R4DM,1127
 omlish/marshal/helpers.py,sha256=-SOgYJmrURILHpPK6Wu3cCvhj8RJrqfJxuKhh9UMs7o,1102
 omlish/marshal/iterables.py,sha256=6I_ZdJemLSQtJ4J5NrB9wi-eyxiJZS61HzHXp1yeiX8,2592
 omlish/marshal/mappings.py,sha256=zhLtyot7tzQtBNj7C4RBxjMELxA5r2q2Mth8Br7xkFs,2803
 omlish/marshal/maybes.py,sha256=mgK3QsWHkXgRqo076KxYKH6elRxzJ_QDTodv93mgHR0,2198
 omlish/marshal/naming.py,sha256=lIklR_Od4x1ghltAgOzqcKhHs-leeSv2YmFhCHO7GIs,613
 omlish/marshal/numbers.py,sha256=oY_yMNJEnJhjfLh89gpPXvKqeUyhQcaTcQB6ecyHiG8,1704
-omlish/marshal/objects.py,sha256=fe4dPEF6BqZRWHSn3D7Z5JyLg-Z7JFPhBe2gjUGBefw,6543
+omlish/marshal/objects.py,sha256=72xf6v-QBGtkSyoAoGYReqyp2uWnPNhZiBDnzzruEKI,8437
 omlish/marshal/optionals.py,sha256=r0XB5rqfasvgZJNrKYd6Unq2U4nHt3JURi26j0dYHlw,1499
 omlish/marshal/polymorphism.py,sha256=doA8aLUhna6aco5b2Ok3jsem1V4NsF3rM5RTfJt0a7U,5708
 omlish/marshal/primitives.py,sha256=wcvcs5GH_TWVmzAszh3dvyKibJgBxnXke-AlAXiwrrI,1107
-omlish/marshal/registries.py,sha256=GI2KogcxawMkk02Ky7-TsnijChoe1I7YTOPIbUNwSAI,1665
+omlish/marshal/registries.py,sha256=FvC6qXHCizNB2QmU_N3orxW7iqfGYkiUXYYdTRWS6HA,2353
 omlish/marshal/standard.py,sha256=uQZIGiCwihmhB1tmhpKnZWZly0DDkdGjCnN0d41WHho,2985
 omlish/marshal/unions.py,sha256=ZWl0maHwh1V_cSnNmuCbbCQZzqlNtOModsTwnVTXNPA,2735
 omlish/marshal/utils.py,sha256=puKJpwPpuDlMOIrKMcLTRLJyMiL6n_Xs-p59AuDEymA,543
@@ -255,17 +255,17 @@ omlish/reflect/isinstance.py,sha256=x5T9S2634leinBT4hl3CZZkRttvdvvlxChkC_x9Qu2s,
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=JM2RGv2-Rcex8wCqhmgvRG59zD242P9jM3O2QLjKWWo,3586
 omlish/reflect/types.py,sha256=Zkcp8nx_vFNH7pBZ5pU5P0wIgQCauj5Nic3BZb5cRik,7030
-omlish/secrets/__init__.py,sha256=VKB2IF9vz4h4RXcZxgXj36KXOLcGBzfqVnxPgPDWpmg,408
+omlish/secrets/__init__.py,sha256=SGB1KrlNrxlNpazEHYy95NTzteLi8ndoEgMhU7luBl8,420
 omlish/secrets/crypto.py,sha256=6CsLy0UEqCrBK8Xx_3-iFF6SKtu2GlEqUQ8-MliY3tk,3709
 omlish/secrets/marshal.py,sha256=U9uSRTWzZmumfNZeh_dROwVdGrARsp155TylRbjilP8,2048
 omlish/secrets/openssl.py,sha256=wxA_wIlxtuOUy71ABxAJgavh-UI_taOfm-A0dVlmSwM,6219
 omlish/secrets/passwords.py,sha256=3r-vEK6Gp6aq4L5Csnd06QnrjO9xfzHJP-g_7I9W_ao,4101
-omlish/secrets/secrets.py,sha256=ClD7t_mkmWkseVk4ahLzYLuLXeTxiwwPiidYm42vLh4,6871
+omlish/secrets/secrets.py,sha256=XkzCrGNRLXUBXbw6_2pFGV2fuphbcgehtpp8zsjHaWM,7580
 omlish/secrets/subprocesses.py,sha256=EcnKlHHtnUMHGrBWXDfu8tv28wlgZx4P4GOiuPW9Vo8,1105
 omlish/specs/__init__.py,sha256=Xl4fT1o1MlcEIAjMt5EifgMuO4UBSa9Suj5NE9eMX1A,87
 omlish/specs/jmespath/LICENSE,sha256=IH-ZZlZkS8XMkf_ubNVD1aYHQ2l_wd0tmHtXrCcYpRU,1113
 omlish/specs/jmespath/__init__.py,sha256=Lz8JO0vP-pwrBtq9Y94y6LrOA7o1u1kCdPmMf_4lJBY,1918
-omlish/specs/jmespath/__main__.py,sha256=pZ4PnDWEtvTSpVOsNswkE9esg6Wu1i1b3P2aLvwBnKc,186
+omlish/specs/jmespath/__main__.py,sha256=wIXm6bs08etNG_GZlN2rBkADPb0rKfL2HSkm8spnpxw,200
 omlish/specs/jmespath/ast.py,sha256=TP3oSAD5CU7oAawRVEY6UZLSD6CQOci8LQKWhiTtBM4,2744
 omlish/specs/jmespath/cli.py,sha256=3qHhwVC80qT7Z9JVC0nNL5YvfTxkjirnH5LAoBfVwcM,1748
 omlish/specs/jmespath/exceptions.py,sha256=8txtnzFYqoL_2YfMnlAFAcrJrZFehLeUsukYSq_6i1w,4373
@@ -320,7 +320,7 @@ omlish/testing/pytest/helpers.py,sha256=TJpD60mBtLi9FtxX4TThfuXvg5FIRPSiZk1aeRwe
 omlish/testing/pytest/marks.py,sha256=ExuwitbMr1txMbaAcWZ652pYa30M-i3wVacnjqschTs,424
 omlish/testing/pytest/skip.py,sha256=uACMFtQQNJfFDbWrppjWevdrQgKVH1MUmH5rXIpv0IE,846
 omlish/testing/pytest/inject/__init__.py,sha256=pdRKv1HcDmJ_yArKJbYITPXXZthRSGgBJWqITr0Er38,117
-omlish/testing/pytest/inject/harness.py,sha256=sMKjP2EWHq-eeTB1YVXcANli2Czxt56_9ERg4HtkVPg,5810
+omlish/testing/pytest/inject/harness.py,sha256=v4DaKJ0KL8oQjzIMK43Gh8GHP4hiI6-lY37O9lyOHRk,5724
 omlish/testing/pytest/plugins/__init__.py,sha256=ys1zXrYrNm7Uo6YOIVJ6Bd3dQo6kv387k7MbTYlqZSI,467
 omlish/testing/pytest/plugins/_registry.py,sha256=IK04KlBgiOJxKAyCCgjpX2R-9tE-btalYJkgjLc8Te8,77
 omlish/testing/pytest/plugins/asyncs.py,sha256=SV6oKCy50CGkzLGYX-CT4MfWNqsrH8ONEbIWC3tFcHA,5324
@@ -339,9 +339,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev51.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev51.dist-info/METADATA,sha256=dX7TOPWFihpNQKvxpeumwoK_bZt8O4IVpS0__xA04u0,3817
-omlish-0.0.0.dev51.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev51.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev51.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev51.dist-info/RECORD,,
+omlish-0.0.0.dev53.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev53.dist-info/METADATA,sha256=diMO9VXqesB02C0XD2G1yLkFn0RX0ZfoZJslGDExPyo,4167
+omlish-0.0.0.dev53.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev53.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev53.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev53.dist-info/RECORD,,