omlish 0.0.0.dev52__tar.gz → 0.0.0.dev54__tar.gz

{omlish-0.0.0.dev52/omlish.egg-info → omlish-0.0.0.dev54}/PKG-INFO

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

{omlish-0.0.0.dev52 → omlish-0.0.0.dev54}/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-0.0.0.dev52 → omlish-0.0.0.dev54}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev52'
-__revision__ = '5ab36e956ad89c19e714eca498e51f63ada8ab92'
+__version__ = '0.0.0.dev54'
+__revision__ = '94a10a970e6b9aaa28240ec088676f4e3c81b274'
 
 
 #

{omlish-0.0.0.dev52 → omlish-0.0.0.dev54}/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-0.0.0.dev52 → omlish-0.0.0.dev54}/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-0.0.0.dev52 → omlish-0.0.0.dev54}/omlish/marshal/__init__.py

@@ -59,10 +59,12 @@ from .helpers import (  # noqa
 
 from .objects import (  # noqa
     FieldInfo,
+    FieldInfos,
     FieldMetadata,
     FieldOptions,
     ObjectMarshaler,
     ObjectMetadata,
+    ObjectSpecials,
     ObjectUnmarshaler,
     SimpleObjectMarshalerFactory,
     SimpleObjectUnmarshalerFactory,

{omlish-0.0.0.dev52 → omlish-0.0.0.dev54}/omlish/marshal/dataclasses.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - tangled with objects - Field/ObjectMetadata defined over there but unused
+"""
 import typing as ta
 
 from .. import check
@@ -17,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
@@ -38,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)
 
@@ -97,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),
@@ -104,7 +118,7 @@ def get_field_infos(
             ),
         )
 
-    return ret
+    return FieldInfos(ret)
 
 
 def _make_field_obj(ctx, ty, obj, fac):
@@ -128,15 +142,17 @@ class DataclassMarshalerFactory(MarshalerFactory):
         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,
         )
 
 
@@ -151,7 +167,9 @@ class DataclassUnmarshalerFactory(UnmarshalerFactory):
         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] = {}
@@ -164,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):
@@ -188,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-0.0.0.dev52 → omlish-0.0.0.dev54}/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())
@@ -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-0.0.0.dev52 → omlish-0.0.0.dev54}/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-0.0.0.dev52 → omlish-0.0.0.dev54/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev52 → omlish-0.0.0.dev54}/pyproject.toml

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