omlish 0.0.0.dev405__py3-none-any.whl → 0.0.0.dev406__py3-none-any.whl

omlish/.manifests.json

@@ -5,9 +5,9 @@
     "file": "omlish/bootstrap/__main__.py",
     "line": 1,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "bootstrap",
-        "mod_name": "omlish.bootstrap.__main__"
+      "!omdev.cli.types.CliModule": {
+        "name": "bootstrap",
+        "module": "omlish.bootstrap.__main__"
       }
     }
   },
@@ -17,9 +17,9 @@
     "file": "omlish/diag/procfs.py",
     "line": 361,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "procfs",
-        "mod_name": "omlish.diag.procfs"
+      "!omdev.cli.types.CliModule": {
+        "name": "procfs",
+        "module": "omlish.diag.procfs"
       }
     }
   },
@@ -29,9 +29,9 @@
     "file": "omlish/formats/cbor.py",
     "line": 30,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.cbor",
-        "attr_name": "CBOR_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.cbor",
+        "attr": "CBOR_CODEC",
         "name": "cbor",
         "aliases": null
       }
@@ -43,9 +43,9 @@
     "file": "omlish/formats/cloudpickle.py",
     "line": 30,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.cloudpickle",
-        "attr_name": "CLOUDPICKLE_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.cloudpickle",
+        "attr": "CLOUDPICKLE_CODEC",
         "name": "cloudpickle",
         "aliases": null
       }
@@ -57,9 +57,9 @@
     "file": "omlish/formats/edn/codec.py",
     "line": 25,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.edn.codec",
-        "attr_name": "EDN_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.edn.codec",
+        "attr": "EDN_CODEC",
         "name": "edn",
         "aliases": null
       }
@@ -71,9 +71,9 @@
     "file": "omlish/formats/ini/codec.py",
     "line": 25,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.ini.codec",
-        "attr_name": "INI_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.ini.codec",
+        "attr": "INI_CODEC",
         "name": "ini",
         "aliases": null
       }
@@ -85,9 +85,9 @@
     "file": "omlish/formats/json/codecs.py",
     "line": 14,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json.codecs",
-        "attr_name": "JSON_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json.codecs",
+        "attr": "JSON_CODEC",
         "name": "json",
         "aliases": null
       }
@@ -99,9 +99,9 @@
     "file": "omlish/formats/json/codecs.py",
     "line": 21,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json.codecs",
-        "attr_name": "JSON_COMPACT_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json.codecs",
+        "attr": "JSON_COMPACT_CODEC",
         "name": "json-compact",
         "aliases": null
       }
@@ -113,9 +113,9 @@
     "file": "omlish/formats/json/codecs.py",
     "line": 28,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json.codecs",
-        "attr_name": "JSON_PRETTY_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json.codecs",
+        "attr": "JSON_PRETTY_CODEC",
         "name": "json-pretty",
         "aliases": null
       }
@@ -127,9 +127,9 @@
     "file": "omlish/formats/json5/codec.py",
     "line": 73,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.json5.codec",
-        "attr_name": "JSON5_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.json5.codec",
+        "attr": "JSON5_CODEC",
         "name": "json5",
         "aliases": null
       }
@@ -141,9 +141,9 @@
     "file": "omlish/formats/pickle.py",
     "line": 30,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.pickle",
-        "attr_name": "PICKLE_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.pickle",
+        "attr": "PICKLE_CODEC",
         "name": "pickle",
         "aliases": null
       }
@@ -155,9 +155,9 @@
     "file": "omlish/formats/repr.py",
     "line": 24,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.repr",
-        "attr_name": "REPR_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.repr",
+        "attr": "REPR_CODEC",
         "name": "repr",
         "aliases": null
       }
@@ -169,9 +169,9 @@
     "file": "omlish/formats/toml/codec.py",
     "line": 16,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.toml.codec",
-        "attr_name": "TOML_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.toml.codec",
+        "attr": "TOML_CODEC",
         "name": "toml",
         "aliases": null
       }
@@ -183,9 +183,9 @@
     "file": "omlish/formats/yaml.py",
     "line": 255,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.yaml",
-        "attr_name": "YAML_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.yaml",
+        "attr": "YAML_CODEC",
         "name": "yaml",
         "aliases": [
           "yml"
@@ -199,9 +199,9 @@
     "file": "omlish/formats/yaml.py",
     "line": 262,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.formats.yaml",
-        "attr_name": "YAML_UNSAFE_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.formats.yaml",
+        "attr": "YAML_UNSAFE_CODEC",
         "name": "yaml-unsafe",
         "aliases": null
       }
@@ -213,9 +213,9 @@
     "file": "omlish/io/compress/brotli.py",
     "line": 46,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.brotli",
-        "attr_name": "BROTLI_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.brotli",
+        "attr": "BROTLI_CODEC",
         "name": "brotli",
         "aliases": null
       }
@@ -227,9 +227,9 @@
     "file": "omlish/io/compress/bz2.py",
     "line": 60,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.bz2",
-        "attr_name": "BZ2_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.bz2",
+        "attr": "BZ2_CODEC",
         "name": "bz2",
         "aliases": null
       }
@@ -241,9 +241,9 @@
     "file": "omlish/io/compress/gzip.py",
     "line": 349,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.gzip",
-        "attr_name": "GZIP_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.gzip",
+        "attr": "GZIP_CODEC",
         "name": "gzip",
         "aliases": [
           "gz"
@@ -257,9 +257,9 @@
     "file": "omlish/io/compress/lz4.py",
     "line": 90,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.lz4",
-        "attr_name": "LZ4_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.lz4",
+        "attr": "LZ4_CODEC",
         "name": "lz4",
         "aliases": null
       }
@@ -271,9 +271,9 @@
     "file": "omlish/io/compress/lzma.py",
     "line": 80,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.lzma",
-        "attr_name": "LZMA_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.lzma",
+        "attr": "LZMA_CODEC",
         "name": "lzma",
         "aliases": null
       }
@@ -285,9 +285,9 @@
     "file": "omlish/io/compress/snappy.py",
     "line": 33,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.snappy",
-        "attr_name": "SNAPPY_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.snappy",
+        "attr": "SNAPPY_CODEC",
         "name": "snappy",
         "aliases": null
       }
@@ -299,9 +299,9 @@
     "file": "omlish/io/compress/zlib.py",
     "line": 73,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.zlib",
-        "attr_name": "ZLIB_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.zlib",
+        "attr": "ZLIB_CODEC",
         "name": "zlib",
         "aliases": null
       }
@@ -313,9 +313,9 @@
     "file": "omlish/io/compress/zstd.py",
     "line": 51,
     "value": {
-      "$.codecs.base.LazyLoadedCodec": {
-        "mod_name": "omlish.io.compress.zstd",
-        "attr_name": "ZSTD_CODEC",
+      "!.codecs.base.LazyLoadedCodec": {
+        "module": "omlish.io.compress.zstd",
+        "attr": "ZSTD_CODEC",
         "name": "zstd",
         "aliases": null
       }
@@ -327,9 +327,9 @@
     "file": "omlish/os/pidfiles/__main__.py",
     "line": 1,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "pidfiles",
-        "mod_name": "omlish.os.pidfiles.__main__"
+      "!omdev.cli.types.CliModule": {
+        "name": "pidfiles",
+        "module": "omlish.os.pidfiles.__main__"
       }
     }
   },
@@ -339,9 +339,9 @@
     "file": "omlish/secrets/pwgen.py",
     "line": 78,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "pwgen",
-        "mod_name": "omlish.secrets.pwgen"
+      "!omdev.cli.types.CliModule": {
+        "name": "pwgen",
+        "module": "omlish.secrets.pwgen"
       }
     }
   },
@@ -351,12 +351,12 @@
     "file": "omlish/specs/jmespath/__main__.py",
     "line": 1,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": [
+      "!omdev.cli.types.CliModule": {
+        "name": [
           "jmespath",
           "jp"
         ],
-        "mod_name": "omlish.specs.jmespath.__main__"
+        "module": "omlish.specs.jmespath.__main__"
       }
     }
   }

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev405'
-__revision__ = '2845f7bb7c8df0a75acb7e7dece1fc712a54aa05'
+__version__ = '0.0.0.dev406'
+__revision__ = '0862d2e5f3852ab4290573b9bea974cf1e8103a3'
 
 
 #

omlish/bootstrap/__main__.py

@@ -1,7 +1,7 @@
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'bootstrap',
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'bootstrap',
+    'module': __name__,
 }}
 
 

omlish/codecs/base.py

@@ -95,13 +95,13 @@ class LazyLoadedCodec(ModAttrManifest):
     @classmethod
     def new(
             cls,
-            mod_name: str,
-            attr_name: str,
+            module: str,
+            attr: str,
             codec: Codec,
     ) -> 'LazyLoadedCodec':
         return cls(
-            mod_name=mod_name,
-            attr_name=attr_name,
+            module=module,
+            attr=attr,
             name=codec.name,
             aliases=codec.aliases,
         )

omlish/diag/procfs.py

@@ -359,9 +359,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'procfs',
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'procfs',
+    'module': __name__,
 }}
 
 

omlish/formats/codecs.py

@@ -85,12 +85,12 @@ def make_str_object_codec(
 
 
 def make_object_lazy_loaded_codec(
-        mod_name: str,
-        attr_name: str,
+        module: str,
+        attr: str,
         codec: ObjectCodec,
 ) -> codecs.LazyLoadedCodec:
     return codecs.LazyLoadedCodec.new(
-        mod_name,
-        attr_name,
+        module,
+        attr,
         codec,
     )

omlish/io/compress/codecs.py

@@ -67,12 +67,12 @@ def make_compression_codec(
 
 
 def make_compression_lazy_loaded_codec(
-        mod_name: str,
-        attr_name: str,
+        module: str,
+        attr: str,
         codec: CompressionCodec,
 ) -> codecs.LazyLoadedCodec:
     return codecs.LazyLoadedCodec.new(
-        mod_name,
-        attr_name,
+        module,
+        attr,
         codec,
     )

omlish/manifests/base.py

@@ -12,14 +12,14 @@ NameAliasesManifestT = ta.TypeVar('NameAliasesManifestT', bound='NameAliasesMani
 
 @dc.dataclass(frozen=True)
 class ModAttrManifest:
-    mod_name: str
-    attr_name: str
+    module: str
+    attr: str
 
     def load(self) -> ta.Any:
         import importlib  # noqa
 
-        mod = importlib.import_module(self.mod_name)
-        return getattr(mod, self.attr_name)
+        mod = importlib.import_module(self.module)
+        return getattr(mod, self.attr)
 
 
 ##

omlish/manifests/loading.py

@@ -31,35 +31,42 @@ class ManifestLoader:
         def __init__(
                 self,
                 package: 'ManifestLoader.LoadedPackage',
-                manifest: Manifest,
+                resolved: 'ManifestLoader._ResolvedManifest',
         ) -> None:
             super().__init__()
 
             self._package = package
-            self._manifest = manifest
-
-            [(cls_key, value_dct)] = self._manifest.value.items()  # noqa
-            self._cls_key = cls_key
+            self._resolved = resolved
 
         def __repr__(self) -> str:
-            return f'{self.__class__.__name__}@{id(self):x}(package={self._package!r}, class_key={self._cls_key!r})'
+            return (
+                f'{self.__class__.__name__}@{id(self):x}('
+                f'package={self._package.name!r}, '
+                f'module={self._resolved.module!r}, '
+                f'class_key={self._resolved.class_key!r}'
+                f')'
+            )
 
         @property
         def package(self) -> 'ManifestLoader.LoadedPackage':
             return self._package
 
+        @property
+        def module(self) -> str:
+            return self._resolved.module
+
+        @property
+        def class_key(self) -> str:
+            return self._resolved.class_key
+
         @property
         def manifest(self) -> Manifest:
-            return self._manifest
+            return self._resolved.manifest
 
         @property
         def loader(self) -> 'ManifestLoader':
             return self._package.loader
 
-        @property
-        def class_key(self) -> str:
-            return self._cls_key
-
         _value: ta.Any
 
         def value(self) -> ta.Any:
@@ -68,7 +75,7 @@ class ManifestLoader:
             except AttributeError:
                 pass
 
-            value = self.loader._instantiate_loaded_manifest(self)  # noqa
+            value = self.loader._instantiate_resolved_manifest(self._resolved)  # noqa
             self._value = value
             return value
 
@@ -86,7 +93,7 @@ class ManifestLoader:
         _manifests: ta.Sequence['ManifestLoader.LoadedManifest']
 
         def __repr__(self) -> str:
-            return f'{self.__class__.__name__}(name={self._name!r})'
+            return f'{self.__class__.__name__}@{id(self):x}(name={self._name!r})'
 
         @property
         def loader(self) -> 'ManifestLoader':
@@ -287,14 +294,19 @@ class ManifestLoader:
 
     ##
 
+    @dc.dataclass()
     class ClassKeyError(Exception):
-        pass
+        key: str
+        module: ta.Optional[str] = None
 
     def _load_class_uncached(self, key: str) -> type:
-        if not key.startswith('$'):
+        if not key.startswith('!'):
             raise ManifestLoader.ClassKeyError(key)
 
         parts = key[1:].split('.')
+        if '' in parts:
+            raise ManifestLoader.ClassKeyError(key)
+
         pos = next(i for i, p in enumerate(parts) if p[0].isupper())
 
         mod_name = '.'.join(parts[:pos])
@@ -330,37 +342,79 @@ class ManifestLoader:
             raise TypeError(cls)
         mod_name = cls.__module__
         mod_name = self._module_reverse_remap.get(mod_name, mod_name)
-        return f'${mod_name}.{cls.__qualname__}'
+        return f'!{mod_name}.{cls.__qualname__}'
+
+    ##
+
+    class _ResolvedManifest(ta.NamedTuple):
+        manifest: Manifest
+        package: str
+
+        module: str
+        class_key: str
+        value_dct: ta.Any
+
+    @classmethod
+    def _resolve_raw_manifest(
+            cls,
+            m: Manifest,
+            *,
+            package_name: str,
+    ) -> _ResolvedManifest:
+        # self._module = module
+        # self._class_key = class_key
+        if not m.module.startswith('.'):
+            raise NameError(m.module)
+
+        module = package_name + m.module
+
+        [(class_key, value_dct)] = m.value.items()
+
+        if not class_key.startswith('!'):
+            raise ManifestLoader.ClassKeyError(class_key, module=module)
+
+        if class_key.startswith('!.'):
+            class_key = f'!{package_name}{class_key[1:]}'
+
+        # FIXME: move to builder
+        # elif key.startswith('$.'):
+        #     if module.startswith('.'):
+        #         raise NameError(module)
+        #     kl = key[1:].split('.')
+        #     ml = module.split('.')
+        #     lvl = len(kl) - kl[::-1].index('')
+        #     if lvl >= len(ml):
+        #         raise ManifestLoader.ClassKeyError(key, module=module)
+        #     rn = '.'.join([*ml[:-lvl], *kl[lvl:]])
+        #     return f'${rn}'
+
+        return ManifestLoader._ResolvedManifest(
+            manifest=m,
+            package=package_name,
+
+            module=module,
+            class_key=class_key,
+            value_dct=value_dct,
+        )
 
     ##
 
-    def _deserialize_raw_manifests(self, obj: ta.Any, pkg_name: str) -> ta.Sequence[Manifest]:
+    @classmethod
+    def _deserialize_raw_manifests(cls, obj: ta.Any) -> ta.Sequence[Manifest]:
         if not isinstance(obj, (list, tuple)):
             raise TypeError(obj)
 
         lst: ta.List[Manifest] = []
         for e in obj:
-            m = Manifest(**e)
-
-            m = dc.replace(m, module=pkg_name + m.module)
-
-            [(key, value_dct)] = m.value.items()
-            if not key.startswith('$'):
-                raise ManifestLoader.ClassKeyError(key)
-            if key.startswith('$.'):
-                key = f'${pkg_name}{key[1:]}'
-                m = dc.replace(m, value={key: value_dct})
-
-            lst.append(m)
+            lst.append(Manifest(**e))
 
         return lst
 
-    #
-
-    def _read_package_file_text(self, pkg_name: str, file_name: str) -> ta.Optional[str]:
+    @classmethod
+    def _read_package_file_text(cls, package_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)
+        spec = importlib.util.find_spec(package_name)
         if (
                 spec is not None and
                 isinstance(spec.loader, importlib.machinery.SourceFileLoader) and
@@ -375,17 +429,16 @@ class ManifestLoader:
                     return f.read()
 
         from importlib import resources as importlib_resources  # noqa
-        t = importlib_resources.files(pkg_name).joinpath(file_name)
+        t = importlib_resources.files(package_name).joinpath(file_name)
         if not t.is_file():
             return None
         return t.read_text('utf-8')
 
-    #
-
     MANIFESTS_FILE_NAME: ta.ClassVar[str] = '.manifests.json'
 
-    def _load_package_uncached(self, pkg_name: str) -> ta.Optional[LoadedPackage]:
-        src = self._read_package_file_text(pkg_name, self.MANIFESTS_FILE_NAME)
+    @classmethod
+    def _read_package_raw_manifests(cls, package_name: str) -> ta.Optional[ta.Sequence[Manifest]]:
+        src = cls._read_package_file_text(package_name, cls.MANIFESTS_FILE_NAME)
         if src is None:
             return None
 
@@ -393,13 +446,21 @@ class ManifestLoader:
         if not isinstance(obj, (list, tuple)):
             raise TypeError(obj)
 
-        raw_lst = self._deserialize_raw_manifests(obj, pkg_name)
+        return cls._deserialize_raw_manifests(obj)
+
+    ##
+
+    def _load_package_uncached(self, package_name: str) -> ta.Optional[LoadedPackage]:
+        if (raw_lst := self._read_package_raw_manifests(package_name)) is None:
+            return None
 
-        ld_pkg = ManifestLoader.LoadedPackage(self, pkg_name)
+        ld_pkg = ManifestLoader.LoadedPackage(self, package_name)
 
         ld_man_lst: ta.List[ManifestLoader.LoadedManifest] = []
         for raw in raw_lst:
-            ld_man = ManifestLoader.LoadedManifest(ld_pkg, raw)
+            rsv = self._resolve_raw_manifest(raw, package_name=package_name)
+
+            ld_man = ManifestLoader.LoadedManifest(ld_pkg, rsv)
 
             ld_man_lst.append(ld_man)
 
@@ -407,19 +468,19 @@ class ManifestLoader:
 
         return ld_pkg
 
-    def _load_package_locked(self, pkg_name: str) -> ta.Optional[LoadedPackage]:
+    def _load_package_locked(self, package_name: str) -> ta.Optional[LoadedPackage]:
         try:
-            return self._loaded_packages[pkg_name]
+            return self._loaded_packages[package_name]
         except KeyError:
             pass
 
-        pkg = self._load_package_uncached(pkg_name)
-        self._loaded_packages[pkg_name] = pkg
+        pkg = self._load_package_uncached(package_name)
+        self._loaded_packages[package_name] = pkg
         return pkg
 
-    def load_package(self, pkg_name: str) -> ta.Optional[LoadedPackage]:
+    def load_package(self, package_name: str) -> ta.Optional[LoadedPackage]:
         with self._lock:
-            return self._load_package_locked(pkg_name)
+            return self._load_package_locked(package_name)
 
     ##
 
@@ -429,10 +490,9 @@ class ManifestLoader:
         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)
+    def _instantiate_resolved_manifest(self, resolved: _ResolvedManifest) -> ta.Any:
+        cls = self._load_class(resolved.class_key)
+        value = self._instantiate_value(cls, **resolved.value_dct)
         return value
 
     ##

omlish/manifests/static.py

@@ -13,8 +13,8 @@ class StaticModAttrManifest(dc.Static, ModAttrManifest, abc.ABC):
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         if (
                 not (lang.is_abstract_class(cls) or abc.ABC in cls.__bases__) and
-                'mod_name' not in cls.__dict__
+                'module' not in cls.__dict__
         ):
-            setattr(cls, 'mod_name', cls.__module__)
+            setattr(cls, 'module', cls.__module__)
 
         super().__init_subclass__(**kwargs)

omlish/manifests/types.py

@@ -9,7 +9,7 @@ import typing as ta
 
 @dc.dataclass(frozen=True)
 class ManifestOrigin:
-    module: str
+    module: str  # Always starts with exactly one '.'
     attr: ta.Optional[str]  # None if inline
 
     file: str
@@ -18,4 +18,4 @@ class ManifestOrigin:
 
 @dc.dataclass(frozen=True)
 class Manifest(ManifestOrigin):
-    value: ta.Any
+    value: ta.Any  # [{class_key: value_dct}], where class_key is of the form `!.foo.bar.Class` or `!baz.quz.Class`

omlish/os/pidfiles/__main__.py

@@ -1,7 +1,7 @@
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'pidfiles',
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'pidfiles',
+    'module': __name__,
 }}
 
 

omlish/secrets/pwgen.py

@@ -76,9 +76,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'pwgen',
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'pwgen',
+    'module': __name__,
 }}
 
 

omlish/specs/jmespath/__main__.py

@@ -1,7 +1,7 @@
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': ['jmespath', 'jp'],
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': ['jmespath', 'jp'],
+    'module': __name__,
 }}
 
 

{omlish-0.0.0.dev405.dist-info → omlish-0.0.0.dev406.dist-info}/METADATA

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

{omlish-0.0.0.dev405.dist-info → omlish-0.0.0.dev406.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omlish/.manifests.json,sha256=ftpXGlXqsqDmBh0eWXtndZBLj8Y6QVhS5g5lKgEAf3U,8587
-omlish/__about__.py,sha256=Zu2-AzTYNiCm8KVyeTpwqEU8oCTBUlyG8PBMsAwgeQI,3601
+omlish/.manifests.json,sha256=uUbe0oz6BFhBWIVdOyiGxkVqyLfiT8LAeqlxAHWpZLY,8410
+omlish/__about__.py,sha256=2BfLZ_Ga1VoW31FlBXVEirUy13Z-sUha0SeHaypArCM,3601
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -61,7 +61,7 @@ omlish/asyncs/ioproxy/proxier.py,sha256=dYXiVkDJVCzasMP4eMNSvSO1eNsd6CIRTtLyoa8Y
 omlish/asyncs/ioproxy/proxy.py,sha256=s9bnjVPkTVtW5dh_vcpKNwbzEhA2zZZKF-U1BWZ5LPo,3911
 omlish/asyncs/ioproxy/typing.py,sha256=ZM-9HRO4dpy-RqomSkyRha9s901ckL30bwjACi2TJ8s,2475
 omlish/bootstrap/__init__.py,sha256=JgP3xsEsCphIQs2jI4um2uPI0RN8nCPMXl6FuiPC1js,700
-omlish/bootstrap/__main__.py,sha256=4jCwsaogp0FrJjJZ85hzF4-WqluPeheHbfeoKynKvNs,194
+omlish/bootstrap/__main__.py,sha256=GKhsZdPdJtzE4qnjt34-EvL07nLJVZD-d8nxfGl7EEI,188
 omlish/bootstrap/base.py,sha256=d8hqn4hp1XMMi5PgcJBQXPKmW47epu8CxBlqDZiRZb4,1073
 omlish/bootstrap/diag.py,sha256=nTHKrZBdyEYoTpctwOpwzSMbQ2dROGkxpdzWfoe2xZg,5353
 omlish/bootstrap/harness.py,sha256=BMFNTYG03V74WFW5zd6aaxIb6uzGeldiR3VX2alQwlU,1994
@@ -69,7 +69,7 @@ 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=IVnJlduvhiH1imul4DPhl2gHBWS76774AV5h86dX0ls,2214
+omlish/codecs/base.py,sha256=nKAQKF0985xosHIP0mAkUZnr8lfHFj66ShnxL0OfdQE,2193
 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
@@ -211,7 +211,7 @@ omlish/diag/asts.py,sha256=MWh9XAG3m9L10FIJCyoNT2aU4Eft6tun_x9K0riq6Dk,3332
 omlish/diag/debug.py,sha256=ClED7kKXeVMyKrjGIxcq14kXk9kvUJfytBQwK9y7c4Q,1637
 omlish/diag/lslocks.py,sha256=VuA4MNNqXTcnHWsJvulGM6pNJRKmlXFXUZTfXpY0V6g,1750
 omlish/diag/lsof.py,sha256=5N5aZQ7UqEBgV-hj3_a8QcvALOeLlVb8otqF2hvucxY,9107
-omlish/diag/procfs.py,sha256=KaGTAA2Gj8eEEp7MjClRe4aimwzd-HDABThFzvq2cBQ,9684
+omlish/diag/procfs.py,sha256=L-n-U8s76QwWpzwkS4AP7CJp2_V-sy3QXvYKVTFxcAE,9678
 omlish/diag/procstats.py,sha256=EJEe2Zc58ykBoTfqMXro7H52aQa_pd6uC2hsIPFceso,825
 omlish/diag/ps.py,sha256=MEpMU6fbkh0bSWrOHh_okOa0JDTUSUQUVSYBdh1TGvE,1672
 omlish/diag/pycharm.py,sha256=9Mgn5T2ZdlEUL3VV-GzVmCBs_ZtIpLwaUzP6pgHEUEo,4712
@@ -249,7 +249,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=HBQzco_BT73xshv2l8FrDTaAKTH-A8Y4vXiabXPELGY,1655
+omlish/formats/codecs.py,sha256=n_02fv1Qk2ixG9vDkTZKdRHGWPKnvDBDdOMVKfnElOI,1641
 omlish/formats/dotenv.py,sha256=60RHhpNmLhqT7ISeA79MmSc7Sq8AxF5nKj7VPjdroZU,19320
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=rPycJ-_b76NSNc2b_dZ0F0zyKzuXK8v6K6fqcV8uCRQ,18933
@@ -403,7 +403,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=dpJKoELXy_xF5nLnQYGNu19tmHEaUPyyk7fVsOlXsWk,1790
+omlish/io/compress/codecs.py,sha256=aN7XJnWdB-wCIaHVucTosdroQDfmNniXux5121MA5zg,1776
 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
@@ -517,11 +517,11 @@ 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=Z5afzBJgI0tyTS8mPbYY4pYvoZu_xtdhRBOtZ3IIwzA,929
+omlish/manifests/base.py,sha256=Dt44a3qppWaxkoi3naFFMetxbxw14qnz2naTKK93GNU,915
 omlish/manifests/globals.py,sha256=kVqQ-fT4kc7xWzLHoI731GviitFPv2v2yqw-p7t7Exs,2628
-omlish/manifests/loading.py,sha256=tnAxvyJRAncyKihaBH8oqcJmHKaunPXm1Y1OpAi3iQc,15870
-omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
-omlish/manifests/types.py,sha256=5hQuY-WZ9VMqHZXr-9Dayg380JsnX2vJzXyw6vC6UDs,317
+omlish/manifests/loading.py,sha256=guLx-3y4rqQ2YIgTtqlpCk59inePtcEUE19JrWDzleM,17639
+omlish/manifests/static.py,sha256=9BaPBLkuzxHmg5A-5k9BjjBFINCdmFOIu06dMFgCfz4,497
+omlish/manifests/types.py,sha256=NeOGuIVrcbqjCDbQ3MnCxxHAgHnw0CkWJsBzo230PWE,453
 omlish/marshal/.dataclasses.json,sha256=wXWUy_IR8AolAa2RQnqn_mo2QnmVcvUJmayIykdVl0I,22
 omlish/marshal/__init__.py,sha256=yquxGmP5r4ITDbR1_OCTy1y9Y5vU7SKL1gj467RVJkg,3554
 omlish/marshal/base.py,sha256=3GMrhJBcnVrVtlQRQLOMgvV66MciAYpHKEQi5Ns3dIk,11853
@@ -596,7 +596,7 @@ omlish/os/deathpacts/base.py,sha256=EGN3BWSXPv0s9kl_QLrWE31hTybDHCmsLc_w3U2VyHc,
 omlish/os/deathpacts/heartbeatfile.py,sha256=OybdvhM2kxBTuoJWOJJ5LcX-0lg3jTOvvD2HUunxDWU,1731
 omlish/os/deathpacts/pipe.py,sha256=mfN2UGsOaEmoh4jHi6D0vnjg420pNsyctb3ZTcNsdqI,3285
 omlish/os/pidfiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/os/pidfiles/__main__.py,sha256=AF8TwjK4xgHVnoLAP9dIWgKvT0vGhHJlfDW0tKZ7tx4,200
+omlish/os/pidfiles/__main__.py,sha256=nfjVxFY9I2I7hfb81rCxX6zm2Rc3P87ySpUouy33vG8,194
 omlish/os/pidfiles/cli.py,sha256=dAKukx4mrarH8t7KZM4n_XSfTk3ycShGAFqRrirK5dw,2079
 omlish/os/pidfiles/manager.py,sha256=oOnL90ttOG5ba_k9XPJ18reP7M5S-_30ln4OAfYV5W8,2357
 omlish/os/pidfiles/pidfile.py,sha256=KlqrW7I-lYVDNJspFHE89i_A0HTTteT5B99b7vpTfNs,4400
@@ -611,7 +611,7 @@ omlish/secrets/all.py,sha256=xx1UyiokSFzdeR8c6Ro-Fi2XBUsQ2i0nR1foX12nH0c,464
 omlish/secrets/crypto.py,sha256=9D21lnvPhStwu8arD4ssT0ih0bDG-nlqIRdVgYL40xA,3708
 omlish/secrets/marshal.py,sha256=u90n1OfRfdpH1T2F0xK_pAPH1ENYL6acFt6XdVd3KvI,1986
 omlish/secrets/openssl.py,sha256=UT_dXJ4zA1s9e-UHoW_NLGHQO7iouUNPnJNkkpuw3JI,6213
-omlish/secrets/pwgen.py,sha256=5k7QMSysUfv9F65TDMdDlrhTIKy6QbMG3KT2HNVmnVg,1712
+omlish/secrets/pwgen.py,sha256=Z5i1qMKK4idOZvWai5dXkI59gX7pYzFFlFYAj7qEmqA,1706
 omlish/secrets/pwhash.py,sha256=Jctv3QzcMvVPXJsWA3w3LDUlzmyUDGEWG9sLiJz1xaw,4107
 omlish/secrets/secrets.py,sha256=kGYUS0fyZEBdWyWhv_uroyZqz31bwuXwk9FAQMZIvdo,8012
 omlish/secrets/ssl.py,sha256=HnH5MS31X9Uid7Iw1CWqviaVwMLF1Ha8RxZiiE-_iF8,158
@@ -652,7 +652,7 @@ omlish/specs/irc/protocol/tags.py,sha256=M89vR2GgDNroEsiH2QNchVX2LmT6sMIXY7huTEv
 omlish/specs/irc/protocol/utils.py,sha256=tUbkShJov8oCsbg1KZE1EC5pCThXJTdXFcw0HBM5ApQ,692
 omlish/specs/jmespath/LICENSE,sha256=IH-ZZlZkS8XMkf_ubNVD1aYHQ2l_wd0tmHtXrCcYpRU,1113
 omlish/specs/jmespath/__init__.py,sha256=pppE1MqDU1mRchMZehpwLleMHDO-QGAGJKOKuAyuaiE,2187
-omlish/specs/jmespath/__main__.py,sha256=wIXm6bs08etNG_GZlN2rBkADPb0rKfL2HSkm8spnpxw,200
+omlish/specs/jmespath/__main__.py,sha256=AkowPx7ASpK0E4EMq0MiwVarLDB7alConH-2mBOGYIA,194
 omlish/specs/jmespath/ast.py,sha256=qX8jiqyUZMSLtlmyORSEHM7jwMDTtoqCPM5tZPWtB6g,5648
 omlish/specs/jmespath/cli.py,sha256=oQ8u8sKM9kysB2rGChXrCl7RgsUgo6MNrWtzdLz4eIA,2147
 omlish/specs/jmespath/errors.py,sha256=sU0eqKUpgjnqNsk2UhiJRXTApMhLDfgvBaKE5RZFFIA,4440
@@ -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.dev405.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev405.dist-info/METADATA,sha256=y4Y668MaUQry-Qf4i3hWdu6-nugPJgTmu-hknnshYZI,18881
-omlish-0.0.0.dev405.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev405.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev405.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev405.dist-info/RECORD,,
+omlish-0.0.0.dev406.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev406.dist-info/METADATA,sha256=Pl8H4Xc-s6SxmB3XfirBXAfdyOb6tPhDnhR0h0zk6r0,18881
+omlish-0.0.0.dev406.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev406.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev406.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev406.dist-info/RECORD,,