omlish 0.0.0.dev400__py3-none-any.whl → 0.0.0.dev402__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev400'
-__revision__ = '4e9cb702d1d048bb8211070b471983d3b4d7bb6d'
+__version__ = '0.0.0.dev402'
+__revision__ = '923dbb60edd6e046587daf400ee931ae9ec619de'
 
 
 #
@@ -51,7 +51,7 @@ class Project(ProjectBase):
 
             'python-snappy ~= 0.7',
 
-            'zstandard ~= 0.23',
+            'zstandard ~= 0.24',
 
             'brotli ~= 1.1',
         ],

omlish/codecs/registry.py

@@ -102,10 +102,10 @@ def _install_standard_codecs(registry: CodecRegistry) -> None:
 
 @cached.function
 def _build_manifest_lazy_loaded_codecs() -> ta.Sequence[LazyLoadedCodec]:
-    ldr = manifest_globals.MANIFEST_LOADER
-    pkgs = {__package__.split('.')[0], *ldr.discover_pkgs()}
+    ldr = manifest_globals.GlobalManifestLoader.instance()
+    pkgs = {__package__.split('.')[0], *ldr.discover_packages()}
     mns = ldr.load(*pkgs, only=[LazyLoadedCodec])
-    return [m.value for m in mns]
+    return [m.value() for m in mns]
 
 
 def _install_manifest_lazy_loaded_codecs(registry: CodecRegistry) -> None:

omlish/collections/__init__.py

@@ -1,3 +1,4 @@
+# fmt: off
 # ruff: noqa: I001
 from .. import lang as _lang
 

omlish/lang/contextmanagers.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - AsyncExitStacked
+ - lol does double_check_setdefault need a CowDict in FT?
 """
 import abc
 import contextlib

omlish/lang/imports/traversal.py

@@ -1,6 +1,6 @@
 """
 TODO:
- - overhaul this - use pkgutil.walk_packages unless called needs non-importing (which this currently doesn't do anyway),
+ - overhaul this - use pkgutil.walk_packages unless caller needs non-importing (which this currently doesn't do anyway),
    and support namespace packages if they do.
 """
 import contextlib

omlish/manifests/globals.py

@@ -1,4 +1,8 @@
+# ruff: noqa: UP045
 # @omlish-lite
+import threading
+import typing as ta
+
 from ..lite.marshal import unmarshal_obj
 from .loading import ManifestLoader
 
@@ -6,6 +10,59 @@ from .loading import ManifestLoader
 ##
 
 
-MANIFEST_LOADER = ManifestLoader(
-    cls_instantiator=lambda cls, **kwargs: unmarshal_obj(kwargs, cls),
-)
+class GlobalManifestLoader:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    def __init_subclass__(cls, **kwargs):  # noqa
+        raise TypeError
+
+    ##
+
+    _lock: ta.ClassVar[threading.RLock] = threading.RLock()
+
+    _instance: ta.ClassVar[ta.Optional[ManifestLoader]] = None
+
+    @classmethod
+    def instance(cls) -> ManifestLoader:
+        if (inst := cls._instance) is None:
+            with cls._lock:
+                if (inst := cls._instance) is None:
+                    inst = cls._instance = ManifestLoader(**cls.default_kwargs())
+
+        return inst
+
+    @classmethod
+    def initialize(cls, **kwargs: ta.Any) -> ManifestLoader:
+        with cls._lock:
+            if cls._instance is not None:
+                raise Exception(f'{cls.__name__} already initialized')
+
+            inst = cls._instance = ManifestLoader(**kwargs)
+
+        return inst
+
+    ##
+
+    @classmethod
+    def default_value_instantiator(cls, obj_cls: type, **kwargs: ta.Any) -> ta.Any:
+        return unmarshal_obj(kwargs, obj_cls)
+
+    @classmethod
+    def default_kwargs(cls) -> ta.Mapping[str, ta.Any]:
+        return dict(
+            value_instantiator=cls.default_value_instantiator,
+        )
+
+    ##
+
+    @classmethod
+    def load(
+            cls,
+            *pkg_names: str,
+            only: ta.Optional[ta.Iterable[type]] = None,
+    ) -> ta.Sequence[ManifestLoader.LoadedManifest]:
+        return cls.instance().load(
+            *pkg_names,
+            only=only,
+        )

omlish/manifests/loading.py

@@ -5,6 +5,11 @@ Should be kept somewhat lightweight - used in cli entrypoints.
 
 TODO:
  - persisted caching support - {pkg_name: manifests}
+ - real relative cls names - shouldn't need parent package names
+ - *require* loaded class names - special All sentinel for explicit all
+  - ! late instantiation !
+ - TypeMap style weak cache of issubclass queries
+  - wait.. lazily load the class for virtual subclass queries? xor support virtual bases?
 """
 import dataclasses as dc
 import importlib.machinery
@@ -22,34 +27,101 @@ from .types import Manifest
 
 
 class ManifestLoader:
+    class LoadedManifest:
+        def __init__(
+                self,
+                package: 'ManifestLoader.LoadedPackage',
+                manifest: Manifest,
+        ) -> None:
+            super().__init__()
+
+            self._package = package
+            self._manifest = manifest
+
+        @property
+        def package(self) -> 'ManifestLoader.LoadedPackage':
+            return self._package
+
+        @property
+        def manifest(self) -> Manifest:
+            return self._manifest
+
+        @property
+        def loader(self) -> 'ManifestLoader':
+            return self._package.loader
+
+        @property
+        def class_key(self) -> str:
+            [(cls_key, value_dct)] = self._manifest.value.items()
+            return cls_key
+
+        _value: ta.Any
+
+        def value(self) -> ta.Any:
+            try:
+                return self._value
+            except AttributeError:
+                pass
+
+            value = self.loader._instantiate_loaded_manifest(self)  # noqa
+            self._value = value
+            return value
+
+    class LoadedPackage:
+        def __init__(
+                self,
+                loader: 'ManifestLoader',
+                name: str,
+        ) -> None:
+            super().__init__()
+
+            self._loader = loader
+            self._name = name
+
+        _manifests: ta.Sequence['ManifestLoader.LoadedManifest']
+
+        @property
+        def loader(self) -> 'ManifestLoader':
+            return self._loader
+
+        @property
+        def name(self) -> str:
+            return self._name
+
+        @property
+        def manifests(self) -> ta.Sequence['ManifestLoader.LoadedManifest']:
+            return self._manifests
+
     def __init__(
             self,
             *,
             module_remap: ta.Optional[ta.Mapping[str, str]] = None,
-            cls_instantiator: ta.Optional[ta.Callable[..., ta.Any]] = None,
+            value_instantiator: ta.Optional[ta.Callable[..., ta.Any]] = None,
     ) -> None:
         super().__init__()
 
-        self._cls_instantiator = cls_instantiator
+        self._value_instantiator = value_instantiator
+        self._module_remap = module_remap or {}
 
         self._lock = threading.RLock()
 
-        self._module_remap = module_remap or {}
         self._module_reverse_remap = {v: k for k, v in self._module_remap.items()}
 
-        self._cls_cache: ta.Dict[str, type] = {}
-        self._raw_cache: ta.Dict[str, ta.Optional[ta.Sequence[Manifest]]] = {}
+        self._loaded_classes: ta.Dict[str, type] = {}
+        self._loaded_packages: ta.Dict[str, ta.Optional[ManifestLoader.LoadedPackage]] = {}
+
+        self._scanned_package_root_dirs: ta.Dict[str, ta.Sequence[str]] = {}
 
     #
 
     @classmethod
-    def from_entry_point(
+    def kwargs_from_entry_point(
             cls,
             globals: ta.Mapping[str, ta.Any],  # noqa
             *,
             module_remap: ta.Optional[ta.Mapping[str, str]] = None,
             **kwargs: ta.Any,
-    ) -> 'ManifestLoader':
+    ) -> ta.Dict[str, ta.Any]:
         rm: ta.Dict[str, str] = {}
 
         if module_remap:
@@ -61,16 +133,11 @@ class ManifestLoader:
             if '__main__' not in rm and name == '__main__':
                 rm[spec.name] = '__main__'
 
-        return cls(module_remap=rm, **kwargs)
+        return dict(module_remap=rm, **kwargs)
 
     #
 
-    def _load_cls(self, key: str) -> type:
-        try:
-            return self._cls_cache[key]
-        except KeyError:
-            pass
-
+    def _load_class_uncached(self, key: str) -> type:
         if not key.startswith('$'):
             raise Exception(f'Bad key: {key}')
 
@@ -89,16 +156,25 @@ class ManifestLoader:
         if not isinstance(cls, type):
             raise TypeError(cls)
 
-        self._cls_cache[key] = cls
         return cls
 
-    def load_cls(self, key: str) -> type:
+    def _load_class_locked(self, key: str) -> type:
+        try:
+            return self._loaded_classes[key]
+        except KeyError:
+            pass
+
+        cls = self._load_class_uncached(key)
+        self._loaded_classes[key] = cls
+        return cls
+
+    def _load_class(self, key: str) -> type:
         with self._lock:
-            return self._load_cls(key)
+            return self._load_class_locked(key)
 
     #
 
-    def _load_contents(self, obj: ta.Any, pkg_name: str) -> ta.Sequence[Manifest]:
+    def _deserialize_raw_manifests(self, obj: ta.Any, pkg_name: str) -> ta.Sequence[Manifest]:
         if not isinstance(obj, (list, tuple)):
             raise TypeError(obj)
 
@@ -119,13 +195,9 @@ class ManifestLoader:
 
         return lst
 
-    def load_contents(self, obj: ta.Any, pkg_name: str) -> ta.Sequence[Manifest]:
-        with self._lock:
-            return self.load_contents(obj, pkg_name)
-
     #
 
-    def _read_pkg_file_text(self, pkg_name: str, file_name: str) -> ta.Optional[str]:
+    def _read_package_file_text(self, pkg_name: str, file_name: str) -> ta.Optional[str]:
         # importlib.resources.files actually imports the package - to avoid this, if possible, the file is read straight
         # off the filesystem.
         spec = importlib.util.find_spec(pkg_name)
@@ -149,45 +221,72 @@ class ManifestLoader:
 
     MANIFESTS_FILE_NAME: ta.ClassVar[str] = '.manifests.json'
 
-    def _load_raw(self, pkg_name: str) -> ta.Optional[ta.Sequence[Manifest]]:
-        try:
-            return self._raw_cache[pkg_name]
-        except KeyError:
-            pass
-
-        src = self._read_pkg_file_text(pkg_name, self.MANIFESTS_FILE_NAME)
+    def _load_package_uncached(self, pkg_name: str) -> ta.Optional[LoadedPackage]:
+        src = self._read_package_file_text(pkg_name, self.MANIFESTS_FILE_NAME)
         if src is None:
-            self._raw_cache[pkg_name] = None
             return None
 
         obj = json.loads(src)
         if not isinstance(obj, (list, tuple)):
             raise TypeError(obj)
 
-        lst = self._load_contents(obj, pkg_name)
+        raw_lst = self._deserialize_raw_manifests(obj, pkg_name)
 
-        self._raw_cache[pkg_name] = lst
-        return lst
+        ld_pkg = ManifestLoader.LoadedPackage(self, pkg_name)
+
+        ld_man_lst: ta.List[ManifestLoader.LoadedManifest] = []
+        for raw in raw_lst:
+            ld_man = ManifestLoader.LoadedManifest(ld_pkg, raw)
+
+            ld_man_lst.append(ld_man)
+
+        ld_pkg._manifests = ld_man_lst  # noqa
+
+        return ld_pkg
+
+    def _load_package_locked(self, pkg_name: str) -> ta.Optional[LoadedPackage]:
+        try:
+            return self._loaded_packages[pkg_name]
+        except KeyError:
+            pass
 
-    def load_raw(self, pkg_name: str) -> ta.Optional[ta.Sequence[Manifest]]:
+        pkg = self._load_package_uncached(pkg_name)
+        self._loaded_packages[pkg_name] = pkg
+        return pkg
+
+    def load_package(self, pkg_name: str) -> ta.Optional[LoadedPackage]:
         with self._lock:
-            return self._load_raw(pkg_name)
+            return self._load_package_locked(pkg_name)
 
     #
 
-    def instantiate_cls(self, cls: type, **kwargs: ta.Any) -> ta.Any:
-        if self._cls_instantiator is not None:
-            return self._cls_instantiator(cls, **kwargs)
+    def _instantiate_value(self, cls: type, **kwargs: ta.Any) -> ta.Any:
+        if self._value_instantiator is not None:
+            return self._value_instantiator(cls, **kwargs)
         else:
             return cls(**kwargs)
 
+    def _instantiate_loaded_manifest(self, ld_man: LoadedManifest) -> ta.Any:
+        [(cls_key, value_dct)] = ld_man.manifest.value.items()
+        cls = self._load_class(cls_key)
+        value = self._instantiate_value(cls, **value_dct)
+        return value
+
+    #
+
+    # FIXME:
+    # class LOAD_ALL:  # noqa
+    #     def __new__(cls, *args, **kwargs):  # noqa
+    #         raise TypeError
     #
+    #     def __init_subclass__(cls, **kwargs):  # noqa
+    #         raise TypeError
 
     def _load(
             self,
             *pkg_names: str,
             only: ta.Optional[ta.Iterable[type]] = None,
-    ) -> ta.Sequence[Manifest]:
+    ) -> ta.Sequence[LoadedManifest]:
         only_keys: ta.Optional[ta.Set]
         if only is not None:
             only_keys = set()
@@ -200,18 +299,17 @@ class ManifestLoader:
         else:
             only_keys = None
 
-        lst: ta.List[Manifest] = []
+        lst: ta.List[ManifestLoader.LoadedManifest] = []
         for pn in pkg_names:
-            for manifest in (self.load_raw(pn) or []):
-                [(key, value_dct)] = manifest.value.items()
-                if only_keys is not None and key not in only_keys:
-                    continue
+            lp = self.load_package(pn)
+            if lp is None:
+                continue
 
-                cls = self._load_cls(key)
-                value = self.instantiate_cls(cls, **value_dct)
+            for m in lp.manifests:
+                if only_keys is not None and m.class_key not in only_keys:
+                    continue
 
-                manifest = dc.replace(manifest, value=value)
-                lst.append(manifest)
+                lst.append(m)
 
         return lst
 
@@ -219,7 +317,7 @@ class ManifestLoader:
             self,
             *pkg_names: str,
             only: ta.Optional[ta.Iterable[type]] = None,
-    ) -> ta.Sequence[Manifest]:
+    ) -> ta.Sequence[LoadedManifest]:
         with self._lock:
             return self._load(
                 *pkg_names,
@@ -228,42 +326,82 @@ class ManifestLoader:
 
     #
 
-    ENTRY_POINT_GROUP = 'omlish.manifests'
+    ENTRY_POINT_GROUP: ta.ClassVar[str] = 'omlish.manifests'
+
+    _discovered_packages: ta.ClassVar[ta.Optional[ta.Sequence[str]]] = None
+
+    @classmethod
+    def discover_packages(cls) -> ta.Sequence[str]:
+        if (x := cls._discovered_packages) is not None:
+            return x
 
-    def discover_pkgs(self) -> ta.Sequence[str]:
         # This is a fat dep so do it late.
         from importlib import metadata as importlib_metadata  # noqa
 
-        return [
+        x = [
             ep.value
-            for ep in importlib_metadata.entry_points(group=self.ENTRY_POINT_GROUP)
+            for ep in importlib_metadata.entry_points(group=cls.ENTRY_POINT_GROUP)
         ]
 
-    def scan_pkg_root(self, root: str) -> ta.Sequence[str]:
+        cls._discovered_packages = x
+        return x
+
+    #
+
+    def _scan_package_root_dir_uncached(
+            self,
+            root_dir: str,
+    ) -> ta.Sequence[str]:
         pkgs: ta.List[str] = []
-        for n in os.listdir(root):
-            if os.path.isdir(p := os.path.join(root, n)) and os.path.exists(os.path.join(p, '__init__.py')):
+
+        for n in os.listdir(root_dir):
+            if (
+                    os.path.isdir(p := os.path.join(root_dir, n)) and
+                    os.path.exists(os.path.join(p, '__init__.py'))
+            ):
                 pkgs.append(n)
+
         return pkgs
 
-    def scan_or_discover_pkgs(
+    def _scan_package_root_dir_locked(
+            self,
+            root_dir: str,
+    ) -> ta.Sequence[str]:
+        try:
+            return self._scanned_package_root_dirs[root_dir]
+        except KeyError:
+            pass
+
+        ret = self._scan_package_root_dir_uncached(root_dir)
+        self._scanned_package_root_dirs[root_dir] = ret
+        return ret
+
+    def _scan_package_root_dir(
+            self,
+            root_dir: str,
+    ) -> ta.Sequence[str]:
+        with self._lock:
+            return self._scan_package_root_dir_locked(root_dir)
+
+    def scan_or_discover_packages(
             self,
             *,
-            specified_roots: ta.Optional[ta.Sequence[str]] = None,
-            fallback_root: ta.Optional[str] = None,
+            specified_root_dirs: ta.Optional[ta.Sequence[str]] = None,
+            fallback_root_dir: ta.Optional[str] = None,
     ) -> ta.Sequence[str]:
         pkgs: list[str] = []
 
-        if specified_roots is not None:
-            if isinstance(specified_roots, str):
-                raise TypeError(specified_roots)
-            for r in specified_roots:
-                pkgs.extend(self.scan_pkg_root(r))
+        if specified_root_dirs is not None:
+            if isinstance(specified_root_dirs, str):
+                raise TypeError(specified_root_dirs)
+
+            for r in specified_root_dirs:
+                pkgs.extend(self._scan_package_root_dir(r))
 
         else:
-            pkgs.extend(self.discover_pkgs())
+            pkgs.extend(self.discover_packages())
 
-            if not pkgs and fallback_root is not None:
-                pkgs.extend(self.scan_pkg_root(fallback_root))
+            if not pkgs and fallback_root_dir is not None:
+                pkgs.extend(self._scan_package_root_dir(fallback_root_dir))
 
         return pkgs

{omlish-0.0.0.dev400.dist-info → omlish-0.0.0.dev402.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev400
+Version: 0.0.0.dev402
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -22,7 +22,7 @@ Requires-Dist: trio~=0.30; extra == "all"
 Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.4; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
-Requires-Dist: zstandard~=0.23; extra == "all"
+Requires-Dist: zstandard~=0.24; extra == "all"
 Requires-Dist: brotli~=1.1; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
@@ -63,7 +63,7 @@ Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compress
 Requires-Dist: lz4~=4.4; extra == "compress"
 Requires-Dist: python-snappy~=0.7; extra == "compress"
-Requires-Dist: zstandard~=0.23; extra == "compress"
+Requires-Dist: zstandard~=0.24; extra == "compress"
 Requires-Dist: brotli~=1.1; extra == "compress"
 Provides-Extra: diag
 Requires-Dist: asttokens~=3.0; extra == "diag"

{omlish-0.0.0.dev400.dist-info → omlish-0.0.0.dev402.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=_QVlo8CQjNk-OHJAjF73aaQcYeg4EcZVNzbbBB0SVoU,3576
+omlish/__about__.py,sha256=iDAg-fMcGCRDczeTg78gCXGIynAhZMN-oYTNadqljJ0,3576
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -73,10 +73,10 @@ 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=PIf7XdwVX7Q85-MnyURtX9SKAYolK_r7wls9Z-qAsnA,3911
+omlish/codecs/registry.py,sha256=_s-RKf06dlZhmXNH7Z2qbO8LPEtWeP-wgDAaHp9DFlg,3933
 omlish/codecs/standard.py,sha256=eiZ4u9ep0XrA4Z_D1zJI0vmWyuN8HLrX4Se_r_Cq_ZM,60
 omlish/codecs/text.py,sha256=uHhV8jBgH0iZgcrV0nl4-0a_9ofln4iFH4OXoVm2CW4,5709
-omlish/collections/__init__.py,sha256=oKrHZOcvB0a6onUsbsHGJ7d-sPVbYXBZ4Nt3uYR8OtQ,2805
+omlish/collections/__init__.py,sha256=BIc806ri5Eq-kR03Ya2YfYTRI0g1rn_0haQPUqxXqys,2816
 omlish/collections/abc.py,sha256=p9zhL5oNV5WPyWmMn34fWfkuxPQAjOtL7WQA-Xsyhwk,2628
 omlish/collections/bimap.py,sha256=3szDCscPJlFRtkpyVQNWneg4s50mr6Rd0jdTzVEIcnE,1661
 omlish/collections/coerce.py,sha256=tAls15v_7p5bUN33R7Zbko87KW5toWHl9fRialCqyNY,7030
@@ -431,7 +431,7 @@ omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
 omlish/lang/collections.py,sha256=XI76WcSi4SclWmEGirErg7EzQUfjtmiK2xSK7jJISzY,2528
 omlish/lang/comparison.py,sha256=MOwEG0Yny-jBPHO9kQto9FSRyeNpQW24UABsghkrHxY,1356
-omlish/lang/contextmanagers.py,sha256=7atRNgR13cgynKIgrDZNLq5qAV52xWy8ISeOVaL6HrQ,7627
+omlish/lang/contextmanagers.py,sha256=na4T51jL0SMkC3oEJJsxdbAKgzSrfyFV6h9NCrQ3rX0,7685
 omlish/lang/datetimes.py,sha256=01tg21QOx-PWDlm-CSFTalym3vpqF0EKzeinmtcVNoU,379
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
@@ -467,7 +467,7 @@ omlish/lang/imports/conditional.py,sha256=qxHYlE_xuwPJb6F9K8upagHxuYL0APPLWRVo50
 omlish/lang/imports/lazy.py,sha256=gDv7ffrGsPEAHZ9a1Myt7Uf-4vqWErhCd1DaS7SQL0c,1464
 omlish/lang/imports/proxyinit.py,sha256=prcQSZYdXSvZLsWZClNSOhIJVHNMuO8nD9NTtG-fFv4,12636
 omlish/lang/imports/resolution.py,sha256=DeRarn35Fryg5JhVhy8wbiC9lvr58AnllI9B_reswUE,2085
-omlish/lang/imports/traversal.py,sha256=LLic4zfhsSBzKF33_0qABBcjxfajc57mYRkeuj_Zuns,2855
+omlish/lang/imports/traversal.py,sha256=pbFQIa880NGjSfcLsno2vE_G41_CLwDHb-7gWg2J3BI,2855
 omlish/lifecycles/__init__.py,sha256=1FjYceXs-4fc-S-C9zFYmc2axHs4znnQHcJVHdY7a6E,578
 omlish/lifecycles/abstract.py,sha256=c9UY7oxzYZ_neh5DPE4yv5HfuDv7B4Mj_9Zo-B8KDSs,1114
 omlish/lifecycles/base.py,sha256=DeUxARnOufWfBvhZQbonl1RVJgbrSeK5QNM6dWEuOwA,1398
@@ -518,8 +518,8 @@ 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=Z5afzBJgI0tyTS8mPbYY4pYvoZu_xtdhRBOtZ3IIwzA,929
-omlish/manifests/globals.py,sha256=LZm4ueBjlC023uxL8zvivSyzMgx5O8kSbo9oNfhF_DE,206
-omlish/manifests/loading.py,sha256=iIX4XmQRlaqNMasSPStu3hcB_9t1y6iAFQ-Rydu9rcY,8068
+omlish/manifests/globals.py,sha256=nrA85o8zFTEYv440Y1wgr7SmtW6AE_3jF_Dls6RB_nE,1661
+omlish/manifests/loading.py,sha256=kzJwESneZB1mAK6PsVPXvfNjr-MOXL7bbKQ8gEmbVkU,11984
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=5hQuY-WZ9VMqHZXr-9Dayg380JsnX2vJzXyw6vC6UDs,317
 omlish/marshal/.dataclasses.json,sha256=wXWUy_IR8AolAa2RQnqn_mo2QnmVcvUJmayIykdVl0I,22
@@ -908,9 +908,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.dev400.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev400.dist-info/METADATA,sha256=plSr7XXGzb3LCmxU49UqfaZzRfgAlM003BveHzqlP8M,18825
-omlish-0.0.0.dev400.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev400.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev400.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev400.dist-info/RECORD,,
+omlish-0.0.0.dev402.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev402.dist-info/METADATA,sha256=vvELyku0Fo56crdctExjmjMC0AjhB2p8VclLoR2sxOE,18825
+omlish-0.0.0.dev402.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev402.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev402.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev402.dist-info/RECORD,,