omlish 0.0.0.dev392__tar.gz → 0.0.0.dev394__tar.gz

{omlish-0.0.0.dev392/omlish.egg-info → omlish-0.0.0.dev394}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev392
+Version: 0.0.0.dev394
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev392'
-__revision__ = 'b709bee1bc3c60ff875c432a230426a0eb51269f'
+__version__ = '0.0.0.dev394'
+__revision__ = 'b3c8aa9fb0aa4cb4683cea8843b22615547cbf03'
 
 
 #

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/codecs/base.py

@@ -70,7 +70,7 @@ def check_codec_name(s: str) -> str:
 @dc.dataclass(frozen=True, kw_only=True)
 class Codec:
     name: str = dc.xfield(coerce=check_codec_name)
-    aliases: ta.Collection[str] | None = dc.xfield(
+    aliases: ta.Sequence[str] | None = dc.xfield(
         default=None,
         coerce=lang.opt_fn(lambda s: [check_codec_name(a) for a in s]),
     )
@@ -90,7 +90,7 @@ class Codec:
 @dc.dataclass(frozen=True, kw_only=True)
 class LazyLoadedCodec(ModAttrManifest):
     name: str
-    aliases: ta.Collection[str] | None = None
+    aliases: ta.Sequence[str] | None = None
 
     @classmethod
     def new(

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/codecs/bytes.py

@@ -21,7 +21,7 @@ class BytesCodec(Codec):
 
 def make_bytes_encoding_codec(
         name: str,
-        aliases: ta.Collection[str] | None,
+        aliases: ta.Sequence[str] | None,
         encode: ta.Callable[[bytes], bytes],
         decode: ta.Callable[[bytes], bytes],
         *,

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/codecs/registry.py

@@ -11,9 +11,9 @@ from .standard import STANDARD_CODECS
 
 
 if ta.TYPE_CHECKING:
-    from ..manifests import load as manifest_load
+    from ..manifests import globals as manifest_globals
 else:
-    manifest_load = lang.proxy_import('..manifests.load', __package__)
+    manifest_globals = lang.proxy_import('..manifests.globals', __package__)
 
 
 ##
@@ -102,7 +102,7 @@ def _install_standard_codecs(registry: CodecRegistry) -> None:
 
 @cached.function
 def _build_manifest_lazy_loaded_codecs() -> ta.Sequence[LazyLoadedCodec]:
-    ldr = manifest_load.MANIFEST_LOADER
+    ldr = manifest_globals.MANIFEST_LOADER
     pkgs = {__package__.split('.')[0], *ldr.discover_pkgs()}
     mns = ldr.load(*pkgs, only=[LazyLoadedCodec])
     return [m.value for m in mns]

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/codecs/text.py

@@ -126,7 +126,7 @@ def normalize_text_encoding_name(s: str) -> str:
 
 def make_text_encoding_codec(
         name: str,
-        aliases: ta.Collection[str] | None = None,
+        aliases: ta.Sequence[str] | None = None,
         *,
         append_to: ta.MutableSequence[Codec] | None = None,
 ) -> TextEncodingCodec:

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/dataclasses/tools/modifiers.py

@@ -2,6 +2,13 @@ import dataclasses as dc
 import typing as ta
 
 from ... import check
+from ... import lang
+
+
+if ta.TYPE_CHECKING:
+    from ..metaclass import meta
+else:
+    meta = lang.proxy_import('..metaclass.meta', __package__)
 
 
 T = ta.TypeVar('T')
@@ -30,6 +37,9 @@ def update_fields(
         fields: ta.Iterable[str] | None = None,
 ) -> ta.Callable[[type[T]], type[T]]:
     def inner(cls):
+        if issubclass(cls, meta.DataMeta):
+            raise TypeError('update_fields() cannot be used on DataMeta subclasses')
+
         if fields is None:
             for a, v in list(cls.__dict__.items()):
                 if isinstance(v, dc.Field):

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/formats/codecs.py

@@ -22,7 +22,7 @@ def make_object_codec(
         *,
         input: rfl.Type,  # noqa
         output: rfl.Type = rfl.type_(ta.Any),
-        aliases: ta.Collection[str] | None = None,
+        aliases: ta.Sequence[str] | None = None,
 ) -> ObjectCodecT:
     return cls(
         name=name,

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/io/compress/codecs.py

@@ -46,7 +46,7 @@ def make_compression_codec(
         name: str,
         cls: type[Compression],
         *,
-        aliases: ta.Collection[str] | None = None,
+        aliases: ta.Sequence[str] | None = None,
 ) -> CompressionCodec:
     return CompressionCodec(
         name=name,

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/lang/__init__.py

@@ -254,6 +254,8 @@ from .maysyncs import (  # noqa
     MaysyncP,
 
     make_maysync,
+    make_maysync_from_sync,
+
     maysync,
 )
 

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/lang/maysyncs.py

@@ -16,6 +16,16 @@ MaysyncP: ta.TypeAlias = ta.Callable[P, Maywaitable[T]]
 
 
 def make_maysync(
+        s: ta.Callable[P, T],
+        a: ta.Callable[P, ta.Awaitable[T]],
+) -> MaysyncP[P, T]:
+    return ta.cast('MaysyncP[P, T]', _make_maysync(
+        s,
+        a,
+    ))
+
+
+def make_maysync_from_sync(
         s: ta.Callable[P, T],
         a: ta.Callable[P, ta.Awaitable[T]] | None = None,
 ) -> MaysyncP[P, T]:
@@ -25,6 +35,9 @@ def make_maysync(
     ))
 
 
+##
+
+
 def maysync(m: ta.Callable[P, ta.Awaitable[T]]) -> MaysyncP[P, T]:
     return ta.cast('MaysyncP[P, T]', _maysync(
         m,

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/lite/maysyncs.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP045
+# ruff: noqa: UP006 UP045
 # @omlish-lite
 """
 TODO:
@@ -34,8 +34,22 @@ class Maywaitable(ta.Protocol[T_co]):
 Maysync = ta.Callable[..., Maywaitable[T]]  # ta.TypeAlias  # omlish-amalg-typing-no-move
 
 
-class Maysync_(abc.ABC):  # noqa
-    pass
+class Maysync_(abc.ABC, ta.Generic[T]):  # noqa
+    @ta.final
+    def cast(self) -> Maysync[T]:
+        return ta.cast('Maysync[T]', self)
+
+    class FnPair(ta.NamedTuple):
+        s: ta.Callable[..., ta.Any]
+        a: ta.Callable[..., ta.Awaitable[ta.Any]]
+
+    @abc.abstractmethod
+    def fn_pair(self) -> ta.Optional[FnPair]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __call__(self, *args, **kwargs):  # -> Maywaitable[T]
+        raise NotImplementedError
 
 
 ##
@@ -49,16 +63,19 @@ class _Maywaitable(abc.ABC, ta.Generic[_MaysyncX, T]):
             *args: ta.Any,
             **kwargs: ta.Any,
     ) -> None:
-        self.x = x
-        self.args = args
-        self.kwargs = kwargs
+        self._x = x
+        self._args = args
+        self._kwargs = kwargs
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._x!r})'
 
     @ta.final
     def m(self) -> ta.Awaitable[T]:
         return _MaysyncFuture(_MaysyncOp(
-            ta.cast(ta.Any, self.x),
-            *self.args,
-            **self.kwargs,
+            ta.cast(ta.Any, self._x),
+            self._args,
+            self._kwargs,
         ))
 
 
@@ -76,13 +93,22 @@ class _FnMaysync(Maysync_, ta.Generic[T]):
             raise TypeError(s)
         if a is None:
             raise TypeError(a)
-        self.s = s
-        self.a = a
+        self._s = s
+        self._a = a
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._s!r}, {self._a!r})'
+
+    def fn_pair(self) -> ta.Optional[Maysync_.FnPair]:
+        return Maysync_.FnPair(
+            self._s,
+            self._a,
+        )
 
     def __get__(self, instance, owner=None):
         return _FnMaysync(
-            self.s.__get__(instance, owner),  # noqa
-            self.a.__get__(instance, owner),  # noqa
+            self._s.__get__(instance, owner),  # noqa
+            self._a.__get__(instance, owner),  # noqa
         )
 
     def __call__(self, *args, **kwargs):
@@ -92,10 +118,10 @@ class _FnMaysync(Maysync_, ta.Generic[T]):
 @ta.final
 class _FnMaywaitable(_Maywaitable[_FnMaysync[T], T]):
     def s(self) -> T:
-        return self.x.s(*self.args, **self.kwargs)
+        return self._x._s(*self._args, **self._kwargs)  # noqa
 
     async def a(self) -> T:
-        return await self.x.a(*self.args, **self.kwargs)
+        return await self._x._a(*self._args, **self._kwargs)  # noqa
 
 
 def make_maysync(
@@ -114,13 +140,19 @@ class _MgMaysync(Maysync_, ta.Generic[T]):
             self,
             mg: ta.Callable[..., _MaysyncGen[T]],
     ) -> None:
-        self.mg = mg
+        self._mg = mg
 
         functools.update_wrapper(self, mg, updated=())
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._mg!r})'
+
+    def fn_pair(self) -> ta.Optional[Maysync_.FnPair]:
+        return None
+
     def __get__(self, instance, owner=None):
         return _MgMaysync(
-            self.mg.__get__(instance, owner),  # noqa
+            self._mg.__get__(instance, owner),  # noqa
         )
 
     def __call__(self, *args, **kwargs):
@@ -130,7 +162,7 @@ class _MgMaysync(Maysync_, ta.Generic[T]):
 @ta.final
 class _MgMaywaitable(_Maywaitable[_MgMaysync[T], T]):
     def s(self) -> T:
-        g = self.x.mg(*self.args, **self.kwargs)
+        g = self._x._mg(*self._args, **self._kwargs)  # noqa
 
         i: ta.Any = None
         e: ta.Any = None
@@ -158,7 +190,7 @@ class _MgMaywaitable(_Maywaitable[_MgMaysync[T], T]):
             del o
 
     async def a(self) -> T:
-        g = self.x.mg(*self.args, **self.kwargs)
+        g = self._x._mg(*self._args, **self._kwargs)  # noqa
 
         i: ta.Any = None
         e: ta.Any = None
@@ -189,17 +221,20 @@ class _MgMaywaitable(_Maywaitable[_MgMaysync[T], T]):
 @ta.final
 class _MgMaysyncFn:
     def __init__(self, m):
-        self.m = m
+        self._m = m
 
         functools.update_wrapper(self, m, updated=())
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._m!r})'
+
     def __get__(self, instance, owner=None):
         return _MgMaysyncFn(
-            self.m.__get__(instance, owner),
+            self._m.__get__(instance, owner),
         )
 
     def __call__(self, *args, **kwargs):
-        a = self.m(*args, **kwargs).__await__()
+        a = self._m(*args, **kwargs).__await__()
         try:
             g = iter(a)
             try:
@@ -240,13 +275,16 @@ class _MaysyncOp:
     def __init__(
             self,
             x: Maysync[T],
-            *args: ta.Any,
-            **kwargs: ta.Any,
+            args: ta.Tuple[ta.Any, ...],
+            kwargs: ta.Mapping[str, ta.Any],
     ) -> None:
         self.x = x
         self.args = args
         self.kwargs = kwargs
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self.x!r})'
+
 
 class _MaysyncFutureNotAwaitedError(RuntimeError):
     pass
@@ -260,6 +298,9 @@ class _MaysyncFuture(ta.Generic[T]):
     ) -> None:
         self.op = op
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self.op!r}, done={self.done!r})'
+
     done: bool = False
     result: T
     error: ta.Optional[BaseException] = None

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/manifests/base.py

@@ -27,7 +27,7 @@ class ModAttrManifest:
 @dc.dataclass(frozen=True)
 class NameAliasesManifest:
     name: str
-    aliases: ta.Optional[ta.Collection[str]] = None
+    aliases: ta.Optional[ta.Sequence[str]] = None
 
     @classmethod
     def build_name_dict(cls, objs: ta.Iterable[NameAliasesManifestT]) -> ta.Dict[str, NameAliasesManifestT]:

omlish-0.0.0.dev394/omlish/manifests/globals.py

@@ -0,0 +1,11 @@
+# @omlish-lite
+from ..lite.marshal import unmarshal_obj
+from .loading import ManifestLoader
+
+
+##
+
+
+MANIFEST_LOADER = ManifestLoader(
+    cls_instantiator=lambda cls, **kwargs: unmarshal_obj(kwargs, cls),
+)

omlish-0.0.0.dev392/omlish/manifests/load.py → omlish-0.0.0.dev394/omlish/manifests/loading.py

@@ -26,9 +26,12 @@ class ManifestLoader:
             self,
             *,
             module_remap: ta.Optional[ta.Mapping[str, str]] = None,
+            cls_instantiator: ta.Optional[ta.Callable[..., ta.Any]] = None,
     ) -> None:
         super().__init__()
 
+        self._cls_instantiator = cls_instantiator
+
         self._lock = threading.RLock()
 
         self._module_remap = module_remap or {}
@@ -172,6 +175,14 @@ class ManifestLoader:
 
     #
 
+    def instantiate_cls(self, cls: type, **kwargs: ta.Any) -> ta.Any:
+        if self._cls_instantiator is not None:
+            return self._cls_instantiator(cls, **kwargs)
+        else:
+            return cls(**kwargs)
+
+    #
+
     def _load(
             self,
             *pkg_names: str,
@@ -197,7 +208,7 @@ class ManifestLoader:
                     continue
 
                 cls = self._load_cls(key)
-                value = cls(**value_dct)
+                value = self.instantiate_cls(cls, **value_dct)
 
                 manifest = dc.replace(manifest, value=value)
                 lst.append(manifest)
@@ -256,9 +267,3 @@ class ManifestLoader:
                 pkgs.extend(self.scan_pkg_root(fallback_root))
 
         return pkgs
-
-
-##
-
-
-MANIFEST_LOADER = ManifestLoader()

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/marshal/__init__.py

@@ -56,7 +56,7 @@ from .errors import (  # noqa
     UnhandledTypeError,
 )
 
-from .global_ import (  # noqa
+from .globals import (  # noqa
     GLOBAL_REGISTRY,
 
     global_marshaler_factory,

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/sql/queries/relations.py

@@ -1,6 +1,5 @@
 """
 TODO:
- - join
  - subquery
 """
 import enum
@@ -8,6 +7,7 @@ import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
+from ... import marshal as msh
 from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
@@ -29,7 +29,7 @@ class Relation(Node, lang.Abstract):
 
 class Table(Relation, lang.Final):
     n: Name
-    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 #
@@ -50,7 +50,7 @@ class Join(Relation, lang.Final):
     l: Relation
     r: Relation
 
-    c: Expr | None = None
+    c: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 ##

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish/sql/queries/selects.py

@@ -2,6 +2,7 @@ import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
+from ... import marshal as msh
 from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
@@ -26,7 +27,7 @@ class AllSelectItem(SelectItem, lang.Final):
 
 class ExprSelectItem(SelectItem, lang.Final):
     v: Expr
-    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 ##
@@ -34,8 +35,8 @@ class ExprSelectItem(SelectItem, lang.Final):
 
 class Select(Stmt, lang.Final):
     items: ta.Sequence[SelectItem] = dc.xfield(coerce=tuple)
-    from_: Relation | None = dc.xfield(None, repr_fn=dc.opt_repr)
-    where: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    from_: Relation | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(name='from', omit_if=lang.is_none)  # noqa
+    where: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 CanSelectItem: ta.TypeAlias = SelectItem | CanExpr

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev392
+Version: 0.0.0.dev394
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/omlish.egg-info/SOURCES.txt

@@ -517,14 +517,15 @@ omlish/logs/timing.py
 omlish/logs/utils.py
 omlish/manifests/__init__.py
 omlish/manifests/base.py
-omlish/manifests/load.py
+omlish/manifests/globals.py
+omlish/manifests/loading.py
 omlish/manifests/static.py
 omlish/manifests/types.py
 omlish/marshal/__init__.py
 omlish/marshal/base.py
 omlish/marshal/errors.py
 omlish/marshal/factories.py
-omlish/marshal/global_.py
+omlish/marshal/globals.py
 omlish/marshal/naming.py
 omlish/marshal/proxy.py
 omlish/marshal/registries.py

{omlish-0.0.0.dev392 → omlish-0.0.0.dev394}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev392'
+version = '0.0.0.dev394'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',