omdev 0.0.0.dev62__tar.gz → 0.0.0.dev64__tar.gz

{omdev-0.0.0.dev62/omdev.egg-info → omdev-0.0.0.dev64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev62
+Version: 0.0.0.dev64
 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.dev62
+Requires-Dist: omlish==0.0.0.dev64
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev62 → omdev-0.0.0.dev64}/omdev/.manifests.json

@@ -123,7 +123,7 @@
     "module": ".tools.dockertools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/dockertools.py",
-    "line": 183,
+    "line": 236,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "docker",

{omdev-0.0.0.dev62 → omdev-0.0.0.dev64}/omdev/cli/main.py

@@ -41,6 +41,7 @@ _CLI_FUNCS: ta.Sequence[CliFunc] = [
 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
@@ -132,23 +133,34 @@ def _select_cmd(args: ta.Any, cmds: ta.Mapping[str, CliCmd]) -> CliCmd | int:
 def _main() -> ta.Any:
     parser = _build_arg_parser()
     args = parser.parse_args()
-    cmds = _build_cmd_dct(args)
-    sel = _select_cmd(args, cmds)
 
-    match sel:
-        case int():
-            return sel
+    def inner():
+        cmds = _build_cmd_dct(args)
+        sel = _select_cmd(args, cmds)
 
-        case CliModule() as cm:
-            sys.argv = [args.cmd, *(args.args or ())]
-            runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
-            return 0
+        match sel:
+            case int():
+                return sel
 
-        case CliFunc() as cf:
-            return cf.fn(*(args.args or ()))
+            case CliModule() as cm:
+                sys.argv = [args.cmd, *(args.args or ())]
+                runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
+                return 0
 
-        case _:
-            raise TypeError(sel)
+            case CliFunc() as cf:
+                return cf.fn(*(args.args or ()))
+
+            case _:
+                raise TypeError(sel)
+
+    if args.cli_debug:
+        from omlish.diag.debug import debugging_on_exception
+
+        with debugging_on_exception():
+            return inner()
+
+    else:
+        return inner()
 
 
 if __name__ == '__main__':

omdev-0.0.0.dev64/omdev/cli/managers.py

@@ -0,0 +1,54 @@
+import enum
+import os.path
+import sys
+
+
+##
+
+
+def _normalize_pkg_name(s: str) -> str:
+    return s.lower().replace('_', '-')
+
+
+##
+
+
+class ManagerType(enum.Enum):
+    UVX = 'uvx'
+    PIPX = 'pipx'
+
+
+def detect_install_manager(cli_pkg: str) -> ManagerType | None:
+    if os.path.isfile(fp := os.path.join(sys.prefix, 'uv-receipt.toml')):
+        import tomllib
+
+        with open(fp) as f:
+            dct = tomllib.loads(f.read())
+
+        reqs = dct.get('tool', {}).get('requirements')
+        main_pkg = _normalize_pkg_name(reqs[0].get('name', ''))
+        if reqs and main_pkg == cli_pkg:
+            return ManagerType.UVX
+
+    if os.path.isfile(fp := os.path.join(sys.prefix, 'pipx_metadata.json')):
+        import json
+
+        with open(fp) as f:
+            dct = json.loads(f.read())
+
+        main_pkg = _normalize_pkg_name(dct.get('main_package', {}).get('package_or_url', ''))
+        if main_pkg == cli_pkg:
+            return ManagerType.PIPX
+
+    return None
+
+
+##
+
+
+def setup_install_manager(cli_pkg: str) -> None:
+    if detect_install_manager(cli_pkg) is None:
+        return
+
+    from .pathhack import _install_pth_file
+    _install_pth_file()

omdev-0.0.0.dev64/omdev/cli/pathhack.py

@@ -0,0 +1,43 @@
+"""
+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
+problematic empty string is added, so a sys.meta_path hook is prepended.
+
+See:
+  https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
+"""
+import os.path
+import site
+import sys
+
+
+def _remove_empty_from_sys_path() -> None:
+    while '' in sys.path:
+        sys.path.remove('')
+
+
+class _PathHackMetaFinder:
+    def find_spec(self, fullname, path, target=None):
+        _remove_empty_from_sys_path()
+        return None  # noqa
+
+
+def _activate_path_hack() -> None:
+    if not any(isinstance(mp, _PathHackMetaFinder) for mp in sys.meta_path):
+        sys.meta_path.insert(0, _PathHackMetaFinder())
+
+
+_PTH_FILE_NAME = f'omlish-{"-".join(__package__.split(".")[1:])}-pathhack.pth'
+
+
+def _install_pth_file() -> None:
+    sp = site.getsitepackages()[0]
+    if os.path.isfile(fp := os.path.join(sp, _PTH_FILE_NAME)):
+        return
+
+    with open(fp, 'w') as f:
+        f.write(f'import {__name__}; {__name__}._activate_path_hack()')
+
+    _activate_path_hack()