omlish 0.0.0.dev404__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.dev404'
-__revision__ = 'bd964bf904e22ab46e4d3b4f7ec3028f9aed5c9a'
+__version__ = '0.0.0.dev406'
+__revision__ = '0862d2e5f3852ab4290573b9bea974cf1e8103a3'
 
 
 #
@@ -65,7 +65,7 @@ class Project(ProjectBase):
 
         'formats': [
             'orjson ~= 3.11',
-            'ujson ~= 5.10',
+            'ujson ~= 5.11',
 
             'pyyaml ~= 6.0',
 

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/codecs/registry.py

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

omlish/collections/identity.py

@@ -102,6 +102,9 @@ class IdentityWeakKeyDictionary(ta.MutableMapping[K, V]):
 
     See also:
     https://github.com/python-trio/trio/blob/efd785a20721707b52a6e2289a65e25722b30c96/src/trio/_core/_ki.py#L81
+
+    TODO:
+     - audit for freethreaded
     """
 
     def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:

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/lite/contextmanagers.py

@@ -4,8 +4,6 @@ import functools
 import sys
 import typing as ta
 
-from .check import check
-
 
 T = ta.TypeVar('T')
 ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
@@ -50,7 +48,8 @@ class ExitStacked:
         """
 
         with self._exit_stacked_init_wrapper():
-            check.state(self._exit_stack is None)
+            if self._exit_stack is not None:
+                raise RuntimeError
             es = self._exit_stack = contextlib.ExitStack()
             es.__enter__()
             try:
@@ -78,7 +77,8 @@ class ExitStacked:
         pass
 
     def _enter_context(self, cm: ta.ContextManager[T]) -> T:
-        es = check.not_none(self._exit_stack)
+        if (es := self._exit_stack) is None:
+            raise RuntimeError
         return es.enter_context(cm)
 
 
@@ -107,7 +107,8 @@ class AsyncExitStacked:
     @ta.final
     async def __aenter__(self: AsyncExitStackedT) -> AsyncExitStackedT:
         async with self._async_exit_stacked_init_wrapper():
-            check.state(self._exit_stack is None)
+            if self._exit_stack is not None:
+                raise RuntimeError
             es = self._exit_stack = contextlib.AsyncExitStack()
             await es.__aenter__()
             try:
@@ -135,11 +136,13 @@ class AsyncExitStacked:
         pass
 
     def _enter_context(self, cm: ta.ContextManager[T]) -> T:
-        es = check.not_none(self._exit_stack)
+        if (es := self._exit_stack) is None:
+            raise RuntimeError
         return es.enter_context(cm)
 
     async def _enter_async_context(self, cm: ta.AsyncContextManager[T]) -> T:
-        es = check.not_none(self._exit_stack)
+        if (es := self._exit_stack) is None:
+            raise RuntimeError
         return await es.enter_async_context(cm)
 
 

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/globals.py

@@ -1,5 +1,6 @@
-# ruff: noqa: UP045
+# ruff: noqa: UP006 UP045
 # @omlish-lite
+import os
 import threading
 import typing as ta
 
@@ -7,6 +8,9 @@ from ..lite.marshal import unmarshal_obj
 from .loading import ManifestLoader
 
 
+T = ta.TypeVar('T')
+
+
 ##
 
 
@@ -28,17 +32,20 @@ class GlobalManifestLoader:
         if (inst := cls._instance) is None:
             with cls._lock:
                 if (inst := cls._instance) is None:
-                    inst = cls._instance = ManifestLoader(**cls.default_kwargs())
+                    inst = cls._instance = ManifestLoader(cls.default_config())
 
         return inst
 
     @classmethod
-    def initialize(cls, **kwargs: ta.Any) -> ManifestLoader:
+    def initialize(cls, config: ta.Optional[ManifestLoader.Config] = None) -> ManifestLoader:
         with cls._lock:
             if cls._instance is not None:
-                raise Exception(f'{cls.__name__} already initialized')
+                raise RuntimeError(f'{cls.__name__} already initialized')
+
+            if config is None:
+                config = cls.default_config()
 
-            inst = cls._instance = ManifestLoader(**kwargs)
+            inst = cls._instance = ManifestLoader(config)
 
         return inst
 
@@ -49,8 +56,11 @@ class GlobalManifestLoader:
         return unmarshal_obj(kwargs, obj_cls)
 
     @classmethod
-    def default_kwargs(cls) -> ta.Mapping[str, ta.Any]:
-        return dict(
+    def default_config(cls) -> ManifestLoader.Config:
+        return ManifestLoader.Config(
+            discover_packages=True,
+            discover_packages_fallback_scan_root_dirs=[os.getcwd()],
+
             value_instantiator=cls.default_value_instantiator,
         )
 
@@ -59,10 +69,35 @@ class GlobalManifestLoader:
     @classmethod
     def load(
             cls,
-            *pkg_names: str,
-            only: ta.Optional[ta.Iterable[type]] = None,
+            *,
+            packages: ta.Optional[ta.Collection[str]] = None,
+            classes: ta.Optional[ta.Collection[type]] = None,
     ) -> ta.Sequence[ManifestLoader.LoadedManifest]:
         return cls.instance().load(
-            *pkg_names,
-            only=only,
+            packages=packages,
+            classes=classes,
+        )
+
+    @classmethod
+    def load_values(
+            cls,
+            *,
+            packages: ta.Optional[ta.Collection[str]] = None,
+            classes: ta.Optional[ta.Collection[type]] = None,
+    ) -> ta.Sequence[ta.Any]:
+        return cls.instance().load_values(
+            packages=packages,
+            classes=classes,
+        )
+
+    @classmethod
+    def load_values_of(
+            cls,
+            clz: ta.Type[T],
+            *,
+            packages: ta.Optional[ta.Collection[str]] = None,
+    ) -> ta.Sequence[T]:
+        return cls.instance().load_values_of(
+            clz,
+            packages=packages,
         )