omdev 0.0.29__tar.gz → 0.0.30__tar.gz

{omdev-0.0.29/omdev.egg-info → omdev-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.29
+Version: 0.0.30
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -13,10 +13,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.29
+Requires-Dist: omcore==0.0.30
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.29; extra == "all"
-Requires-Dist: omllm==0.0.29; extra == "all"
+Requires-Dist: ominfra==0.0.30; extra == "all"
+Requires-Dist: omllm==0.0.30; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -35,9 +35,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.29; extra == "ominfra"
+Requires-Dist: ominfra==0.0.30; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.29; extra == "omllm"
+Requires-Dist: omllm==0.0.30; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.29 → omdev-0.0.30}/omdev/dataclasses/_dumping.py

@@ -42,10 +42,10 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/lite/check.py', sha1='62b9ccea94c4f7bcef97e7adae8674b8cb11d4af'),
             dict(path='../../omcore/lite/io.py', sha1='a60d94f0bdbb2b1541d363c301314682d1686240'),
             dict(path='../../omcore/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
-            dict(path='../../omcore/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
-            dict(path='../../omcore/lite/strings.py', sha1='89631bb5cfd6496176db71ab3abd58b89872068b'),
+            dict(path='../../omcore/lite/reflect.py', sha1='fab4ef6f45f278ce7bffcd811cd170b40db107a8'),
+            dict(path='../../omcore/lite/strings.py', sha1='b31b8e4b0e4fec4562ea3fa602e4ef2475e5fe7c'),
             dict(path='../../omcore/lite/json.py', sha1='01124e62093ebd4078602f16df0ec04cb724a612'),
-            dict(path='../../omcore/lite/marshal.py', sha1='94561fd6c1adc06d87a62cc9750290ac263fc824'),
+            dict(path='../../omcore/lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
             dict(path='dumping.py', sha1='f385a4502d279cf76e4a2bd69efac82881117e57'),
         ],
     )
@@ -911,7 +911,8 @@ def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     )
 
 
-is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
+# ta.get_origin returns the collections.abc class, never the typing alias.
+is_callable_alias = functools.partial(is_generic_alias, origin=ta.get_origin(ta.Callable[..., ta.Any]))
 
 
 ##
@@ -1015,10 +1016,10 @@ def is_dunder(name: str) -> bool:
 
 def is_sunder(name: str) -> bool:
     return (
+        len(name) > 2 and
         name[0] == name[-1] == '_' and
         name[1:2] != '_' and
-        name[-2:-1] != '_' and
-        len(name) > 2
+        name[-2:-1] != '_'
     )
 
 
@@ -1032,22 +1033,25 @@ def strip_with_newline(s: str) -> str:
 
 
 @ta.overload
-def split_keep_delimiter(s: str, d: str) -> str: ...
+def split_keep_delimiter(s: str, d: str) -> ta.List[str]: ...
 
 
 @ta.overload
-def split_keep_delimiter(s: bytes, d: bytes) -> bytes: ...
+def split_keep_delimiter(s: bytes, d: bytes) -> ta.List[bytes]: ...
 
 
 def split_keep_delimiter(s, d):
+    if not d:
+        raise ValueError(d)
+    dl = len(d)
     ps = []
     i = 0
     while i < len(s):
         if (n := s.find(d, i)) < i:
             ps.append(s[i:])
             break
-        ps.append(s[i:n + 1])
-        i = n + 1
+        ps.append(s[i:n + dl])
+        i = n + dl
     return ps
 
 
@@ -1312,12 +1316,27 @@ class PrimitiveUnionObjMarshaler(ObjMarshaler):
             raise TypeError(o)
 
     def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if self._x is not None:
+            # The non-primitive member must be tried first - its marshaled form may itself be one of the union's
+            # primitive types (e.g. Union[str, Decimal] wires Decimal as a str), which primitive-first dispatch would
+            # shadow entirely. Such wire values are inherently ambiguous - the non-primitive parse is accepted only
+            # when it faithfully round-trips back to the wire value, so lenient member unmarshalers (e.g. a Sequence
+            # member iterating a str) don't capture values belonging to a primitive member.
+            try:
+                v = self._x.unmarshal(o, ctx)
+            except Exception:  # noqa
+                pass
+            else:
+                if not isinstance(o, self._pt):
+                    return v
+                try:
+                    if self._x.marshal(v, ctx) == o:
+                        return v
+                except Exception:  # noqa
+                    pass
         if isinstance(o, self._pt):
             return o
-        elif self._x is not None:
-            return self._x.unmarshal(o, ctx)
-        else:
-            raise TypeError(o)
+        raise TypeError(o)
 
 
 class LiteralObjMarshaler(ObjMarshaler):
@@ -1704,7 +1723,7 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
         self._registered_obj_marshalers = registered_obj_marshalers
 
         self._lock = threading.RLock()
-        self._marshalers: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+        self._derived_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = {}
         self._proxies: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
 
     #
@@ -1713,6 +1732,20 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
     def _is_abstract(cls, ty: type) -> bool:
         return abc.ABC in ty.__bases__ or Abstract in ty.__bases__
 
+    @classmethod
+    def _get_field_type_hints(cls, ty: type) -> ta.Optional[ta.Mapping[str, ta.Any]]:
+        """
+        Best-effort resolution of string / forward-ref field annotations (`from __future__ import annotations` modules,
+        self-referential fields) against their defining modules' namespaces, mro-aware. Returns None on failure (e.g.
+        TYPE_CHECKING-only names, classes exec'd into namespaces absent from sys.modules) - callers fall back to the
+        raw annotations, preserving behavior for already-evaluated ones.
+        """
+
+        try:
+            return ta.get_type_hints(ty)
+        except Exception:  # noqa
+            return None
+
     #
 
     def make_obj_marshaler(
@@ -1761,29 +1794,38 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
                 return EnumObjMarshaler(ty)
 
             if dc.is_dataclass(ty):
+                hints = self._get_field_type_hints(ty) or {}
                 return FieldsObjMarshaler(
                     ty,
                     [
                         FieldsObjMarshaler.Field(
                             att=f.name,
                             key=check.non_empty_str(fk),
-                            m=rec(f.type),
+                            m=rec(hints.get(f.name, f.type)),
                             omit_if_none=check.isinstance(f.metadata.get(OBJ_MARSHALER_OMIT_IF_NONE, False), bool),
                         )
                         for f in dc.fields(ty)
+                        # init=False fields are excluded from both directions - unmarshal passes every key as a ctor
+                        # kwarg, so marshaling them would produce round-trip-asymmetric output.
+                        if f.init
                         if (fk := f.metadata.get(OBJ_MARSHALER_FIELD_KEY, f.name)) is not None
                     ],
                     non_strict=non_strict_fields,
                 )
 
             if issubclass(ty, tuple) and hasattr(ty, '_fields'):
+                hints = self._get_field_type_hints(ty) or {}
                 return FieldsObjMarshaler(
                     ty,
                     [
                         FieldsObjMarshaler.Field(
                             att=p.name,
                             key=p.name,
-                            m=rec(p.annotation),
+                            # Untyped collections.namedtuple fields have empty annotations - marshal them dynamically.
+                            m=rec(hints.get(
+                                p.name,
+                                p.annotation if p.annotation is not inspect.Parameter.empty else ta.Any,
+                            )),
                         )
                         for p in inspect.signature(ty).parameters.values()
                     ],
@@ -1874,12 +1916,21 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
             **kwargs: ta.Any,
     ) -> ObjMarshaler:
         with self._lock:
+            ck = (ty, tuple(sorted(kwargs.items())))
             if not no_cache:
+                # Explicitly set marshalers (and the defaults) are authoritative regardless of construction kwargs.
                 try:
                     return self._obj_marshalers[ty]
                 except KeyError:
                     pass
 
+                # Derived marshalers are cached under their construction kwargs - a strict marshaler must not be
+                # returned for a non-strict request, nor vice versa.
+                try:
+                    return self._derived_obj_marshalers[ck]
+                except KeyError:
+                    pass
+
             try:
                 return self._proxies[ty]
             except KeyError:
@@ -1900,7 +1951,7 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
             p._m = m  # noqa
 
             if not no_cache:
-                self._obj_marshalers[ty] = m
+                self._derived_obj_marshalers[ck] = m
             return m
 
     def make_context(self, opts: ta.Optional[ObjMarshalOptions]) -> 'ObjMarshalContext':

{omdev-0.0.29 → omdev-0.0.30}/omdev/dataclasses/codegen.py

@@ -245,11 +245,6 @@ class DataclassCodeGen:
             if not _is_generated_py_file(gen_file_path):
                 raise RuntimeError(f'Refusing to overwrite non-generated file: {gen_file_path!r}')
 
-            if not output.dumped:
-                if not self._dry_run:
-                    os.unlink(gen_file_path)
-                return
-
         #
 
         lines = [

{omdev-0.0.29 → omdev-0.0.30}/omdev/dockerdev/config.toml

@@ -27,9 +27,16 @@ rbenv_versions = [
 ]
 
 uv_python_versions = [
+    '3.8',
+    '3.9',
+    '3.10',
+    '3.11',
+    '3.12',
     '3.13',
     '3.14',
     '3.14+freethreaded',
+    '3.15',
+    '3.15+freethreaded',
 ]
 
 pyenv_version_keys = [

{omdev-0.0.29 → omdev-0.0.30}/omdev/dockerdev/gen.py

@@ -49,7 +49,7 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         Env([
             ('LANG', 'en_US.UTF-8'),
             ('LANGUAGE', 'en_US:en'),
-            ('LC_ALL', 'en_US.UTF-8'),
+            ('LC_COLLATE', 'C'),
         ]),
     ]))
 

{omdev-0.0.29 → omdev-0.0.30}/omdev/dockerdev/resources/.python-versions.json

@@ -12,8 +12,8 @@
   "14d": "3.14.6d",
   "14t": "3.14.6t",
   "14dt": "3.14.6dt",
-  "15": "3.15.0b3",
-  "15d": "3.15.0b3d",
-  "15t": "3.15.0b3t",
-  "15dt": "3.15.0b3dt"
+  "15": "3.15.0b4",
+  "15d": "3.15.0b4d",
+  "15t": "3.15.0b4t",
+  "15dt": "3.15.0b4dt"
 }

{omdev-0.0.29 → omdev-0.0.30}/omdev/dockerdev/resources/depsets/python.toml

@@ -3,18 +3,23 @@ deps = [
   'gdb',
   'lcov',
   'libbz2-dev',
+  'libexpat1-dev',
   'libffi-dev',
   'libgdbm-compat-dev',
   'libgdbm-dev',
   'liblzma-dev',
   'libncurses5-dev',
+  'libnsl-dev',
+  'libreadline-dev',
   'libreadline6-dev',
   'libsqlite3-dev',
   'libssl-dev',
+  'libzstd-dev',
   'lzma',
   'lzma-dev',
   'pkg-config',
   'tk-dev',
   'uuid-dev',
+  'xz-utils',
   'zlib1g-dev',
 ]

{omdev-0.0.29 → omdev-0.0.30}/omdev/manifests/_dumping.py

@@ -38,12 +38,12 @@ def __om_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omcore/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omcore/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
+            dict(path='../../omcore/lite/cached.py', sha1='4f5466ce20a485428519e284b2a388a9ef8e4786'),
             dict(path='../../omcore/lite/check.py', sha1='62b9ccea94c4f7bcef97e7adae8674b8cb11d4af'),
             dict(path='../../omcore/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
-            dict(path='../../omcore/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
-            dict(path='../../omcore/lite/strings.py', sha1='89631bb5cfd6496176db71ab3abd58b89872068b'),
-            dict(path='../../omcore/lite/marshal.py', sha1='94561fd6c1adc06d87a62cc9750290ac263fc824'),
+            dict(path='../../omcore/lite/reflect.py', sha1='fab4ef6f45f278ce7bffcd811cd170b40db107a8'),
+            dict(path='../../omcore/lite/strings.py', sha1='b31b8e4b0e4fec4562ea3fa602e4ef2475e5fe7c'),
+            dict(path='../../omcore/lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
             dict(path='dumping.py', sha1='4837c54c1019dcb85fbfaa8086f5efb98025358a'),
         ],
     )
@@ -233,6 +233,8 @@ class _AbstractCachedNullary:
         raise TypeError
 
     def __get__(self, instance, owner=None):  # noqa
+        if instance is None:
+            return self
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
 
@@ -1007,7 +1009,8 @@ def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     )
 
 
-is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
+# ta.get_origin returns the collections.abc class, never the typing alias.
+is_callable_alias = functools.partial(is_generic_alias, origin=ta.get_origin(ta.Callable[..., ta.Any]))
 
 
 ##
@@ -1111,10 +1114,10 @@ def is_dunder(name: str) -> bool:
 
 def is_sunder(name: str) -> bool:
     return (
+        len(name) > 2 and
         name[0] == name[-1] == '_' and
         name[1:2] != '_' and
-        name[-2:-1] != '_' and
-        len(name) > 2
+        name[-2:-1] != '_'
     )
 
 
@@ -1128,22 +1131,25 @@ def strip_with_newline(s: str) -> str:
 
 
 @ta.overload
-def split_keep_delimiter(s: str, d: str) -> str: ...
+def split_keep_delimiter(s: str, d: str) -> ta.List[str]: ...
 
 
 @ta.overload
-def split_keep_delimiter(s: bytes, d: bytes) -> bytes: ...
+def split_keep_delimiter(s: bytes, d: bytes) -> ta.List[bytes]: ...
 
 
 def split_keep_delimiter(s, d):
+    if not d:
+        raise ValueError(d)
+    dl = len(d)
     ps = []
     i = 0
     while i < len(s):
         if (n := s.find(d, i)) < i:
             ps.append(s[i:])
             break
-        ps.append(s[i:n + 1])
-        i = n + 1
+        ps.append(s[i:n + dl])
+        i = n + dl
     return ps
 
 
@@ -1315,12 +1321,27 @@ class PrimitiveUnionObjMarshaler(ObjMarshaler):
             raise TypeError(o)
 
     def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if self._x is not None:
+            # The non-primitive member must be tried first - its marshaled form may itself be one of the union's
+            # primitive types (e.g. Union[str, Decimal] wires Decimal as a str), which primitive-first dispatch would
+            # shadow entirely. Such wire values are inherently ambiguous - the non-primitive parse is accepted only
+            # when it faithfully round-trips back to the wire value, so lenient member unmarshalers (e.g. a Sequence
+            # member iterating a str) don't capture values belonging to a primitive member.
+            try:
+                v = self._x.unmarshal(o, ctx)
+            except Exception:  # noqa
+                pass
+            else:
+                if not isinstance(o, self._pt):
+                    return v
+                try:
+                    if self._x.marshal(v, ctx) == o:
+                        return v
+                except Exception:  # noqa
+                    pass
         if isinstance(o, self._pt):
             return o
-        elif self._x is not None:
-            return self._x.unmarshal(o, ctx)
-        else:
-            raise TypeError(o)
+        raise TypeError(o)
 
 
 class LiteralObjMarshaler(ObjMarshaler):
@@ -1707,7 +1728,7 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
         self._registered_obj_marshalers = registered_obj_marshalers
 
         self._lock = threading.RLock()
-        self._marshalers: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+        self._derived_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = {}
         self._proxies: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
 
     #
@@ -1716,6 +1737,20 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
     def _is_abstract(cls, ty: type) -> bool:
         return abc.ABC in ty.__bases__ or Abstract in ty.__bases__
 
+    @classmethod
+    def _get_field_type_hints(cls, ty: type) -> ta.Optional[ta.Mapping[str, ta.Any]]:
+        """
+        Best-effort resolution of string / forward-ref field annotations (`from __future__ import annotations` modules,
+        self-referential fields) against their defining modules' namespaces, mro-aware. Returns None on failure (e.g.
+        TYPE_CHECKING-only names, classes exec'd into namespaces absent from sys.modules) - callers fall back to the
+        raw annotations, preserving behavior for already-evaluated ones.
+        """
+
+        try:
+            return ta.get_type_hints(ty)
+        except Exception:  # noqa
+            return None
+
     #
 
     def make_obj_marshaler(
@@ -1764,29 +1799,38 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
                 return EnumObjMarshaler(ty)
 
             if dc.is_dataclass(ty):
+                hints = self._get_field_type_hints(ty) or {}
                 return FieldsObjMarshaler(
                     ty,
                     [
                         FieldsObjMarshaler.Field(
                             att=f.name,
                             key=check.non_empty_str(fk),
-                            m=rec(f.type),
+                            m=rec(hints.get(f.name, f.type)),
                             omit_if_none=check.isinstance(f.metadata.get(OBJ_MARSHALER_OMIT_IF_NONE, False), bool),
                         )
                         for f in dc.fields(ty)
+                        # init=False fields are excluded from both directions - unmarshal passes every key as a ctor
+                        # kwarg, so marshaling them would produce round-trip-asymmetric output.
+                        if f.init
                         if (fk := f.metadata.get(OBJ_MARSHALER_FIELD_KEY, f.name)) is not None
                     ],
                     non_strict=non_strict_fields,
                 )
 
             if issubclass(ty, tuple) and hasattr(ty, '_fields'):
+                hints = self._get_field_type_hints(ty) or {}
                 return FieldsObjMarshaler(
                     ty,
                     [
                         FieldsObjMarshaler.Field(
                             att=p.name,
                             key=p.name,
-                            m=rec(p.annotation),
+                            # Untyped collections.namedtuple fields have empty annotations - marshal them dynamically.
+                            m=rec(hints.get(
+                                p.name,
+                                p.annotation if p.annotation is not inspect.Parameter.empty else ta.Any,
+                            )),
                         )
                         for p in inspect.signature(ty).parameters.values()
                     ],
@@ -1877,12 +1921,21 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
             **kwargs: ta.Any,
     ) -> ObjMarshaler:
         with self._lock:
+            ck = (ty, tuple(sorted(kwargs.items())))
             if not no_cache:
+                # Explicitly set marshalers (and the defaults) are authoritative regardless of construction kwargs.
                 try:
                     return self._obj_marshalers[ty]
                 except KeyError:
                     pass
 
+                # Derived marshalers are cached under their construction kwargs - a strict marshaler must not be
+                # returned for a non-strict request, nor vice versa.
+                try:
+                    return self._derived_obj_marshalers[ck]
+                except KeyError:
+                    pass
+
             try:
                 return self._proxies[ty]
             except KeyError:
@@ -1903,7 +1956,7 @@ class ObjMarshalerManagerImpl(ObjMarshalerManager):
             p._m = m  # noqa
 
             if not no_cache:
-                self._obj_marshalers[ty] = m
+                self._derived_obj_marshalers[ck] = m
             return m
 
     def make_context(self, opts: ta.Optional[ObjMarshalOptions]) -> 'ObjMarshalContext':