omdev 0.0.0.dev78__py3-none-any.whl → 0.0.0.dev79__py3-none-any.whl

omdev/.manifests.json

@@ -30,7 +30,7 @@
     "line": 62,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "classdot",
+        "cmd_name": "py/classdot",
         "mod_name": "omdev.classdot"
       }
     }
@@ -102,7 +102,7 @@
     "line": 11,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "execrss",
+        "cmd_name": "py/execrss",
         "mod_name": "omdev.scripts.execrss"
       }
     }
@@ -114,7 +114,7 @@
     "line": 7,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "exectime",
+        "cmd_name": "py/exectime",
         "mod_name": "omdev.scripts.exectime"
       }
     }
@@ -126,7 +126,7 @@
     "line": 481,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "importtrace",
+        "cmd_name": "py/importtrace",
         "mod_name": "omdev.scripts.importtrace"
       }
     }
@@ -162,7 +162,7 @@
     "line": 166,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "importscan",
+        "cmd_name": "py/importscan",
         "mod_name": "omdev.tools.importscan"
       }
     }
@@ -174,7 +174,7 @@
     "line": 148,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "mkrelimp",
+        "cmd_name": "py/mkrelimp",
         "mod_name": "omdev.tools.mkrelimp"
       }
     }

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/cli/main.py

@@ -1,16 +1,19 @@
 """
 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
@@ -38,6 +41,139 @@ _CLI_FUNCS: ta.Sequence[CliFunc] = [
 ##
 
 
+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')
@@ -47,9 +183,7 @@ def _build_arg_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _build_cmd_dct(args: ta.Any) -> ta.Mapping[str, CliCmd]:
-    ccs: list[CliCmd] = []
-
+def _build_cmd_set(args: ta.Any) -> CliCmdSet:
     ldr = ManifestLoader.from_entry_point(globals())
 
     pkgs: list[str] = []
@@ -70,62 +204,49 @@ def _build_cmd_dct(args: ta.Any) -> ta.Mapping[str, CliCmd]:
         if not pkgs:
             scan_pkg_root(os.getcwd())
 
-    for m in ldr.load(*pkgs, only=[CliModule]):
-        ccs.append(check.isinstance(m.value, CliModule))
+    #
 
-    ccs.extend(_CLI_FUNCS)
+    lst: list[CliCmd] = []
 
-    dct: dict[str, CliCmd] = {}
-    for cc in ccs:
-        for cn in [cc.cmd_name] if isinstance(cc.cmd_name, str) else cc.cmd_name:
-            if cn in dct:
-                raise NameError(cc)
-            dct[cn] = cc
+    for m in ldr.load(*pkgs, only=[CliModule]):
+        lst.append(check.isinstance(m.value, CliModule))
 
-    return dct
+    lst.extend(_CLI_FUNCS)
 
+    #
 
-def _select_cmd(args: ta.Any, cmds: ta.Mapping[str, CliCmd]) -> CliCmd | int:
-    cmd = args.cmd
-    if cmd and cmd in cmds:
-        return cmds[cmd]
+    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 cmd:
-        print_err(f'Invalid command: {cmd}\n')
+    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
 
-    mset = set()
-    mdct: dict = {}
-    for cc in cmds.values():
-        if id(cc) in mset:
-            continue
-        mset.add(id(cc))
-        if isinstance(cc.cmd_name, str) and cc.cmd_name[0] == '_':
-            continue
-        if isinstance(cc, CliFunc):
-            mdct.setdefault('-', []).append(cc)
-        elif isinstance(cc, CliModule):
-            mdct.setdefault(cc.mod_name.partition('.')[0], []).append(cc)
-        else:
-            raise TypeError(cc)
-
     print_err('Subcommands:\n')
-    for m, l in sorted(mdct.items(), key=lambda t: (t[0] == '-', t[0])):
-        print_err(f'  {m}')
-        for cc in sorted(l, key=lambda c: c.primary_name):
-            if isinstance(cc.cmd_name, str):
-                print_err(f'    {cc.cmd_name}')
+
+    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(
-                    f'    {cc.cmd_name[0]}'
-                    f'{(" (" + ", ".join(cc.cmd_name[1:]) + ")") if len(cc.cmd_name) > 1 else ""}',
-                )
-        print_err()
+                print_err(pfx + k)
+                rec(v, pfx + '  ')
+            if not pfx:
+                print_err('')
+
+    rec(cmds.help_tree())
 
     return rc
 
@@ -135,23 +256,23 @@ def _main() -> ta.Any:
     args = parser.parse_args()
 
     def inner():
-        cmds = _build_cmd_dct(args)
+        cmds = _build_cmd_set(args)
         sel = _select_cmd(args, cmds)
 
-        match sel:
-            case int():
-                return sel
+        if isinstance(sel, int):
+            return sel
 
-            case CliModule() as cm:
-                sys.argv = [args.cmd, *(args.args or ())]
-                runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
-                return 0
+        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
 
-            case CliFunc() as cf:
-                return cf.fn(*(args.args or ()))
+        elif isinstance(cmd, CliFunc):
+            return cmd.fn(*(sel.args or ()))
 
-            case _:
-                raise TypeError(sel)
+        else:
+            raise TypeError(cmd)
 
     if args.cli_debug:
         from omlish.diag.debug import debugging_on_exception

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/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/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/tools/importscan.py

@@ -164,7 +164,7 @@ def run(
 
 
 # @omlish-manifest
-_CLI_MODULE = CliModule('importscan', __name__)
+_CLI_MODULE = CliModule('py/importscan', __name__)
 
 
 def _main() -> None:

omdev/tools/mkrelimp.py

@@ -146,7 +146,7 @@ class Processor:
 
 
 # @omlish-manifest
-_CLI_MODULE = CliModule('mkrelimp', __name__)
+_CLI_MODULE = CliModule('py/mkrelimp', __name__)
 
 
 def _main() -> None:

{omdev-0.0.0.dev78.dist-info → omdev-0.0.0.dev79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev78
+Version: 0.0.0.dev79
 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.dev79
 Provides-Extra: all
 Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'

{omdev-0.0.0.dev78.dist-info → omdev-0.0.0.dev79.dist-info}/RECORD

@@ -1,8 +1,8 @@
-omdev/.manifests.json,sha256=qqGdjl5ipGAzn3N24XuhpvfczMlYD__3pV1gFHXw4AY,5228
+omdev/.manifests.json,sha256=CGQCoFACCwUKKkXg9CROAN6kW-x0HuQkYKoBVmRXTDU,5246
 omdev/__about__.py,sha256=do_MjpnIpB_DX4GL4VV9gFQzs6bkoyDIYu29yB3rYxw,1131
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
-omdev/classdot.py,sha256=K0YMTngaC6uuEKhDb95tFzW33Re_YEdgIWBBeze4PTI,1628
+omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=P8v4I1tm6g-PEWJiNwAKxErvWwL-Nop83vAuwq1kR5A,2246
 omdev/findmagic.py,sha256=DhBYHHP_dzwM5pIh21xnQPnkZ2YmAXCjithsr7X0ScU,2357
@@ -63,7 +63,7 @@ omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=MCkajFbzP55Nak4DAy2s-4WH_ol15ejyTatvhLfne90,1478
 omdev/cli/clicli.py,sha256=ShTlK2vjFPqnyF9SPTwXd4nRyb6XjCVPQIT4PTGdTL4,2879
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
-omdev/cli/main.py,sha256=fQL-KdKZDmw00d8vtgxGmUc9Pp3dnhW1BW-Pzu6JPX0,4172
+omdev/cli/main.py,sha256=nD3bW3MkI0KuDSLpX_PTnl-lBnm4hIxVqczvvMHtupo,7058
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=bqKw9SbtBtAip2vF9v4khh0CqKG6LBr6n9VzWBz7AJE,474
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -103,9 +103,9 @@ omdev/pyproject/pkg.py,sha256=rNKzJOIgPDrtT2i14Pebldoboz45w00sKb5l_kYFaRI,14562
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
-omdev/scripts/execrss.py,sha256=d6purJqU99OkMcNxCS1kG2CMfSsw7wjnvBQW7SjyJ70,448
-omdev/scripts/exectime.py,sha256=LRVIJsnvGYUqH-zfCdFnrQCZv1KLXJPtWBWplXMDwhI,407
-omdev/scripts/importtrace.py,sha256=4ozdphT4VuP8L0kE0HmGMyWaWHnXg1KEukbET4pFgJU,14064
+omdev/scripts/execrss.py,sha256=hJTWBig_-XqKIj1DphYTfeVDtdQTM1XUl-Hvzs2x9iY,451
+omdev/scripts/exectime.py,sha256=dBdn3KV2jR6tCrzGvb9dTl2uGe2vNpLxmHMtExmnaiM,410
+omdev/scripts/importtrace.py,sha256=Jbo3Yk2RAbE8_tJ97iTcVNpoxCJxrRb2tl1W_CV3NG0,14067
 omdev/scripts/interp.py,sha256=2poCQ_45tO0-X16KeoxiAyuTfltSjnPETejlYEm9VY4,71527
 omdev/scripts/pyproject.py,sha256=nWbnMyGwrfzcTcnvUFGP9wxIu3rlUyxQYhkq64UXIrA,158084
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -114,16 +114,16 @@ omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/dockertools.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
 omdev/tools/gittools.py,sha256=1Oa2AgdZIJZ2eusso9yFzkd9zLWH3d4lTiVFzwg0uDM,3808
-omdev/tools/importscan.py,sha256=vxOMdAABShqt5-G3n6DGHopCZ5uGgciThY0MCa5W0mA,4066
-omdev/tools/mkrelimp.py,sha256=fwt4GWzenuLNVtzdK2uaJJTSuJbUVJZquF5adwAwlPg,4051
+omdev/tools/importscan.py,sha256=QeGjR3UGcuuuDUiisFuAXWHlcKJScGxGEcU6tfOh2CM,4069
+omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/nbtools.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
 omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
 omdev/tools/rsttool.py,sha256=suwsfseUf8GH8rYmYygTUdif-Jk_bX1g9fYRLXaKkmM,1340
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev78.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev78.dist-info/METADATA,sha256=98R5viqCGLx0896u-4zH3LyIN55taK5qAQNgv2XGoQg,1492
-omdev-0.0.0.dev78.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omdev-0.0.0.dev78.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev78.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev78.dist-info/RECORD,,
+omdev-0.0.0.dev79.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev79.dist-info/METADATA,sha256=sKZ845yEhL8q0_6_dW11F69Rupd9w9mzQ42afWVAvJA,1492
+omdev-0.0.0.dev79.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omdev-0.0.0.dev79.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev79.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev79.dist-info/RECORD,,