omdev 0.0.0.dev77__tar.gz → 0.0.0.dev79__tar.gz

{omdev-0.0.0.dev77/omdev.egg-info → omdev-0.0.0.dev79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev77
+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.dev77
+Requires-Dist: omlish==0.0.0.dev79
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
@@ -21,7 +21,7 @@ Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: mypy~=1.11; extra == "all"
 Requires-Dist: gprof2dot~=2024.6; extra == "all"
-Requires-Dist: tokenize_rt~=6.0; extra == "all"
+Requires-Dist: tokenize_rt~=6.1; extra == "all"
 Requires-Dist: wheel~=0.44; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=24.10; extra == "black"
@@ -36,6 +36,6 @@ Requires-Dist: mypy~=1.11; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2024.6; extra == "prof"
 Provides-Extra: tokens
-Requires-Dist: tokenize_rt~=6.0; extra == "tokens"
+Requires-Dist: tokenize_rt~=6.1; extra == "tokens"
 Provides-Extra: wheel
 Requires-Dist: wheel~=0.44; extra == "wheel"

{omdev-0.0.0.dev77 → omdev-0.0.0.dev79}/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-0.0.0.dev77 → omdev-0.0.0.dev79}/omdev/__about__.py

@@ -35,7 +35,7 @@ class Project(ProjectBase):
         ],
 
         'tokens': [
-            'tokenize_rt ~= 6.0',
+            'tokenize_rt ~= 6.1',
         ],
 
         'wheel': [

{omdev-0.0.0.dev77 → omdev-0.0.0.dev79}/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.dev77 → omdev-0.0.0.dev79}/omdev/cli/_pathhack.py

@@ -2,7 +2,7 @@
 Python is insistent on prepending sys.path with an empty string (translating to the current working directory), which
 leads to problems when using the cli in directories containing python packages (such as within this very source tree).
 This can't be done in cli main as the code frequently spawns other sys.executable processes which wouldn't know to do
-that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that code runs before thej
+that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that code runs before the
 problematic empty string is added, so a sys.meta_path hook is prepended.
 
 See:

omdev-0.0.0.dev79/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.dev77 → omdev-0.0.0.dev79}/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.dev77 → omdev-0.0.0.dev79}/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.dev77 → omdev-0.0.0.dev79}/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.dev77 → omdev-0.0.0.dev79}/omdev/scripts/interp.py

@@ -527,6 +527,23 @@ def check_state(v: bool, msg: str = 'Illegal state') -> None:
         raise ValueError(msg)
 
 
+def check_equal(l: T, r: T) -> T:
+    if l != r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_not_equal(l: T, r: T) -> T:
+    if l == r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_single(vs: ta.Iterable[T]) -> T:
+    [v] = vs
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -609,8 +626,13 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
 # ../../../omlish/lite/strings.py
 
 
-def camel_case(name: str) -> str:
-    return ''.join(map(str.capitalize, name.split('_')))  # noqa
+def camel_case(name: str, lower: bool = False) -> str:
+    if not name:
+        return ''
+    s = ''.join(map(str.capitalize, name.split('_')))  # noqa
+    if lower:
+        s = s[0].lower() + s[1:]
+    return s
 
 
 def snake_case(name: str) -> str:
@@ -636,6 +658,10 @@ def is_sunder(name: str) -> bool:
     )
 
 
+def attr_repr(obj: ta.Any, *attrs: str) -> str:
+    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
+
+
 ########################################
 # ../../packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.

{omdev-0.0.0.dev77 → omdev-0.0.0.dev79}/omdev/scripts/pyproject.py

@@ -1908,6 +1908,23 @@ def check_state(v: bool, msg: str = 'Illegal state') -> None:
         raise ValueError(msg)
 
 
+def check_equal(l: T, r: T) -> T:
+    if l != r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_not_equal(l: T, r: T) -> T:
+    if l == r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_single(vs: ta.Iterable[T]) -> T:
+    [v] = vs
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -1990,8 +2007,13 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
 # ../../../omlish/lite/strings.py
 
 
-def camel_case(name: str) -> str:
-    return ''.join(map(str.capitalize, name.split('_')))  # noqa
+def camel_case(name: str, lower: bool = False) -> str:
+    if not name:
+        return ''
+    s = ''.join(map(str.capitalize, name.split('_')))  # noqa
+    if lower:
+        s = s[0].lower() + s[1:]
+    return s
 
 
 def snake_case(name: str) -> str:
@@ -2017,6 +2039,10 @@ def is_sunder(name: str) -> bool:
     )
 
 
+def attr_repr(obj: ta.Any, *attrs: str) -> str:
+    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
+
+
 ########################################
 # ../../packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.

{omdev-0.0.0.dev77 → omdev-0.0.0.dev79}/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-0.0.0.dev77 → omdev-0.0.0.dev79}/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.dev77 → omdev-0.0.0.dev79/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev77
+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.dev77
+Requires-Dist: omlish==0.0.0.dev79
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
@@ -21,7 +21,7 @@ Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: mypy~=1.11; extra == "all"
 Requires-Dist: gprof2dot~=2024.6; extra == "all"
-Requires-Dist: tokenize_rt~=6.0; extra == "all"
+Requires-Dist: tokenize_rt~=6.1; extra == "all"
 Requires-Dist: wheel~=0.44; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=24.10; extra == "black"
@@ -36,6 +36,6 @@ Requires-Dist: mypy~=1.11; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2024.6; extra == "prof"
 Provides-Extra: tokens
-Requires-Dist: tokenize_rt~=6.0; extra == "tokens"
+Requires-Dist: tokenize_rt~=6.1; extra == "tokens"
 Provides-Extra: wheel
 Requires-Dist: wheel~=0.44; extra == "wheel"

{omdev-0.0.0.dev77 → omdev-0.0.0.dev79}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev77
+omlish==0.0.0.dev79
 
 [all]
 black~=24.10
@@ -8,7 +8,7 @@ pcpp~=1.30
 docutils~=0.21
 mypy~=1.11
 gprof2dot~=2024.6
-tokenize_rt~=6.0
+tokenize_rt~=6.1
 wheel~=0.44
 
 [black]
@@ -29,7 +29,7 @@ mypy~=1.11
 gprof2dot~=2024.6
 
 [tokens]
-tokenize_rt~=6.0
+tokenize_rt~=6.1
 
 [wheel]
 wheel~=0.44

{omdev-0.0.0.dev77 → omdev-0.0.0.dev79}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev77'
+version = '0.0.0.dev79'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev77',
+    'omlish == 0.0.0.dev79',
 ]
 
 [project.optional-dependencies]
@@ -34,7 +34,7 @@ all = [
     'docutils ~= 0.21',
     'mypy ~= 1.11',
     'gprof2dot ~= 2024.6',
-    'tokenize_rt ~= 6.0',
+    'tokenize_rt ~= 6.1',
     'wheel ~= 0.44',
 ]
 black = [
@@ -55,7 +55,7 @@ prof = [
     'gprof2dot ~= 2024.6',
 ]
 tokens = [
-    'tokenize_rt ~= 6.0',
+    'tokenize_rt ~= 6.1',
 ]
 wheel = [
     'wheel ~= 0.44',