omdev 0.0.0.dev78__tar.gz → 0.0.0.dev80__tar.gz

{omdev-0.0.0.dev78/omdev.egg-info → omdev-0.0.0.dev80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev78
+Version: 0.0.0.dev80
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev78
+Requires-Dist: omlish==0.0.0.dev80
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/.manifests.json

@@ -11,6 +11,18 @@
       }
     }
   },
+  {
+    "module": ".bracepy",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/bracepy.py",
+    "line": 88,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "bracepy",
+        "mod_name": "omdev.bracepy"
+      }
+    }
+  },
   {
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
@@ -30,7 +42,7 @@
     "line": 62,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "classdot",
+        "cmd_name": "py/classdot",
         "mod_name": "omdev.classdot"
       }
     }
@@ -47,6 +59,30 @@
       }
     }
   },
+  {
+    "module": ".findimports",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/findimports.py",
+    "line": 81,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findimports",
+        "mod_name": "omdev.findimports"
+      }
+    }
+  },
+  {
+    "module": ".findmagic",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/findmagic.py",
+    "line": 65,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findmagic",
+        "mod_name": "omdev.findmagic"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
@@ -102,7 +138,7 @@
     "line": 11,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "execrss",
+        "cmd_name": "py/execrss",
         "mod_name": "omdev.scripts.execrss"
       }
     }
@@ -114,7 +150,7 @@
     "line": 7,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "exectime",
+        "cmd_name": "py/exectime",
         "mod_name": "omdev.scripts.exectime"
       }
     }
@@ -126,7 +162,7 @@
     "line": 481,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "importtrace",
+        "cmd_name": "py/importtrace",
         "mod_name": "omdev.scripts.importtrace"
       }
     }
@@ -162,7 +198,7 @@
     "line": 166,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "importscan",
+        "cmd_name": "py/importscan",
         "mod_name": "omdev.tools.importscan"
       }
     }
@@ -174,7 +210,7 @@
     "line": 148,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "mkrelimp",
+        "cmd_name": "py/mkrelimp",
         "mod_name": "omdev.tools.mkrelimp"
       }
     }

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/amalg/amalg.py

@@ -24,6 +24,7 @@ Targets:
  - supervisor?
 """
 import argparse
+import ast
 import dataclasses as dc
 import io
 import logging
@@ -297,7 +298,11 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
-    for line in cls:
+    i = 0
+    while i < len(cls):
+        line = cls[i]
+        i += 1
+
         if (imp := make_import(
                 line,
                 src_path=path,
@@ -311,6 +316,31 @@ def make_src_file(
         )) is not None:
             tys.append(ty)
 
+        elif (
+                line and
+                (ft := line[0]).name == 'COMMENT' and
+                ft.src.startswith('# @omlish-manifest')
+        ):
+            mls = [line]
+            while True:
+                mls.append(cls[i])
+                i += 1
+
+                msrc = tks.join_lines(mls).strip()
+                try:
+                    node = ast.parse(msrc)
+                except SyntaxError:
+                    continue
+
+                mmod = check.isinstance(node, ast.Module)
+                check.isinstance(check.single(mmod.body), ast.Assign)
+                break
+
+            ctls.extend([
+                [trt.Token('COMMENT', '# ' + tks.join_toks(ml))]
+                for ml in mls
+            ])
+
         else:
             ctls.append(line)
 

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/bracepy.py

@@ -85,6 +85,13 @@ def translate_brace_python(
     return ret.getvalue()
 
 
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'bracepy',
+    'mod_name': __name__,
+}}
+
+
 if __name__ == '__main__':
     def _main(argv=None) -> None:
         import argparse

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/classdot.py

@@ -60,7 +60,7 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = CliModule('classdot', __name__)
+_CLI_MODULE = CliModule('py/classdot', __name__)
 
 
 if __name__ == '__main__':

omdev-0.0.0.dev80/omdev/cli/main.py

@@ -0,0 +1,288 @@
+"""
+TODO:
+ - py/foo - root command 'py'
+ - cache ldr.discover() somehow if in uvx/pipx - very slow
+  - <venv-root>/.omdev-cli-manifest-cache.json - {pkg_name: manifests_json}
+ - allow manually specifying manifest packages
+"""
+import argparse
+import dataclasses as dc
+import os
+import runpy
+import sys
+import typing as ta
+
+from omlish import check
+from omlish.lite.cached import cached_nullary
+
+from ..manifests.load import ManifestLoader
+from .types import CliCmd
+from .types import CliFunc
+from .types import CliModule
+
+
+##
+
+
+def _post_install(cli_pkg: str) -> None:
+    from .managers import setup_install_manager
+
+    setup_install_manager(cli_pkg)
+
+
+##
+
+
+_CLI_FUNCS: ta.Sequence[CliFunc] = [
+    CliFunc('_post_install', _post_install),
+]
+
+
+##
+
+
+StrTuple: ta.TypeAlias = tuple[str, ...]
+RecStrMap: ta.TypeAlias = ta.Mapping[str, ta.Union[str, 'RecStrMap']]
+RecCmdMap: ta.TypeAlias = ta.Mapping[str, ta.Union[CliCmd, 'RecCmdMap']]
+
+
+class CliCmdSet:
+    def __init__(self, cmds: ta.Iterable[CliCmd]) -> None:
+        super().__init__()
+
+        self._cmds = list(cmds)
+
+    @dc.dataclass(frozen=True)
+    class Entry:
+        cmd: CliCmd
+
+        exec_paths: ta.Sequence[StrTuple]  # len > 1, len([0]) > 1
+        help_path: StrTuple | None
+
+    def _make_entry(self, cmd: CliCmd) -> Entry:
+        help_path: StrTuple | None
+
+        if isinstance(cmd.cmd_name, str):
+            ns = [cmd.cmd_name]
+        else:
+            ns = list(cmd.cmd_name)
+        exec_paths = [tuple(n.split('/')) for n in ns]
+
+        if isinstance(cmd.cmd_name, str) and cmd.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])
+
+        else:
+            raise TypeError(cmd)
+
+        return CliCmdSet.Entry(
+            cmd,
+
+            exec_paths=exec_paths,
+            help_path=help_path,
+        )
+
+    @cached_nullary
+    def entries(self) -> ta.Sequence[Entry]:
+        return [self._make_entry(c) for c in self._cmds]
+
+    @cached_nullary
+    def exec_tree(self) -> RecCmdMap:
+        d: dict = {}
+        for e in self.entries():
+            for ep in e.exec_paths:
+                c = d
+                for p in ep[:-1]:
+                    n = c.setdefault(p, {})
+                    if not isinstance(n, dict):
+                        raise NameError(e)  # noqa
+                    c = n
+
+                h = ep[-1]
+                if h in c:
+                    raise NameError(e)  # noqa
+
+                c[h] = e.cmd
+
+        return d
+
+    @cached_nullary
+    def help_tree(self) -> RecStrMap:
+        d: dict = {}
+        for e in self.entries():
+            if not e.help_path:
+                continue
+
+            c = d
+            for p in e.help_path[:-1]:
+                n = c.setdefault(p, {})
+                if not isinstance(n, dict):
+                    raise NameError(e)  # noqa
+                c = n
+
+            h = e.help_path[-1]
+            if h in c:
+                raise NameError(e)
+
+            if isinstance(e.cmd.cmd_name, str):
+                l = [e.cmd.cmd_name]
+            else:
+                l = list(e.cmd.cmd_name)
+
+            s = (
+                f'{l[0].split("/")[-1]}'
+                f'{(" (" + ", ".join(l[1:]) + ")") if len(l) > 1 else ""}'
+            )
+
+            c[h] = s
+
+        return d
+
+    class SelectedCmd(ta.NamedTuple):
+        cmd: CliCmd
+        args: ta.Sequence[str]
+
+    class InvalidCmd(ta.NamedTuple):
+        path: ta.Sequence[str]
+
+    def select_cmd(self, args: ta.Sequence[str]) -> SelectedCmd | InvalidCmd:
+        check.not_isinstance(args, str)
+
+        d = self.exec_tree()
+        for i in range(len(args)):
+            n = args[i]
+            if n not in d:
+                return CliCmdSet.InvalidCmd(args[:i + 1])
+
+            c = d[n]
+
+            if isinstance(c, CliCmd):
+                return CliCmdSet.SelectedCmd(c, args[i + 1:])
+            elif isinstance(c, ta.Mapping):
+                d = c
+            else:
+                raise TypeError(c)
+
+        return CliCmdSet.InvalidCmd([])
+
+
+##
+
+
+def _build_arg_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--cli-pkg-root', action='append')
+    parser.add_argument('--cli-debug', action='store_true')
+    parser.add_argument('cmd', nargs='?')
+    parser.add_argument('args', nargs=argparse.REMAINDER)
+    return parser
+
+
+def _build_cmd_set(args: ta.Any) -> CliCmdSet:
+    ldr = ManifestLoader.from_entry_point(globals())
+
+    pkgs: list[str] = []
+
+    def scan_pkg_root(r: str) -> None:
+        r = os.path.expanduser(r)
+        for n in os.listdir(r):
+            if os.path.isdir(p := os.path.join(r, n)) and os.path.exists(os.path.join(p, '__init__.py')):
+                pkgs.append(n)
+
+    if args.cli_pkg_root:
+        for r in args.cli_pkg_root:
+            scan_pkg_root(r)
+
+    else:
+        pkgs.extend(ldr.discover())
+
+        if not pkgs:
+            scan_pkg_root(os.getcwd())
+
+    #
+
+    lst: list[CliCmd] = []
+
+    for m in ldr.load(*pkgs, only=[CliModule]):
+        lst.append(check.isinstance(m.value, CliModule))
+
+    lst.extend(_CLI_FUNCS)
+
+    #
+
+    return CliCmdSet(lst)
+
+
+def _select_cmd(args: ta.Any, cmds: CliCmdSet) -> CliCmdSet.SelectedCmd | int:
+    def print_err(*args, **kwargs):  # noqa
+        print(*args, **kwargs, file=sys.stderr)
+
+    if args.cmd:
+        sel_cmd = cmds.select_cmd([args.cmd, *args.args])
+        if isinstance(sel_cmd, CliCmdSet.SelectedCmd):
+            return sel_cmd
+        elif isinstance(sel_cmd, CliCmdSet.InvalidCmd):
+            print_err(f'Invalid command: {" ".join(sel_cmd.path)}\n')
+        else:
+            raise TypeError(sel_cmd)
+        rc = 1
+    else:
+        rc = 0
+
+    print_err('Subcommands:\n')
+
+    def rec(d, pfx=''):
+        for k, v in sorted(d.items(), key=lambda t: t[0]):
+            if isinstance(v, str):
+                print_err(pfx + v)
+            else:
+                print_err(pfx + k)
+                rec(v, pfx + '  ')
+            if not pfx:
+                print_err('')
+
+    rec(cmds.help_tree())
+
+    return rc
+
+
+def _main() -> ta.Any:
+    parser = _build_arg_parser()
+    args = parser.parse_args()
+
+    def inner():
+        cmds = _build_cmd_set(args)
+        sel = _select_cmd(args, cmds)
+
+        if isinstance(sel, int):
+            return sel
+
+        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
+            return 0
+
+        elif isinstance(cmd, CliFunc):
+            return cmd.fn(*(sel.args or ()))
+
+        else:
+            raise TypeError(cmd)
+
+    if args.cli_debug:
+        from omlish.diag.debug import debugging_on_exception
+
+        with debugging_on_exception():
+            return inner()
+
+    else:
+        return inner()
+
+
+if __name__ == '__main__':
+    sys.exit(rc if isinstance(rc := _main(), int) else 0)

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/findimports.py

@@ -78,11 +78,17 @@ def get_import_deps(imps: set[str]) -> set[str]:
     return {i for i in eimps if whichmod(i) != 'builtin'}
 
 
-def _main() -> None:
-    imps = find_imports(*sys.argv[1:])
-    deps = get_import_deps(imps)
-    print(chr(10).join(sorted(deps)))
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findimports',
+    'mod_name': __name__,
+}}
 
 
 if __name__ == '__main__':
+    def _main() -> None:
+        imps = find_imports(*sys.argv[1:])
+        deps = get_import_deps(imps)
+        print(chr(10).join(sorted(deps)))
+
     _main()

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/findmagic.py

@@ -62,6 +62,13 @@ def find_magic(
                 yield out
 
 
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findmagic',
+    'mod_name': __name__,
+}}
+
+
 if __name__ == '__main__':
     def _main(argv=None) -> None:
         import argparse

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/manifests/build.py

@@ -1,7 +1,7 @@
 """
 TODO:
  - separate build from cli
- - parallelize & sort
+ - verify classes instantiate
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/precheck/__main__.py

@@ -6,6 +6,6 @@ _CLI_MODULE = CliModule('precheck', __name__)
 
 
 if __name__ == '__main__':
-    from .precheck import _main
+    from .main import _main
 
     _main()

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/precheck/lite.py

@@ -10,6 +10,7 @@ import typing as ta
 
 from omdev import findmagic
 from omlish import cached
+from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
 
 from .base import Precheck
 from .base import PrecheckContext
@@ -69,10 +70,12 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         vs: list[Precheck.Violation] = []
 
         proc = await asyncio.create_subprocess_exec(
-            '.venvs/8/bin/python',
-            '-c',
-            self._load_file_module_payload(),
-            fp,
+            *subprocess_maybe_shell_wrap_exec(
+                '.venvs/8/bin/python',
+                '-c',
+                self._load_file_module_payload(),
+                fp,
+            ),
             stderr=subprocess.PIPE,
         )
 
@@ -90,9 +93,11 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         log.debug('%s: loading module %s', self.__class__.__name__, mod)
 
         proc = await asyncio.create_subprocess_exec(
-            '.venvs/8/bin/python',
-            '-c',
-            f'import {mod}',
+            *subprocess_maybe_shell_wrap_exec(
+                '.venvs/8/bin/python',
+                '-c',
+                f'import {mod}',
+            ),
             stderr=subprocess.PIPE,
         )
 

omdev-0.0.0.dev78/omdev/precheck/precheck.py → omdev-0.0.0.dev80/omdev/precheck/main.py

@@ -2,7 +2,7 @@
 Tiny pre-commit
 
 TODO:
- - ! manifests
+ - define new prechecks with manifests
  - global config
  - global analyses - FilesWithShebang
  - shebang files have no relative imports
@@ -31,6 +31,7 @@ from .base import Precheck
 from .base import PrecheckContext
 from .git import GitBlacklistPrecheck
 from .lite import LitePython8Precheck
+from .manifests import ManifestsPrecheck
 from .scripts import ScriptDepsPrecheck
 
 
@@ -52,6 +53,7 @@ def _check_cmd(args) -> None:
         GitBlacklistPrecheck(ctx),
         ScriptDepsPrecheck(ctx),
         LitePython8Precheck(ctx),
+        ManifestsPrecheck(ctx),
     ]
 
     async def run() -> list[Precheck.Violation]:
@@ -81,16 +83,18 @@ def _build_parser() -> argparse.ArgumentParser:
 
     parser_check = subparsers.add_parser('check')
     parser_check.add_argument('roots', nargs='+')
+    parser_check.add_argument('-v', '--verbose', action='store_true')
     parser_check.set_defaults(func=_check_cmd)
 
     return parser
 
 
 def _main(argv: ta.Sequence[str] | None = None) -> None:
-    logs.configure_standard_logging('INFO')
-
     parser = _build_parser()
     args = parser.parse_args(argv)
+
+    logs.configure_standard_logging('DEBUG' if args.verbose else 'INFO')
+
     if not getattr(args, 'func', None):
         parser.print_help()
     else:

omdev-0.0.0.dev80/omdev/precheck/manifests.py

@@ -0,0 +1,26 @@
+import dataclasses as dc
+import typing as ta
+
+from ..manifests.load import ManifestLoader
+from .base import Precheck
+from .base import PrecheckContext
+
+
+##
+
+
+class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Precheck.Config):
+        pass
+
+    def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
+        super().__init__(context, config)
+
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+        for src_root in self._context.src_roots:
+            ml = ManifestLoader()
+            try:
+                ml.load(src_root)
+            except Exception as e:  # noqa
+                yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/scripts/execrss.py

@@ -10,7 +10,7 @@ def _get_rss() -> int:
 
 # @omlish-manifest
 _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'execrss',
+    'cmd_name': 'py/execrss',
     'mod_name': __name__,
 }}
 

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/scripts/exectime.py

@@ -6,7 +6,7 @@ import time
 
 # @omlish-manifest
 _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'exectime',
+    'cmd_name': 'py/exectime',
     'mod_name': __name__,
 }}
 

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/scripts/importtrace.py

@@ -480,7 +480,7 @@ class SqliteWriter:
 
 # @omlish-manifest
 _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'importtrace',
+    'cmd_name': 'py/importtrace',
     'mod_name': __name__,
 }}
 

{omdev-0.0.0.dev78 → omdev-0.0.0.dev80}/omdev/scripts/pyproject.py

@@ -170,6 +170,13 @@ def find_magic(
                 yield out
 
 
+# # @omlish-manifest
+# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
+#     'cmd_name': 'py/findmagic',
+#     'mod_name': __name__,
+# }}
+
+
 ########################################
 # ../../git.py