omdev 0.0.7__tar.gz → 0.0.9__tar.gz

{omdev-0.0.7/omdev.egg-info → omdev-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.7
+Version: 0.0.9
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.7
+Requires-Dist: omlish==0.0.9
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.7 → omdev-0.0.9}/omdev/packaging/marshal.py

@@ -9,6 +9,7 @@ from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
+from .requires import ParsedRequirement
 from .requires import RequiresMarkerItem
 from .requires import RequiresMarkerList
 from .requires import RequiresNode
@@ -74,8 +75,20 @@ def _install_standard_marshaling() -> None:
         RequiresMarkerListMarshalerFactory(),
     )
 
-    msh.register_global_config(
+    msh.update_global_config(
         RequiresMarkerList,
         msh.ReflectOverride(MarshalRequiresMarkerList),
         identity=True,
     )
+
+    msh.update_global_config(
+        ParsedRequirement,
+        msh.ObjectOptions(
+            fields=dict(
+                marker=msh.FieldOptions(
+                    marshal_as=RequiresMarkerList | None,
+                    unmarshal_as=RequiresMarkerList | None,
+                ),
+            ),
+        ),
+    )

{omdev-0.0.7 → omdev-0.0.9}/omdev/packaging/requires.py

@@ -29,6 +29,7 @@ import re
 import typing as ta
 
 from omlish.lite.check import check
+from omlish.lite.dataclasses import install_dataclass_cache_hash
 
 from .specifiers import Specifier
 
@@ -241,7 +242,9 @@ class RequiresMarkerItem(ta.NamedTuple):
     r: ta.Union[RequiresVariable, RequiresValue]
 
 
-class ParsedRequirement(ta.NamedTuple):
+@install_dataclass_cache_hash()
+@dc.dataclass(frozen=True)
+class ParsedRequirement:
     name: str
     url: str
     extras: ta.List[str]

{omdev-0.0.7 → omdev-0.0.9}/omdev/scripts/ci.py

@@ -107,7 +107,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
             dict(path='../../omlish/lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
-            dict(path='../../omlish/lite/contextmanagers.py', sha1='7f319f3fbc1251b6eb37b98084dc2ed0e602051f'),
+            dict(path='../../omlish/lite/contextmanagers.py', sha1='b3275ca829d21eb598092c1448bedd70b72dfd04'),
             dict(path='../../omlish/lite/dataclasses.py', sha1='42ff344c22262193795c54929bfb90d0a3507bab'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
@@ -154,7 +154,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/tars.py', sha1='3ed00e97a494bd92c6a6149d22d51469bc0af384'),
             dict(path='../../omlish/asyncs/asyncio/sockets.py', sha1='8d24dae988a30bb73f167a9ab62d4fc9eef4ad06'),
             dict(path='../../omlish/asyncs/asyncio/timeouts.py', sha1='4d31b02b3c39b8f2fa7e94db36552fde6942e36a'),
-            dict(path='../../omlish/formats/yaml/goyaml/tokens.py', sha1='05183c2980204609c9787a24c55e5ed806886962'),
+            dict(path='../../omlish/formats/yaml/goyaml/tokens.py', sha1='e9744c171d982ea8b4a6ace5f937926d51d5ec30'),
             dict(path='../../omlish/http/pipelines/bodymodes.py', sha1='d419b4bce96abbea7ee739412ece462ccbc77aa8'),
             dict(path='../../omlish/http/pipelines/objects.py', sha1='3de6f87e2a56375cc8a539321b1205e2d1d3900e'),
             dict(path='../../omlish/http/simple/handlers.py', sha1='9e49c2ba5518616ce15bed6bac80ab4c88ed3b83'),
@@ -208,7 +208,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../dataserver/http.py', sha1='41a6e39c6d66807b6189e2d78d8cf2ff10e45bc3'),
             dict(path='../oci/dataserver.py', sha1='dd147b56282b054cef264556a0ff3b3d1719bcee'),
             dict(path='../../omlish/asyncs/asyncio/subprocesses.py', sha1='b6b5f9ae3fd0b9c83593bad2e04a08f726e5904d'),
-            dict(path='../../omlish/formats/yaml/goyaml/decoding.py', sha1='7b0282593ca9fec2d70964ddd3ec6214e29bd864'),
+            dict(path='../../omlish/formats/yaml/goyaml/decoding.py', sha1='5047d6c283348c2cd4265c955bb94651e971addd'),
             dict(path='../../omlish/http/pipelines/aggregators.py', sha1='e6a35442108553f39bf5d5d61b55fcdaa3f347b5'),
             dict(path='../../omlish/io/pipelines/bytes/decoders.py', sha1='e49b17ece8aa2e006a6d92158628e2dc671e21f1'),
             dict(path='../../omlish/logs/modules.py', sha1='dd7d5f8e63fe8829dfb49460f3929ab64b68ee14'),
@@ -2063,6 +2063,7 @@ class ExitStacked:
     def _exit_contexts(self) -> None:
         pass
 
+    @ta.final
     def _enter_context(self, cm: ta.ContextManager[T]) -> T:
         if (es := self._exit_stack) is None:
             raise RuntimeError
@@ -2122,11 +2123,13 @@ class AsyncExitStacked:
     async def _async_exit_contexts(self) -> None:
         pass
 
+    @ta.final
     def _enter_context(self, cm: ta.ContextManager[T]) -> T:
         if (es := self._exit_stack) is None:
             raise RuntimeError
         return es.enter_context(cm)
 
+    @ta.final
     async def _enter_async_context(self, cm: ta.AsyncContextManager[T]) -> T:
         if (es := self._exit_stack) is None:
             raise RuntimeError
@@ -12238,7 +12241,7 @@ def _yaml_is_need_quoted(value: str) -> bool:
     if value == '-':
         return True
 
-    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`'):
+    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`', ':'):
         return True
 
     if value[-1] in (':', ' '):
@@ -28457,6 +28460,9 @@ class YamlDecoder:
                 self.anchor_node_map[anchor_name] = n.value
                 return self.get_map_node(check.not_none(n.value), is_merge)
 
+            elif isinstance(n, TagYamlNode):
+                return self.get_map_node(check.not_none(n.value), is_merge)
+
             elif isinstance(n, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(n.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
@@ -28490,19 +28496,17 @@ class YamlDecoder:
                 return None
 
             if isinstance(anchor := node, AnchorYamlNode):
-                if isinstance(array_node := anchor.value, ArrayYamlNode):
-                    return array_node
-
-                return UnexpectedNodeTypeYamlError(check.not_none(anchor.value).type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa
+                return self.get_array_node(check.not_none(anchor.value))
 
             if isinstance(alias := node, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(alias.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
                 if node2 is None:
                     return yaml_error(f'cannot find anchor by alias name {alias_name}')
-                if isinstance(array_node := node2, ArrayYamlNode):
-                    return array_node
-                return UnexpectedNodeTypeYamlError(node2.type(), YamlNodeType.SEQUENCE, check.not_none(node2.get_token()))  # noqa
+                return self.get_array_node(node2)
+
+            if isinstance(tag := node, TagYamlNode):
+                return self.get_array_node(check.not_none(tag.value))
 
             if not isinstance(array_node := node, ArrayYamlNode):
                 return UnexpectedNodeTypeYamlError(node.type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa

{omdev-0.0.7 → omdev-0.0.9}/omdev/scripts/lib/formats/goyaml.py

@@ -38,11 +38,11 @@ def __omlish_amalg__():  # noqa
             dict(path='../../../lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='../../../lite/dataclasses.py', sha1='42ff344c22262193795c54929bfb90d0a3507bab'),
             dict(path='errors.py', sha1='c4dda09d78bc14d9824e45e3d5d434185ee5598b'),
-            dict(path='tokens.py', sha1='05183c2980204609c9787a24c55e5ed806886962'),
+            dict(path='tokens.py', sha1='e9744c171d982ea8b4a6ace5f937926d51d5ec30'),
             dict(path='ast.py', sha1='6d21da91079afcd58467a58153951a6b97a97c20'),
             dict(path='scanning.py', sha1='9c7bb51121f85ac499f8f907fbc3ce20a07f3e1d'),
             dict(path='parsing.py', sha1='78c28c2b865c57077b071543361920db142242d0'),
-            dict(path='decoding.py', sha1='7b0282593ca9fec2d70964ddd3ec6214e29bd864'),
+            dict(path='decoding.py', sha1='5047d6c283348c2cd4265c955bb94651e971addd'),
             dict(path='_amalg.py', sha1='85989224f581528c4a189dca142cb3ec086ecd3c'),
         ],
     )
@@ -1654,7 +1654,7 @@ def _yaml_is_need_quoted(value: str) -> bool:
     if value == '-':
         return True
 
-    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`'):
+    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`', ':'):
         return True
 
     if value[-1] in (':', ' '):
@@ -9363,6 +9363,9 @@ class YamlDecoder:
                 self.anchor_node_map[anchor_name] = n.value
                 return self.get_map_node(check.not_none(n.value), is_merge)
 
+            elif isinstance(n, TagYamlNode):
+                return self.get_map_node(check.not_none(n.value), is_merge)
+
             elif isinstance(n, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(n.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
@@ -9396,19 +9399,17 @@ class YamlDecoder:
                 return None
 
             if isinstance(anchor := node, AnchorYamlNode):
-                if isinstance(array_node := anchor.value, ArrayYamlNode):
-                    return array_node
-
-                return UnexpectedNodeTypeYamlError(check.not_none(anchor.value).type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa
+                return self.get_array_node(check.not_none(anchor.value))
 
             if isinstance(alias := node, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(alias.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
                 if node2 is None:
                     return yaml_error(f'cannot find anchor by alias name {alias_name}')
-                if isinstance(array_node := node2, ArrayYamlNode):
-                    return array_node
-                return UnexpectedNodeTypeYamlError(node2.type(), YamlNodeType.SEQUENCE, check.not_none(node2.get_token()))  # noqa
+                return self.get_array_node(node2)
+
+            if isinstance(tag := node, TagYamlNode):
+                return self.get_array_node(check.not_none(tag.value))
 
             if not isinstance(array_node := node, ArrayYamlNode):
                 return UnexpectedNodeTypeYamlError(node.type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa

{omdev-0.0.7 → omdev-0.0.9}/omdev/scripts/pyproject.py

@@ -97,6 +97,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
             dict(path='../../omlish/lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
+            dict(path='../../omlish/lite/dataclasses.py', sha1='42ff344c22262193795c54929bfb90d0a3507bab'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -120,7 +121,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/logs/protocols.py', sha1='05ca4d1d7feb50c4e3b9f22ee371aa7bf4b3dbd1'),
             dict(path='../../omlish/logs/std/json.py', sha1='2a75553131e4d5331bb0cedde42aa183f403fc3b'),
             dict(path='../interp/types.py', sha1='c53a8d45d29f2010244760adeb8dcd02a4a240e1'),
-            dict(path='../packaging/requires.py', sha1='5818353abd45135e0e638e28fa6247b24122231b'),
+            dict(path='../packaging/requires.py', sha1='0c34cc4044c4da386622bcd83b9c770e894266dd'),
             dict(path='../../omlish/asyncs/asyncio/timeouts.py', sha1='4d31b02b3c39b8f2fa7e94db36552fde6942e36a'),
             dict(path='../../omlish/lite/inject.py', sha1='8cfee01601e9b8d7a4689cb5ba38de8c2bdb4706'),
             dict(path='../../omlish/logs/contexts.py', sha1='2f5881193a0c19c89c399ab0e0b5072c4048a60c'),
@@ -3030,6 +3031,267 @@ class Checks:
 check = Checks()
 
 
+########################################
+# ../../../omlish/lite/dataclasses.py
+
+
+##
+
+
+def dataclass_shallow_astuple(o: ta.Any) -> ta.Tuple[ta.Any, ...]:
+    return tuple(getattr(o, f.name) for f in dc.fields(o))
+
+
+def dataclass_shallow_asdict(o: ta.Any) -> ta.Dict[str, ta.Any]:
+    return {f.name: getattr(o, f.name) for f in dc.fields(o)}
+
+
+##
+
+
+def is_immediate_dataclass(cls: type) -> bool:
+    if not isinstance(cls, type):
+        raise TypeError(cls)
+    return dc._FIELDS in cls.__dict__  # type: ignore[attr-defined]  # noqa
+
+
+##
+
+
+def _install_dataclass_fn(cls: type, fn: ta.Any, fn_name: ta.Optional[str] = None) -> None:
+    if fn_name is None:
+        fn_name = fn.__name__
+    setattr(cls, fn_name, fn)
+    fn.__qualname__ = f'{cls.__qualname__}.{fn_name}'
+
+
+##
+
+
+def install_dataclass_cache_hash(
+        *,
+        cached_hash_attr: str = '__dataclass_hash__',
+):
+    def inner(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
+            raise TypeError(cls)
+
+        if (
+                cls.__hash__ is object.__hash__ or
+                '__hash__' not in cls.__dict__
+        ):
+            raise TypeError(cls)
+
+        real_hash = cls.__hash__
+
+        def cached_hash(self) -> int:
+            try:
+                return object.__getattribute__(self, cached_hash_attr)
+            except AttributeError:
+                object.__setattr__(self, cached_hash_attr, h := real_hash(self))
+            return h
+
+        _install_dataclass_fn(cls, cached_hash, '__hash__')
+
+        return cls
+
+    return inner
+
+
+##
+
+
+def dataclass_maybe_post_init(sup: ta.Any) -> bool:
+    if not isinstance(sup, super):
+        raise TypeError(sup)
+    try:
+        fn = sup.__post_init__  # type: ignore
+    except AttributeError:
+        return False
+    fn()
+    return True
+
+
+##
+
+
+def dataclass_filtered_repr(
+        obj: ta.Any,
+        fn: ta.Union[ta.Callable[[ta.Any, dc.Field, ta.Any], bool], ta.Literal['omit_none', 'omit_falsey']],
+) -> str:
+    if fn == 'omit_none':
+        fn = lambda o, f, v: v is not None  # noqa
+    elif fn == 'omit_falsey':
+        fn = lambda o, f, v: bool(v)
+
+    return (
+        f'{obj.__class__.__qualname__}(' +
+        ', '.join([
+            f'{f.name}={v!r}'
+            for f in dc.fields(obj)
+            if fn(obj, f, v := getattr(obj, f.name))
+        ]) +
+        ')'
+    )
+
+
+def dataclass_repr_omit_none(obj: ta.Any) -> str:
+    return dataclass_filtered_repr(obj, 'omit_none')
+
+
+def dataclass_repr_omit_falsey(obj: ta.Any) -> str:
+    return dataclass_filtered_repr(obj, 'omit_falsey')
+
+
+def install_dataclass_filtered_repr(
+        fn: ta.Union[ta.Callable[[ta.Any, dc.Field, ta.Any], bool], ta.Literal['omit_none', 'omit_falsey']],
+):
+    def inner(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
+            raise TypeError(cls)
+
+        def filtered_repr(self) -> str:
+            return dataclass_filtered_repr(self, fn)
+
+        _install_dataclass_fn(cls, filtered_repr, '__repr__')
+
+        return cls
+
+    return inner
+
+
+#
+
+
+def dataclass_terse_repr(obj: ta.Any) -> str:
+    return f'{obj.__class__.__qualname__}({", ".join(repr(getattr(obj, f.name)) for f in dc.fields(obj))})'
+
+
+def install_dataclass_terse_repr():
+    def inner(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
+            raise TypeError(cls)
+
+        def terse_repr(self) -> str:
+            return dataclass_terse_repr(self)
+
+        _install_dataclass_fn(cls, terse_repr, '__repr__')
+
+        return cls
+
+    return inner
+
+
+##
+
+
+def dataclass_descriptor_method(*bind_attrs: str, bind_owner: bool = False) -> ta.Callable:
+    if not bind_attrs:
+        def __get__(self, instance, owner=None):  # noqa
+            return self
+
+    elif bind_owner:
+        def __get__(self, instance, owner=None):  # noqa
+            # Guaranteed to return a new instance even with no attrs
+            return dc.replace(self, **{
+                a: v.__get__(instance, owner) if (v := getattr(self, a)) is not None else None
+                for a in bind_attrs
+            })
+
+    else:
+        def __get__(self, instance, owner=None):  # noqa
+            if instance is None:
+                return self
+
+            # Guaranteed to return a new instance even with no attrs
+            return dc.replace(self, **{
+                a: v.__get__(instance, owner) if (v := getattr(self, a)) is not None else None
+                for a in bind_attrs
+            })
+
+    return __get__
+
+
+##
+
+
+def install_dataclass_kw_only_init():
+    def inner(cls):
+        if not isinstance(cls, type) and dc.is_dataclass(cls):
+            raise TypeError(cls)
+
+        real_init = cls.__init__  # type: ignore[misc]
+
+        flds = dc.fields(cls)  # noqa
+
+        if any(f.name == 'self' for f in flds):
+            self_name = '__dataclass_self__'
+        else:
+            self_name = 'self'
+
+        src = '\n'.join([
+            'def __init__(',
+            f'    {self_name},',
+            '    *,',
+            *[
+                ''.join([
+                    f'    {f.name}: __dataclass_type_{f.name}__',
+                    f' = __dataclass_default_{f.name}__' if f.default is not dc.MISSING else '',
+                    ',',
+                ])
+                for f in flds
+            ],
+            ') -> __dataclass_None__:',
+            '    __dataclass_real_init__(',
+            f'        {self_name},',
+            *[
+                f'        {f.name}={f.name},'
+                for f in flds
+            ],
+            '    )',
+        ])
+
+        ns: dict = {
+            '__dataclass_None__': None,
+            '__dataclass_real_init__': real_init,
+            **{
+                f'__dataclass_type_{f.name}__': f.type
+                for f in flds
+            },
+            **{
+                f'__dataclass_default_{f.name}__': f.default
+                for f in flds
+                if f.default is not dc.MISSING
+            },
+        }
+
+        exec(src, ns)
+
+        kw_only_init = ns['__init__']
+
+        functools.update_wrapper(kw_only_init, real_init)
+
+        _install_dataclass_fn(cls, kw_only_init, '__init__')
+
+        return cls
+
+    return inner
+
+
+##
+
+
+@dc.dataclass()
+class DataclassFieldRequiredError(Exception):
+    name: str
+
+
+def dataclass_field_required(name: str) -> ta.Callable[[], ta.Any]:
+    def inner() -> ta.NoReturn:
+        raise DataclassFieldRequiredError(name)
+    return inner
+
+
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -6941,7 +7203,9 @@ class RequiresMarkerItem(ta.NamedTuple):
     r: ta.Union[RequiresVariable, RequiresValue]
 
 
-class ParsedRequirement(ta.NamedTuple):
+@install_dataclass_cache_hash()
+@dc.dataclass(frozen=True)
+class ParsedRequirement:
     name: str
     url: str
     extras: ta.List[str]

{omdev-0.0.7 → omdev-0.0.9/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.7
+Version: 0.0.9
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.7
+Requires-Dist: omlish==0.0.9
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.7 → omdev-0.0.9}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.7
+omlish==0.0.9
 
 [all]
 black~=26.3

{omdev-0.0.7 → omdev-0.0.9}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.14'
-version = '0.0.7'
+version = '0.0.9'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.7',
+    'omlish == 0.0.9',
 ]
 
 [project.optional-dependencies]