omdev 0.0.0.dev404__py3-none-any.whl → 0.0.0.dev406__py3-none-any.whl

omdev/cli/main.py

@@ -6,7 +6,6 @@ TODO:
 """
 import argparse
 import dataclasses as dc
-import os
 import runpy
 import sys
 import typing as ta
@@ -62,20 +61,20 @@ class CliCmdSet:
     def _make_entry(self, cmd: CliCmd) -> Entry:
         help_path: StrTuple | None
 
-        if isinstance(cmd.cmd_name, str):
-            ns = [cmd.cmd_name]
+        if isinstance(cmd.name, str):
+            ns = [cmd.name]
         else:
-            ns = list(cmd.cmd_name)
+            ns = list(cmd.name)
         exec_paths = [tuple(n.split('/')) for n in ns]
 
-        if isinstance(cmd.cmd_name, str) and cmd.cmd_name[0] == '_':
+        if isinstance(cmd.name, str) and cmd.name[0] == '_':
             help_path = None
 
         elif isinstance(cmd, CliFunc):
             help_path = ('-', *exec_paths[0])
 
         elif isinstance(cmd, CliModule):
-            help_path = (cmd.mod_name.partition('.')[0], *exec_paths[0])
+            help_path = (cmd.module.partition('.')[0], *exec_paths[0])
 
         else:
             raise TypeError(cmd)
@@ -129,10 +128,10 @@ class CliCmdSet:
             if h in c:
                 raise NameError(e)
 
-            if isinstance(e.cmd.cmd_name, str):
-                l = [e.cmd.cmd_name]
+            if isinstance(e.cmd.name, str):
+                l = [e.cmd.name]
             else:
-                l = list(e.cmd.cmd_name)
+                l = list(e.cmd.name)
 
             s = (
                 f'{l[0].split("/")[-1]}'
@@ -184,26 +183,24 @@ def _build_arg_parser() -> argparse.ArgumentParser:
 
 
 def _build_cmd_set(args: ta.Any) -> CliCmdSet:
-    ldr = ManifestLoader(
-        **ManifestLoader.kwargs_from_entry_point(
-            globals(),
-            **GlobalManifestLoader.default_kwargs(),
-        ),
-    )
+    ldr_cfg = GlobalManifestLoader.default_config()
 
-    #
+    ldr_cfg |= ManifestLoader.config_from_entry_point(globals())
+
+    if args.cli_pkg_root:
+        ldr_cfg |= ManifestLoader.Config(
+            package_scan_root_dirs=args.cli_pkg_root,
+            discover_packages=False,
+        )
 
-    pkgs = ldr.scan_or_discover_packages(
-        specified_root_dirs=args.cli_pkg_root,
-        fallback_root_dir=os.getcwd(),
-    )
+    GlobalManifestLoader.initialize(ldr_cfg)
 
     #
 
     lst: list[CliCmd] = []
 
-    for m in ldr.load(*pkgs, only=[CliModule]):
-        lst.append(check.isinstance(m.value(), CliModule))
+    for mv in GlobalManifestLoader.load_values_of(CliModule):
+        lst.append(check.isinstance(mv, CliModule))
 
     lst.extend(_CLI_FUNCS)
 
@@ -259,7 +256,7 @@ def _main() -> ta.Any:
         cmd = sel.cmd
         if isinstance(cmd, CliModule):
             sys.argv = [args.cmd, *(sel.args or ())]
-            runpy._run_module_as_main(cmd.mod_name)  # type: ignore  # noqa
+            runpy._run_module_as_main(cmd.module)  # type: ignore  # noqa
             return 0
 
         elif isinstance(cmd, CliFunc):

omdev/cli/types.py

@@ -9,19 +9,19 @@ import typing as ta
 
 @dc.dataclass(frozen=True)
 class CliCmd:
-    cmd_name: ta.Union[str, ta.Sequence[str]]
+    name: ta.Union[str, ta.Sequence[str]]
 
     @property
     def primary_name(self) -> str:
-        if isinstance(self.cmd_name, str):
-            return self.cmd_name
+        if isinstance(self.name, str):
+            return self.name
         else:
-            return self.cmd_name[0]
+            return self.name[0]
 
 
 @dc.dataclass(frozen=True)
 class CliModule(CliCmd):
-    mod_name: str
+    module: str
 
 
 @dc.dataclass(frozen=True)

omdev/manifests/_dumping.py

@@ -1515,13 +1515,13 @@ class _ModuleManifestDumper:
             manifest_dct = self._build_manifest_dct(manifest)
 
             cls = type(manifest)
-            key = f'${cls.__module__}.{cls.__qualname__}'
+            key = f'!{cls.__module__}.{cls.__qualname__}'
 
             return {key: manifest_dct}
 
         elif isinstance(manifest, collections.abc.Mapping):
             [(key, manifest_dct)] = manifest.items()
-            if not key.startswith('$'):  # noqa
+            if not key.startswith('!'):  # noqa
                 raise Exception(f'Bad key: {key}')
 
             if not isinstance(manifest_dct, collections.abc.Mapping):
@@ -1571,7 +1571,7 @@ class _ModuleManifestDumper:
 
         manifest_dct = self._build_manifest_dct(manifest)
 
-        key = f'${cls.__module__}.{cls.__qualname__}'
+        key = f'!{cls.__module__}.{cls.__qualname__}'
         return {key: manifest_dct}
 
     #

omdev/manifests/building.py

@@ -172,6 +172,9 @@ class ManifestBuilder:
         def prepare(s: str) -> ta.Any:
             if s.startswith('$.'):
                 s = f'{fm.mod_base}.{s[2:]}'
+            elif s.startswith('.'):
+                # s = f'{fm.mod_base}.{s[2:]}'
+                raise NotImplementedError
             return magic.py_compile_magic_preparer(s)
 
         magics = magic.find_magic(
@@ -189,6 +192,9 @@ class ManifestBuilder:
                 body = m.body
                 if body.startswith('$.'):
                     body = f'{fm.mod_base}.{body[2:]}'
+                elif body.startswith('.'):
+                    # body = f'{fm.mod_base}.{body[2:]}'
+                    raise NotImplementedError
 
                 pat_match = check.not_none(_INLINE_MANIFEST_CLS_NAME_PAT.match(body))
                 cls_name = check.non_empty_str(pat_match.groupdict()['cls_name'])
@@ -214,8 +220,8 @@ class ManifestBuilder:
                 if issubclass(cls, ModAttrManifest):
                     attr_name = extract_manifest_target_name(lines, m.end_line)
                     inl_kw.update({
-                        'mod_name': fm.mod_name,
-                        'attr_name': attr_name,
+                        'module': fm.mod_name,
+                        'attr': attr_name,
                     })
 
                 origin = ManifestOrigin(
@@ -328,14 +334,14 @@ class ManifestBuilder:
             if not (
                     isinstance(value, ta.Mapping) and
                     len(value) == 1 and
-                    all(isinstance(k, str) and k.startswith('$') and len(k) > 1 for k in value)
+                    all(isinstance(k, str) and k.startswith('!') and len(k) > 1 for k in value)
             ):
-                raise TypeError(f'Manifest values must be mappings of strings starting with $: {value!r}')
+                raise TypeError(f'Manifest values must be mappings of strings starting with !: {value!r}')
 
             [(key, value_dct)] = value.items()
             kb, _, kr = key[1:].partition('.')  # noqa
             if kb == fm.mod_base:  # noqa
-                key = f'$.{kr}'
+                key = f'!.{kr}'
                 value = {key: value_dct}
 
             out.append(Manifest(**{
@@ -429,7 +435,7 @@ def check_package_manifests(
     for entry in manifests_json:
         manifest = Manifest(**entry)
         [(key, value_dct)] = manifest.value.items()
-        if key.startswith('$.'):
-            key = f'${name}{key[1:]}'
+        if key.startswith('!.'):
+            key = f'!{name}{key[1:]}'
         cls = GlobalManifestLoader.instance()._load_class(key)  # noqa
         value = GlobalManifestLoader.instance()._instantiate_value(cls, **value_dct)  # noqa

omdev/manifests/dumping.py

@@ -67,13 +67,13 @@ class _ModuleManifestDumper:
             manifest_dct = self._build_manifest_dct(manifest)
 
             cls = type(manifest)
-            key = f'${cls.__module__}.{cls.__qualname__}'
+            key = f'!{cls.__module__}.{cls.__qualname__}'
 
             return {key: manifest_dct}
 
         elif isinstance(manifest, collections.abc.Mapping):
             [(key, manifest_dct)] = manifest.items()
-            if not key.startswith('$'):  # noqa
+            if not key.startswith('!'):  # noqa
                 raise Exception(f'Bad key: {key}')
 
             if not isinstance(manifest_dct, collections.abc.Mapping):
@@ -123,7 +123,7 @@ class _ModuleManifestDumper:
 
         manifest_dct = self._build_manifest_dct(manifest)
 
-        key = f'${cls.__module__}.{cls.__qualname__}'
+        key = f'!{cls.__module__}.{cls.__qualname__}'
         return {key: manifest_dct}
 
     #

omdev/precheck/manifests.py

@@ -23,6 +23,6 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in sorted(self._context.src_roots):
             try:
-                GlobalManifestLoader.load(src_root)
+                GlobalManifestLoader.load(packages=[src_root])
             except Exception as e:  # noqa
                 yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

omdev/py/attrdocs.py

@@ -158,9 +158,9 @@ def extract_attr_docs(src: str) -> ta.Mapping[str, AttrDoc]:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/attrdocs',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/attrdocs',
+    'module': __name__,
 }}
 
 

omdev/py/bracepy.py

@@ -92,9 +92,9 @@ def translate_brace_python(
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'bracepy',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'bracepy',
+    'module': __name__,
 }}
 
 

omdev/py/classdot.py

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

omdev/py/findimports.py

@@ -134,9 +134,9 @@ class ImportFinder:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/findimports',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/findimports',
+    'module': __name__,
 }}
 
 

omdev/py/scripts/execstat.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# ruff: noqa: UP045
+# @omlish-lite
 # @omlish-script
 import argparse
 import inspect
@@ -8,6 +10,7 @@ import statistics
 import subprocess
 import sys
 import tempfile
+import typing as ta
 
 
 ##
@@ -16,7 +19,7 @@ import tempfile
 def _run(
         src: str,
         *,
-        setup: str | None = None,
+        setup: 'ta.Optional[str]' = None,
         time: bool = False,
         rss: bool = False,
         modules: bool = False,
@@ -33,8 +36,8 @@ def _run(
     if modules:
         import sys  # noqa
 
-        def get_modules() -> set[str]:
-            return set(sys.modules)
+        def get_modules() -> 'ta.Sequence[str]':
+            return list(sys.modules)
 
     #
 
@@ -51,7 +54,7 @@ def _run(
         start_rss = get_rss()  # noqa
 
     if modules:
-        start_modules = get_modules()  # noqa
+        start_modules = set(get_modules())  # noqa
 
     if time:
         start_time = get_time()  # noqa
@@ -76,7 +79,7 @@ def _run(
     return {
         **({'time': (end_time - start_time)} if time else {}),  # noqa
         **({'rss': (end_rss - start_rss)} if rss else {}),  # noqa
-        **({'modules': sorted(end_modules - start_modules)} if modules else {}),  # noqa
+        **({'modules': [m for m in end_modules if m not in start_modules]} if modules else {}),  # noqa
     }
 
 
@@ -84,9 +87,9 @@ def _run(
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/execstat',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/execstat',
+    'module': __name__,
 }}
 
 
@@ -99,6 +102,7 @@ def _main() -> None:
     parser.add_argument('-t', '--time', action='store_true')
     parser.add_argument('-r', '--rss', action='store_true')
     parser.add_argument('-m', '--modules', action='store_true')
+    parser.add_argument('-M', '--modules-ordered', action='store_true')
 
     parser.add_argument('-n', '--num-runs', type=int, default=1)
 
@@ -136,7 +140,7 @@ def _main() -> None:
         if i == 0:
             run_kw.update(
                 rss=bool(args.rss),
-                modules=bool(args.modules),
+                modules=bool(args.modules) or bool(args.modules_ordered),
             )
 
         payload = '\n'.join([
@@ -183,7 +187,11 @@ def _main() -> None:
 
     if args.modules:
         out.update({
-            'modules': results[0]['modules'],
+            'modules': sorted(results[0]['modules']),
+        })
+    if args.modules_ordered:
+        out.update({
+            'modules_ordered': results[0]['modules'],
         })
 
     print(json.dumps(out, indent=2))

omdev/py/scripts/importtrace.py

@@ -489,9 +489,9 @@ class SqliteWriter:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/importtrace',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/importtrace',
+    'module': __name__,
 }}
 
 

omdev/py/srcheaders.py

@@ -63,9 +63,9 @@ def get_py_header_lines(src: str) -> list[PyHeaderLine]:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/srcheaders',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/srcheaders',
+    'module': __name__,
 }}