omlish 0.0.0.dev414__py3-none-any.whl → 0.0.0.dev415__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev414'
-__revision__ = '4d74fcb86928f83d6b52b2e24206bc833ee18f1e'
+__version__ = '0.0.0.dev415'
+__revision__ = '79bb2b1f7af2d9c344f8471cd6e785914768a72f'
 
 
 #
@@ -175,7 +175,6 @@ class SetuptoolsBase:
             '*.g4',
             '*.h',
 
-            '.dataclasses.json',
             '.manifests.json',
 
             'LICENSE',

omlish/codecs/registry.py

@@ -77,7 +77,7 @@ class CodecRegistry:
             codec_or_lazy = self._by_name[name]
 
             if isinstance(codec_or_lazy, LazyLoadedCodec):
-                codec = check.isinstance(codec_or_lazy.load(), Codec)
+                codec = check.isinstance(codec_or_lazy.resolve(), Codec)
                 self._by_name[name] = codec
                 self._post_load(codec)
             else:

omlish/dataclasses/__init__.py

@@ -1,158 +1,180 @@
-##
-# stdlib interface
+# ruff: noqa: I001
+import sys as _sys
 
-from dataclasses import (  # noqa
-    FrozenInstanceError,
+from .. import lang as _lang
 
-    MISSING,
-    KW_ONLY,
 
-    InitVar,
-    Field,
+with _lang.auto_proxy_init(globals()):
+    ##
 
-    field,
+    ##
+    # stdlib interface
 
-    dataclass,
-    make_dataclass,
+    from dataclasses import (  # noqa
+        FrozenInstanceError,
 
-    fields,
+        MISSING,
+        KW_ONLY,
 
-    is_dataclass,
+        InitVar,
+        Field,
 
-    replace,
-)
+        field,
 
-from .impl.api import (  # noqa
-    dataclass as xdataclass,
+        dataclass,
+        make_dataclass,
 
-    make_dataclass as xmake_dataclass,
+        fields,
 
-    field as xfield,
-)
+        is_dataclass,
 
-from .impl.concerns.replace import (  # noqa
-    replace as xreplace,
-)
+        replace,
+    )
 
-from .tools.as_ import (  # noqa
-    asdict,
-    astuple,
-)
+    from .impl.api import (  # noqa
+        dataclass as xdataclass,
 
+        make_dataclass as xmake_dataclass,
 
-##
-# globals hack
+        field as xfield,
+    )
 
-globals()['field'] = xfield
+    from .impl.concerns.replace import (  # noqa
+        replace as xreplace,
+    )
 
-globals()['dataclass'] = xdataclass
-globals()['make_dataclass'] = xmake_dataclass
+    from .tools.as_ import (  # noqa
+        asdict,
+        astuple,
+    )
 
-globals()['replace'] = xreplace
+    ##
+    # additional interface
 
+    from .impl.api import (  # noqa
+        append_class_metadata,
+        extra_class_params,
+        init,
+        metadata,
+        validate,
 
-##
-# additional interface
-
-from .impl.api import (  # noqa
-    append_class_metadata,
-    extra_class_params,
-    init,
-    metadata,
-    validate,
-
-    extra_field_params,
-    set_field_metadata,
-    update_extra_field_params,
-    with_extra_field_params,
-)
+        extra_field_params,
+        set_field_metadata,
+        update_extra_field_params,
+        with_extra_field_params,
+    )
 
-from .errors import (  # noqa
-    FieldFnValidationError,
-    FieldTypeValidationError,
-    FieldValidationError,
-    FnValidationError,
-    TypeValidationError,
-    ValidationError,
-)
+    from .errors import (  # noqa
+        FieldFnValidationError,
+        FieldTypeValidationError,
+        FieldValidationError,
+        FnValidationError,
+        TypeValidationError,
+        ValidationError,
+    )
 
-from .metaclass.bases import (  # noqa
-    Box,
-    Case,
-    Data,
-    Frozen,
-)
+    from .metaclass.bases import (  # noqa
+        Box,
+        Case,
+        Data,
+        Frozen,
+    )
 
-from .metaclass.meta import (  # noqa
-    DataMeta,
-)
+    from .metaclass.meta import (  # noqa
+        DataMeta,
+    )
 
-from .metaclass.specs import (  # noqa
-    get_metaclass_spec,
-)
+    from .metaclass.specs import (  # noqa
+        get_metaclass_spec,
+    )
 
-from .reflection import (  # noqa
-    reflect,
-)
+    from .reflection import (  # noqa
+        reflect,
+    )
 
-from .specs import (  # noqa
-    CoerceFn,
-    ValidateFn,
-    ReprFn,
+    from .specs import (  # noqa
+        CoerceFn,
+        ValidateFn,
+        ReprFn,
 
-    InitFn,
-    ClassValidateFn,
+        InitFn,
+        ClassValidateFn,
 
-    DefaultFactory,
+        DefaultFactory,
 
-    FieldType,
+        FieldType,
 
-    FieldSpec,
+        FieldSpec,
 
-    ClassSpec,
-)
+        ClassSpec,
+    )
 
-from .tools.as_ import (  # noqa
-    shallow_asdict,
-    shallow_astuple,
-)
+    from .tools.as_ import (  # noqa
+        shallow_asdict,
+        shallow_astuple,
+    )
 
-from .tools.iter import (  # noqa
-    fields_dict,
+    from .tools.iter import (  # noqa
+        fields_dict,
 
-    iter_items,
-    iter_keys,
-    iter_values,
-)
+        iter_items,
+        iter_keys,
+        iter_values,
+    )
 
-from .tools.modifiers import (  # noqa
-    field_modifier,
-    update_fields,
-)
+    from .tools.modifiers import (  # noqa
+        field_modifier,
+        update_fields,
+    )
 
-from .tools.only_ import (  # noqa
-    only,
-)
+    from .tools.only_ import (  # noqa
+        only,
+    )
 
-from .tools.replace import (  # noqa
-    deep_replace,
-)
+    from .tools.replace import (  # noqa
+        deep_replace,
+    )
 
-from .tools.repr import (  # noqa
-    opt_repr,
-    truthy_repr,
-)
+    from .tools.repr import (  # noqa
+        opt_repr,
+        truthy_repr,
+    )
 
-from .tools.static import (  # noqa
-    Static,
-)
+    from .tools.static import (  # noqa
+        Static,
+    )
+
+    ##
+    # lite imports
+
+    from ..lite.dataclasses import (  # noqa
+        is_immediate_dataclass,
+
+        dataclass_maybe_post_init as maybe_post_init,
+    )
 
 
 ##
-# lite imports
+# globals hack
+
+def _self_patching_global_proxy(l, r, ak_fn=None):
+    def inner(*args, **kwargs):
+        fn = getattr(_sys.modules[__name__], r)
+        globals()[l] = fn
+        if ak_fn:
+            args, kwargs = ak_fn(*args, **kwargs)
+        return fn(*args, **kwargs)
+    return inner
 
-from ..lite.dataclasses import (  # noqa
-    is_immediate_dataclass,
 
-    dataclass_maybe_post_init as maybe_post_init,
+globals()['field'] = _self_patching_global_proxy('field', 'xfield')
+
+globals()['dataclass'] = _self_patching_global_proxy('dataclass', 'xdataclass')
+
+globals()['make_dataclass'] = _self_patching_global_proxy(
+    'make_dataclass',
+    'xmake_dataclass',
+    lambda *args, _frame_offset=1, **kwargs: (args, dict(_frame_offset=_frame_offset + 1, **kwargs)),
 )
+
+globals()['replace'] = _self_patching_global_proxy('replace', 'xreplace')

omlish/dataclasses/impl/api/classes/make.py

@@ -55,6 +55,8 @@ def make_dataclass(  # noqa
         terse_repr: bool | None = None,
 
         allow_redundant_decorator: bool | None = None,
+
+        _frame_offset: int = 1,
 ):
     if decorator is not dataclass:
         raise TypeError(
@@ -136,14 +138,14 @@ def make_dataclass(  # noqa
 
     if _IS_PY_3_14:
         # For now, set annotations including the _ANY_MARKER.
-        cls.__annotate__ = annotate_method  # type: ignore
+        cls.__annotate__ = annotate_method  # type: ignore  # noqa
 
     if module is None:
         try:
-            module = sys._getframemodulename(1) or '__main__'  # type: ignore  # noqa
+            module = sys._getframemodulename(_frame_offset) or '__main__'  # type: ignore  # noqa
         except AttributeError:
             with contextlib.suppress(AttributeError, ValueError):
-                module = sys._getframe(1).f_globals.get('__name__', '__main__')  # noqa
+                module = sys._getframe(_frame_offset).f_globals.get('__name__', '__main__')  # noqa
     if module is not None:
         cls.__module__ = module
 

omlish/dataclasses/impl/configs.py

@@ -1,15 +1,10 @@
 import dataclasses as dc
-import importlib.resources
-import json
 import typing as ta
 
 
 ##
 
 
-PACKAGE_CONFIG_FILE_NAME = '.dataclasses.json'
-
-
 @dc.dataclass(frozen=True, kw_only=True)
 class PackageConfig:
     codegen: bool = False
@@ -17,15 +12,19 @@ class PackageConfig:
     def __init_subclass__(cls, **kwargs):
         raise TypeError
 
-    @classmethod
-    def loads(cls, s: str) -> 'PackageConfig':
-        return cls(**json.loads(s))
 
-    def dumps(self) -> str:
-        return json.dumps(dc.asdict(self), indent=2)
+DEFAULT_PACKAGE_CONFIG = PackageConfig()
 
 
-DEFAULT_PACKAGE_CONFIG = PackageConfig()
+##
+
+
+def init_package(
+        name: str,
+        *,
+        codegen: bool = False,
+) -> None:
+    pass
 
 
 ##
@@ -46,24 +45,25 @@ class PackageConfigCache:
         ...
 
     def get(self, pkg, default=None):
-        try:
-            return self._dct[pkg]
-        except KeyError:
-            pass
-
-        try:
-            s = importlib.resources.read_text(pkg, PACKAGE_CONFIG_FILE_NAME)
-        except FileNotFoundError:
-            self._dct[pkg] = None
-        else:
-            c = PackageConfig.loads(s)
-            self._dct[pkg] = c
-            return c
-
-        if '.' not in pkg:
-            return default
-
-        return self.get(pkg.rpartition('.')[0], default)
+        # try:
+        #     return self._dct[pkg]
+        # except KeyError:
+        #     pass
+        #
+        # try:
+        #     s = importlib.resources.read_text(pkg, PACKAGE_CONFIG_FILE_NAME)
+        # except FileNotFoundError:
+        #     self._dct[pkg] = None
+        # else:
+        #     c = PackageConfig.loads(s)
+        #     self._dct[pkg] = c
+        #     return c
+        #
+        # if '.' not in pkg:
+        #     return default
+        #
+        # return self.get(pkg.rpartition('.')[0], default)
+        return None
 
 
 PACKAGE_CONFIG_CACHE = PackageConfigCache()

omlish/lite/maysyncs.py

@@ -100,6 +100,7 @@ class AnyMaysyncFn(abc.ABC, ta.Generic[_MaysyncRS, _MaysyncRA]):  # noqa
         raise NotImplementedError
 
 
+@ta.final
 class MaywaitableAlreadyConsumedError(Exception):
     pass
 

omlish/manifests/base.py

@@ -15,7 +15,7 @@ class ModAttrManifest:
     module: str
     attr: str
 
-    def load(self) -> ta.Any:
+    def resolve(self) -> ta.Any:
         import importlib  # noqa
 
         mod = importlib.import_module(self.module)

omlish/marshal/__init__.py

@@ -1,4 +1,48 @@
-from .base import (  # noqa
+"""
+TODO:
+ - redacted
+ - strongly typed MarshalerFactory base class?
+ - strongly typed Composite/Cached Marshaler/Unmarshaler factories - footgun
+ - streaming? Start/EndObject, etc..
+ - lang.Marker - class name, handle type[Foo]
+  - can't disambiguate from str - can't coexist in bare union
+ - factories being free MatchFns does more harm than good - in practice these are such big guns you want to write a
+   class body if only ceremonially
+
+See:
+ - https://github.com/python-attrs/cattrs
+ - https://github.com/jcrist/msgspec
+ - https://github.com/Fatal1ty/mashumaro
+ - https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md#custom-serializers
+"""
+
+
+from .base.contexts import (  # noqa
+    BaseContext,
+    MarshalContext,
+    UnmarshalContext,
+)
+
+from .base.errors import (  # noqa
+    ForbiddenTypeError,
+    MarshalError,
+    UnhandledTypeError,
+)
+
+from .base.options import (  # noqa
+    Option,
+)
+
+from .base.overrides import (  # noqa
+    Override,
+    ReflectOverride,
+)
+
+from .base.registries import (  # noqa
+    Registry,
+)
+
+from .base.types import (  # noqa
     Marshaler,
     Unmarshaler,
 
@@ -10,67 +54,55 @@ from .base import (  # noqa
 
     MarshalerFactory_,
     UnmarshalerFactory_,
+)
+
+from .base.values import (  # noqa
+    Value,
+)
 
+from .composite.iterables import (  # noqa
+    IterableMarshaler,
+    IterableUnmarshaler,
+)
+
+from .composite.wrapped import (  # noqa
+    WrappedMarshaler,
+    WrappedUnmarshaler,
+)
+
+from .factories.simple import (  # noqa
     SimpleMarshalerFactory,
     SimpleUnmarshalerFactory,
+)
 
+from .factories.match import (  # noqa
     MarshalerFactoryMatchClass,
     UnmarshalerFactoryMatchClass,
+)
 
+from .factories.multi import (  # noqa
     MultiMarshalerFactory,
     MultiUnmarshalerFactory,
+)
 
+from .factories.typemap import (  # noqa
     TypeMapMarshalerFactory,
     TypeMapUnmarshalerFactory,
+)
 
+from .factories.typecache import (  # noqa
     TypeCacheMarshalerFactory,
     TypeCacheUnmarshalerFactory,
+)
 
+from .factories.func import (  # noqa
     FuncMarshaler,
     FuncUnmarshaler,
+)
 
-    BaseContext,
-    MarshalContext,
-    UnmarshalContext,
-
+from .factories.recursive import (  # noqa
     RecursiveMarshalerFactory,
     RecursiveUnmarshalerFactory,
-
-    Override,
-    ReflectOverride,
-)
-
-from .composite.iterables import (  # noqa
-    IterableMarshaler,
-    IterableUnmarshaler,
-)
-
-from .composite.wrapped import (  # noqa
-    WrappedMarshaler,
-    WrappedUnmarshaler,
-)
-
-from .errors import (  # noqa
-    ForbiddenTypeError,
-    MarshalError,
-    UnhandledTypeError,
-)
-
-from .globals import (  # noqa
-    GLOBAL_REGISTRY,
-
-    global_marshaler_factory,
-    marshal,
-
-    global_unmarshaler_factory,
-    unmarshal,
-
-    register_global,
-)
-
-from .naming import (  # noqa
-    Naming,
-    translate_name,
 )
 
 from .objects.dataclasses import (  # noqa
@@ -152,20 +184,6 @@ from .singular.primitives import (  # noqa
     PRIMITIVE_TYPES,
 )
 
-from .registries import (  # noqa
-    Registry,
-)
-
-from .standard import (  # noqa
-    STANDARD_MARSHALER_FACTORIES,
-    new_standard_marshaler_factory,
-
-    STANDARD_UNMARSHALER_FACTORIES,
-    new_standard_unmarshaler_factory,
-
-    install_standard_factories,
-)
-
 from .trivial.forbidden import (  # noqa
     ForbiddenTypeMarshalerFactory,
     ForbiddenTypeUnmarshalerFactory,
@@ -176,8 +194,31 @@ from .trivial.nop import (  # noqa
     NopMarshalerUnmarshaler,
 )
 
-from .values import (  # noqa
-    Value,
+from .globals import (  # noqa
+    GLOBAL_REGISTRY,
+
+    global_marshaler_factory,
+    marshal,
+
+    global_unmarshaler_factory,
+    unmarshal,
+
+    register_global,
+)
+
+from .naming import (  # noqa
+    Naming,
+    translate_name,
+)
+
+from .standard import (  # noqa
+    STANDARD_MARSHALER_FACTORIES,
+    new_standard_marshaler_factory,
+
+    STANDARD_UNMARSHALER_FACTORIES,
+    new_standard_unmarshaler_factory,
+
+    install_standard_factories,
 )