omlish 0.0.0.dev393__py3-none-any.whl → 0.0.0.dev394__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev393'
-__revision__ = '7624d40b9a78e52aec03b012a4b4f7b060d4f2f0'
+__version__ = '0.0.0.dev394'
+__revision__ = 'b3c8aa9fb0aa4cb4683cea8843b22615547cbf03'
 
 
 #

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/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/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/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/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/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/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/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/manifests/{load.py → 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/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.dev393.dist-info → omlish-0.0.0.dev394.dist-info}/METADATA

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

{omlish-0.0.0.dev393.dist-info → omlish-0.0.0.dev394.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=Ecs9Y68M7tY4vQsy6795a2JDqG9iRNujk3WD8bB9QRY,3543
+omlish/__about__.py,sha256=ko042tDygoOn3kM1lHN4zPIzbXv_lgAASIV2V4gSqDk,3543
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -69,13 +69,13 @@ omlish/bootstrap/main.py,sha256=RQAQVb_Cbk_Lnu-hSGMAo-aVQVIJ-E_TW7ZLsPO-ECk,5909
 omlish/bootstrap/marshal.py,sha256=aKLeiOyPW6DelVK78dmw0axQzOMHX-ALrSqOOzYh05w,486
 omlish/bootstrap/sys.py,sha256=r06ZroT2Rv0CBHiEweqDV6oWaMGNhFc4u0XBMBv3nnY,8793
 omlish/codecs/__init__.py,sha256=-FDwRJFGagg-fZyQ8wup4GPuR6gHpmaChzthlykn-kY,876
-omlish/codecs/base.py,sha256=9wNVEnbb6KmI06A-HpUdT4BAYXOtDoJVyctNcn5vRnY,2218
-omlish/codecs/bytes.py,sha256=jlZ87OmZ52HhQDNyL87R3OIviK2qV5iU2jZYOTOLWjk,2157
+omlish/codecs/base.py,sha256=IVnJlduvhiH1imul4DPhl2gHBWS76774AV5h86dX0ls,2214
+omlish/codecs/bytes.py,sha256=3DxyQQCvFcP3mQ5G93f_mygXEb-7I8buM8EyzUcx2Is,2155
 omlish/codecs/chain.py,sha256=nbkL2nz0ZqT2lxYwSXktHh1YFTQ4Iii1Hp-fWjis6rc,532
 omlish/codecs/funcs.py,sha256=or0Jogczuzk7csDTRl-HURMEjl8LXXqxxXYK45xcM5w,855
-omlish/codecs/registry.py,sha256=2FnO5YP7ui1LzkguwESY0MP3WIdwgPTIJTM_4RyTOEg,3896
+omlish/codecs/registry.py,sha256=PIf7XdwVX7Q85-MnyURtX9SKAYolK_r7wls9Z-qAsnA,3911
 omlish/codecs/standard.py,sha256=eiZ4u9ep0XrA4Z_D1zJI0vmWyuN8HLrX4Se_r_Cq_ZM,60
-omlish/codecs/text.py,sha256=MgAzXapiHie-hhLBmcho67WXfWbmhlHz4tNPcHXnWUk,5711
+omlish/codecs/text.py,sha256=uHhV8jBgH0iZgcrV0nl4-0a_9ofln4iFH4OXoVm2CW4,5709
 omlish/collections/__init__.py,sha256=-CcIq7e8OkQakexxpJOXf2q6LdVqzo7B-quPtwur_BQ,2634
 omlish/collections/abc.py,sha256=p9zhL5oNV5WPyWmMn34fWfkuxPQAjOtL7WQA-Xsyhwk,2628
 omlish/collections/bimap.py,sha256=3szDCscPJlFRtkpyVQNWneg4s50mr6Rd0jdTzVEIcnE,1661
@@ -245,7 +245,7 @@ omlish/dom/rendering.py,sha256=5cQK3A_uifh3Th5v3c0nx-tW8d1KyGL6C9tASPaNVNI,4336
 omlish/formats/__init__.py,sha256=T0AG1gFnqQ5JiHN0UPQjQ-7g5tnxMIG-mgOvMYExYAM,21
 omlish/formats/cbor.py,sha256=o_Hbe4kthO9CeXK-FySrw0dHVlrdyTo2Y8PpGRDfZ3c,514
 omlish/formats/cloudpickle.py,sha256=16si4yUp_pAdDWGECAWf6HLA2PwSANGGgDoMLGZUem8,579
-omlish/formats/codecs.py,sha256=ip4TLOyWAaUyEJmrIOzuLMtjRdgaMEsC6JeAlcCVi28,1657
+omlish/formats/codecs.py,sha256=HBQzco_BT73xshv2l8FrDTaAKTH-A8Y4vXiabXPELGY,1655
 omlish/formats/dotenv.py,sha256=60RHhpNmLhqT7ISeA79MmSc7Sq8AxF5nKj7VPjdroZU,19320
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=rPycJ-_b76NSNc2b_dZ0F0zyKzuXK8v6K6fqcV8uCRQ,18933
@@ -398,7 +398,7 @@ omlish/io/compress/adapters.py,sha256=LJHhjwMHXstoLyX_q0QhGoBAcqyYGWfzhzQbGBXHzH
 omlish/io/compress/base.py,sha256=X-B9zC_JAJ84ozO4Vl_7mG3o6zkF6jZfcXO5JmDftGk,620
 omlish/io/compress/brotli.py,sha256=sNDX5HmEVqg9_xID5NTFPAWuvlNPw5ixfOnnIWwZf_o,1189
 omlish/io/compress/bz2.py,sha256=HtwBuBYHJ3MyWO9xJ0XhWpyIYTA3OszLrpu_J4kRRPA,1534
-omlish/io/compress/codecs.py,sha256=kpSJrCSnfFxAwReZTwdcXsaHe0iqoFbdZtZxjzuzxu0,1792
+omlish/io/compress/codecs.py,sha256=dpJKoELXy_xF5nLnQYGNu19tmHEaUPyyk7fVsOlXsWk,1790
 omlish/io/compress/gzip.py,sha256=6nCWycCYo0_4cTMu4QMhu23MT1xbrwyf7E8sGGBkR_w,12199
 omlish/io/compress/lz4.py,sha256=qaze1yVXexjJyN18Adh8fbTm_5pEeyytx66KoMUNpCU,2759
 omlish/io/compress/lzma.py,sha256=qDyshBgBUSPcZpAyXiRXnqI7zx7x60UpPxn8K3nN8aM,2469
@@ -506,15 +506,16 @@ omlish/logs/standard.py,sha256=w0jS824YDvlzrGgAxKiPk9RoZ5V1b0ADiFsBEpKLuLY,3152
 omlish/logs/timing.py,sha256=qsQ3DB6swts1pxrFlmLWQzhH-3nzDrq1MUu7PxjjUyU,1519
 omlish/logs/utils.py,sha256=OkFWf1exmWImmT7BaSiIC7c0Fk9tAis-PRqo8H4ny3c,398
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/manifests/base.py,sha256=5CmayiuzdXXv9hB5tDnWqfAosAoEQ26YG0B-emkiTXU,941
-omlish/manifests/load.py,sha256=baPBZJRSmFVH9lWlWXAredmJFFYc3X0W2C6Z8a4M05E,7734
+omlish/manifests/base.py,sha256=YBK6jxMgY5G3hK0ZBlbU-tghzifkGhwRTyWa5XqOmno,939
+omlish/manifests/globals.py,sha256=LZm4ueBjlC023uxL8zvivSyzMgx5O8kSbo9oNfhF_DE,206
+omlish/manifests/loading.py,sha256=S-yEGsnBEu670ya6Bc09QqbRtA5rBp5rA4D3zuJUl9M,8070
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=5hQuY-WZ9VMqHZXr-9Dayg380JsnX2vJzXyw6vC6UDs,317
-omlish/marshal/__init__.py,sha256=QeWqXKb6_Jk8vpX9Z-apWlM3nUbJY3uCPOm0k8Lw8b8,3584
+omlish/marshal/__init__.py,sha256=MtQkMih6iJO0S7tbzVWBUjDr9wQhiCm3poTyLslaPFo,3584
 omlish/marshal/base.py,sha256=3GMrhJBcnVrVtlQRQLOMgvV66MciAYpHKEQi5Ns3dIk,11853
 omlish/marshal/errors.py,sha256=g5XJyTHd__8lfwQ4KwgK-E5WR6MoNTMrqKP2U_QRQQQ,307
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
-omlish/marshal/global_.py,sha256=vNLpwQVt7Nn9sA5bBh7c_JYcUu9-1CLyENq1zBH-rcM,1510
+omlish/marshal/globals.py,sha256=vNLpwQVt7Nn9sA5bBh7c_JYcUu9-1CLyENq1zBH-rcM,1510
 omlish/marshal/naming.py,sha256=ELs-NtWhw6RCSEF_y98cMyzr37pj0DV_bG9yQmto_NA,857
 omlish/marshal/proxy.py,sha256=i7xZQN6BSGz4nBM4CTj0S6RcSlDEgrZmX9fbtFpAPco,548
 omlish/marshal/registries.py,sha256=5YtvjYDw8Wu7uigCzlrVzC1pHajoNFZtN2dFNmKrbTI,2358
@@ -895,9 +896,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev393.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev393.dist-info/METADATA,sha256=siHQt0dS0bqBCCqnpqhdYepmt0xzBPGtMcJ3GNXPZAw,18825
-omlish-0.0.0.dev393.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev393.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev393.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev393.dist-info/RECORD,,
+omlish-0.0.0.dev394.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev394.dist-info/METADATA,sha256=-8kg1tH7Gm7abGeeTIeCo69covgUeUmIKxmo7RTaUsk,18825
+omlish-0.0.0.dev394.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev394.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev394.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev394.dist-info/RECORD,,