omdev 0.0.18__tar.gz → 0.0.20__tar.gz

{omdev-0.0.18/omdev.egg-info → omdev-0.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.18
+Version: 0.0.20
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,18 +14,18 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.18
+Requires-Dist: omlish==0.0.20
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.18; extra == "all"
-Requires-Dist: ommlds==0.0.18; extra == "all"
-Requires-Dist: black~=26.3; extra == "all"
+Requires-Dist: ominfra==0.0.20; extra == "all"
+Requires-Dist: ommlds==0.0.20; extra == "all"
+Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.2; extra == "all"
 Requires-Dist: mdit-py-plugins~=0.6; extra == "all"
 Requires-Dist: pygments~=2.20; extra == "all"
-Requires-Dist: mypy~=1.20; extra == "all"
+Requires-Dist: mypy~=2.1; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=15.0; extra == "all"
@@ -33,11 +33,11 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.18; extra == "ominfra"
+Requires-Dist: ominfra==0.0.20; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.18; extra == "ommlds"
+Requires-Dist: ommlds==0.0.20; extra == "ommlds"
 Provides-Extra: black
-Requires-Dist: black~=26.3; extra == "black"
+Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
 Requires-Dist: pycparser~=3.0; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
@@ -47,7 +47,7 @@ Requires-Dist: markdown-it-py~=4.2; extra == "doc"
 Requires-Dist: mdit-py-plugins~=0.6; extra == "doc"
 Requires-Dist: pygments~=2.20; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=1.20; extra == "mypy"
+Requires-Dist: mypy~=2.1; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: qr

{omdev-0.0.18 → omdev-0.0.20}/omdev/.omlish-manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 323,
+    "line": 387,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cli",
@@ -95,6 +95,20 @@
       }
     }
   },
+  {
+    "module": ".home.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/home/__main__.py",
+    "line": 4,
+    "value": {
+      "!.cli.types.CliModule": {
+        "name": [
+          "home"
+        ],
+        "module": "omdev.home.__main__"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_CLI_MODULE",

{omdev-0.0.18 → omdev-0.0.20}/omdev/__about__.py

@@ -23,7 +23,7 @@ class Project(ProjectBase):
         #
 
         'black': [
-            'black ~= 26.3',
+            'black ~= 26.5',
         ],
 
         'c': [
@@ -41,7 +41,7 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 1.20',
+            'mypy ~= 2.1',
         ],
 
         'prof': [

{omdev-0.0.18 → omdev-0.0.20}/omdev/ci/docker/cacheserved/cache.py

@@ -18,12 +18,12 @@ from omlish.logs.modules import get_module_logger
 
 from ....dataserver.server import DataServer
 from ....dataserver.targets import DataServerTarget
-from ....oci.building import build_oci_index_repository
-from ....oci.data import get_single_leaf_oci_image_index
-from ....oci.dataserver import build_oci_repository_data_server_routes
-from ....oci.loading import read_oci_repository_root_index
-from ....oci.pack.repositories import OciPackedRepositoryBuilder
-from ....oci.repositories import OciRepository
+from ....specs.oci.building import build_oci_index_repository
+from ....specs.oci.data import get_single_leaf_oci_image_index
+from ....specs.oci.dataserver import build_oci_repository_data_server_routes
+from ....specs.oci.loading import read_oci_repository_root_index
+from ....specs.oci.pack.repositories import OciPackedRepositoryBuilder
+from ....specs.oci.repositories import OciRepository
 from ...cache import DataCache
 from ...cache import read_data_cache_data
 from ..cache import DockerCache

{omdev-0.0.18 → omdev-0.0.20}/omdev/ci/docker/dataserver.py

@@ -8,8 +8,8 @@ import typing as ta
 
 from omlish.docker.ports import DockerPortRelay
 from omlish.http.simple.handlers import LoggingSimpleHttpHandler
-from omlish.http.simple.handlers import SimpleHttpHandler
 from omlish.http.simple.pipelines.sync import make_simple_http_server
+from omlish.http.simple.types import SimpleHttpHandler
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import AsyncExitStacked

{omdev-0.0.18 → omdev-0.0.20}/omdev/ci/docker/packing.py

@@ -11,9 +11,9 @@ from omlish.lite.contextmanagers import ExitStacked
 from omlish.logs.utils import log_timing_context
 from omlish.os.temp import temp_dir_context
 
-from ...oci.building import BuiltOciImageIndexRepository
-from ...oci.pack.repositories import OciPackedRepositoryBuilder
-from ...oci.repositories import DirectoryOciRepository
+from ...specs.oci.building import BuiltOciImageIndexRepository
+from ...specs.oci.pack.repositories import OciPackedRepositoryBuilder
+from ...specs.oci.repositories import DirectoryOciRepository
 
 
 ##

{omdev-0.0.18 → omdev-0.0.20}/omdev/ci/docker/repositories.py

@@ -9,8 +9,8 @@ from omlish.lite.abstract import Abstract
 from omlish.lite.timing import log_timing_context
 from omlish.os.temp import temp_dir_context
 
-from ...oci.repositories import DirectoryOciRepository
-from ...oci.repositories import OciRepository
+from ...specs.oci.repositories import DirectoryOciRepository
+from ...specs.oci.repositories import OciRepository
 
 
 ##

{omdev-0.0.18 → omdev-0.0.20}/omdev/cli/clicli.py

@@ -1,3 +1,9 @@
+"""
+TODO:
+ - uninstall cmd
+   - manifest uninstall hooks
+ - fix must-upgrade loop lol, catch venv build failure (due to temporary incomplete pypi matching version availability)
+"""
 import dataclasses as dc
 import inspect
 import os
@@ -28,6 +34,9 @@ from .types import CliModule
 DEFAULT_REINSTALL_URL = 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py'
 
 
+##
+
+
 _VALID_VERSION_STR = re.compile(r'\d+(\.\d+(\.\d+(\.dev\d+)?)?)?')
 
 
@@ -37,159 +46,147 @@ def _parse_latest_version_str(s: str) -> str:
     return s
 
 
-class CliCli(ap.Cli):
+def build_deps(
+        *,
+        no_deps: bool = False,
+        extra_deps: ta.Sequence[str] | None = None,
+) -> ta.Sequence[str]:
+    dep_set: set[str] = set(extra_deps or [])
+    if not no_deps:
+        root_dists = get_root_dists()
+        dep_set.update(set(root_dists))
+    return sorted(dep_set - {install.DEFAULT_CLI_PKG})
 
-    #
 
-    @ap.cmd(name='version', aliases=['ver'])
-    def print_version(self) -> None:
-        print(__about__.__version__)
+def build_recovery_command(
+        target_version: str,
+        *,
+        url: str | None = None,
+        deps: ta.Sequence[str] | None = None,
+) -> str:
+    if url is None:
+        url = DEFAULT_REINSTALL_URL
+    if deps is None:
+        deps = build_deps()
 
-    @ap.cmd(name='revision', aliases=['rev'])
-    def print_revision(self) -> None:
-        print(__about__.__revision__)
+    parsed = urllib.parse.urlparse(url)
+    if parsed.scheme not in ('https', 'file'):
+        raise RuntimeError(f'Insecure url schem: {url}')
 
-    @ap.cmd(name='home')
-    def print_home(self) -> None:
-        print(sys.prefix)
+    reco_cmd = ' '.join([
+        'curl -LsSf',
+        f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
+        f'| python3 - --version {shlex.quote(target_version)}',
+        *deps,
+    ])
 
-    #
+    return reco_cmd
 
-    def _passthrough_args_cmd(
-            self,
-            exe: str,
-            pre_args: ta.Sequence[str] = (),
-            post_args: ta.Sequence[str] = (),
-    ) -> ta.NoReturn:
-        os.execvp(
-            exe,
-            [
-                sys.executable,
-                *pre_args,
-                *self.unknown_args,
-                *self.args.args,
-                *post_args,
-            ],
-        )
 
-    @ap.cmd(
-        ap.arg('args', nargs=ap.REMAINDER),
-        name='python',
-        aliases=['py'],
-        accepts_unknown=True,
-    )
-    def python_cmd(self) -> None:
-        self._passthrough_args_cmd(sys.executable)
+##
 
-    @ap.cmd(
-        ap.arg('args', nargs=ap.REMAINDER),
-        name='pip',
-        accepts_unknown=True,
-    )
-    def pip_cmd(self) -> None:
-        self._passthrough_args_cmd(sys.executable, ['-m', 'pip'])
 
-    #
+class Reinstall:
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Config:
+        url: str = DEFAULT_REINSTALL_URL
+        local: bool = False
+        no_deps: bool = False
+        no_uv: bool = False
+        dry_run: bool = False
+        must_upgrade: bool = False
+        must_upgrade_loop: bool = False
+        version: str | None = None
+        extra_deps: ta.Sequence[str] | None = None
 
-    def _build_deps(
-            self,
-            *,
-            no_deps: bool = False,
-            extra_deps: ta.Sequence[str] | None = None,
-    ) -> ta.Sequence[str]:
-        dep_set: set[str] = set(extra_deps or [])
-        if not no_deps:
-            root_dists = get_root_dists()
-            dep_set.update(set(root_dists))
-        return sorted(dep_set - {install.DEFAULT_CLI_PKG})
+    def __init__(self, config: Config = Config()) -> None:
+        super().__init__()
 
-    @ap.cmd(name='deps')
-    def deps_cmd(self) -> None:
-        print('\n'.join(self._build_deps()))
+        self._cfg = config
 
     #
 
-    def _build_recovery_command(
+    class VenvInstallCheckError(Exception):
+        pass
+
+    def _check_venv_install(
             self,
             target_version: str,
-            *,
-            url: str | None = None,
-            deps: ta.Sequence[str] | None = None,
-    ) -> str:
-        if url is None:
-            url = DEFAULT_REINSTALL_URL
-        if deps is None:
-            deps = self._build_deps()
-
-        parsed = urllib.parse.urlparse(url)
-        if parsed.scheme not in ('https', 'file'):
-            raise RuntimeError(f'Insecure url schem: {url}')
-
-        reco_cmd = ' '.join([
-            'curl -LsSf',
-            f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-            f'| python3 - --version {shlex.quote(target_version)}',
-            *deps,
-        ])
-
-        return reco_cmd
-
-    @ap.cmd(
-        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
-        ap.arg('--no-deps', action='store_true'),
-        ap.arg('--version'),
-        ap.arg('extra_deps', nargs='*'),
-    )
-    def recovery(self) -> None:
-        reco_cmd = self._build_recovery_command(
-            self.args.version or __about__.__version__,
-            url=self.args.url,
-            deps=self._build_deps(
-                no_deps=self.args.no_deps,
-                extra_deps=self.args.extra_deps,
-            ),
-        )
+            deps: ta.Sequence[str],
+    ) -> None:
+        with temp_dir_context() as tmp_dir:
+            venv_dir = os.path.join(tmp_dir, 'venv')
+            subprocess.check_call([
+                sys.executable,
+                '-m', 'venv',
+                venv_dir,
+            ])
+            venv_exe = os.path.join(venv_dir, 'bin', 'python')
+
+            subprocess.check_call([
+                venv_exe,
+                '-m', 'ensurepip',
+                '--upgrade',
+            ])
+
+            if self._cfg.no_uv:
+                pip_install_cmd = [
+                    venv_exe,
+                    '-m', 'pip',
+                    'install',
+                ]
+            else:
+                subprocess.check_call([
+                    venv_exe,
+                    '-m', 'pip',
+                    'install',
+                    'uv',
+                ])
+                pip_install_cmd = [
+                    venv_exe,
+                    '-m', 'uv',
+                    'pip',
+                    'install',
+                    '--refresh',
+                ]
 
-        print(reco_cmd)
+            try:
+                subprocess.check_call([
+                    *pip_install_cmd,
+                    '--dry-run',
+                    f'{install.DEFAULT_CLI_PKG}=={target_version}',
+                    *deps,
+                ])
+            except subprocess.CalledProcessError as e:
+                raise Reinstall.VenvInstallCheckError from e
 
     #
 
     @dc.dataclass()
-    class ReinstallWouldNotUpgradeError(Exception):
+    class WouldNotUpgradeError(Exception):
         current_version: str
         target_version: str
 
         def __str__(self) -> str:
             return f'Current version {self.current_version} is not older than target version {self.target_version} '
 
-    @ap.cmd(
-        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
-        ap.arg('--local', action='store_true'),
-        ap.arg('--no-deps', action='store_true'),
-        ap.arg('--no-uv', action='store_true'),
-        ap.arg('--dry-run', action='store_true'),
-        ap.arg('--must-upgrade', action='store_true'),
-        ap.arg('--must-upgrade-loop', action='store_true'),
-        ap.arg('--version'),
-        ap.arg('extra_deps', nargs='*'),
-    )
-    def reinstall(self) -> None:
+    def run(self) -> None:
         current_version = __about__.__version__
 
         while True:
             latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
 
-            if self.args.version is not None:
-                target_version: str = self.args.version
+            if self._cfg.version is not None:
+                target_version: str = self._cfg.version
             else:
                 target_version = latest_version
 
-            if self.args.must_upgrade or self.args.must_upgrade_loop:
+            if self._cfg.must_upgrade or self._cfg.must_upgrade_loop:
                 current_vo = Version(current_version)
                 target_vo = Version(target_version)
                 if not (target_vo > current_vo):
-                    ex = CliCli.ReinstallWouldNotUpgradeError(current_version, target_version)
-                    if self.args.must_upgrade_loop:
+                    ex = Reinstall.WouldNotUpgradeError(current_version, target_version)
+                    if self._cfg.must_upgrade_loop:
                         print(ex)
                         time.sleep(1)
                         continue
@@ -200,9 +197,9 @@ class CliCli(ap.Cli):
 
         #
 
-        deps = self._build_deps(
-            no_deps=self.args.no_deps,
-            extra_deps=self.args.extra_deps,
+        deps = build_deps(
+            no_deps=self._cfg.no_deps,
+            extra_deps=self._cfg.extra_deps,
         )
 
         #
@@ -210,50 +207,12 @@ class CliCli(ap.Cli):
         if lang.can_import('venv'):
             print('Checking venv install')
 
-            with temp_dir_context() as tmp_dir:
-                venv_dir = os.path.join(tmp_dir, 'venv')
-                subprocess.check_call([
-                    sys.executable,
-                    '-m', 'venv',
-                    venv_dir,
-                ])
-                venv_exe = os.path.join(venv_dir, 'bin', 'python')
-
-                subprocess.check_call([
-                    venv_exe,
-                    '-m', 'ensurepip',
-                    '--upgrade',
-                ])
-
-                if self.args.no_uv:
-                    pip_install_cmd = [
-                        venv_exe,
-                        '-m', 'pip',
-                        'install',
-                    ]
-                else:
-                    subprocess.check_call([
-                        venv_exe,
-                        '-m', 'pip',
-                        'install',
-                        'uv',
-                    ])
-                    pip_install_cmd = [
-                        venv_exe,
-                        '-m', 'uv',
-                        'pip',
-                        'install',
-                        '--refresh',
-                    ]
-
-                subprocess.check_call([
-                    *pip_install_cmd,
-                    '--dry-run',
-                    f'{install.DEFAULT_CLI_PKG}=={target_version}',
-                    *deps,
-                ])
+            self._check_venv_install(
+                target_version,
+                deps,
+            )
 
-                print('venv install check successful')
+            print('venv install check successful')
 
         else:
             print('venv not present, cannot check install')
@@ -271,10 +230,10 @@ class CliCli(ap.Cli):
 
         #
 
-        if self.args.local:
+        if self._cfg.local:
             print('Reinstalling from local installer.')
         else:
-            print(f'Reinstalling from script url: {self.args.url}')
+            print(f'Reinstalling from script url: {self._cfg.url}')
         print()
 
         #
@@ -291,13 +250,13 @@ class CliCli(ap.Cli):
 
         #
 
-        if self.args.local:
+        if self._cfg.local:
             install_src = inspect.getsource(install)
 
         else:
-            url = self.args.url
+            url = self._cfg.url
 
-            reco_cmd = self._build_recovery_command(
+            reco_cmd = build_recovery_command(
                 target_version,
                 url=url,
                 deps=deps,
@@ -308,7 +267,7 @@ class CliCli(ap.Cli):
             with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa
                 install_src = resp.read().decode('utf-8')
 
-        if self.args.dry_run:
+        if self._cfg.dry_run:
             return
 
         os.execl(
@@ -320,6 +279,111 @@ class CliCli(ap.Cli):
         )
 
 
+##
+
+
+class CliCli(ap.Cli):
+    @ap.cmd(name='version', aliases=['ver'])
+    def print_version(self) -> None:
+        print(__about__.__version__)
+
+    @ap.cmd(name='revision', aliases=['rev'])
+    def print_revision(self) -> None:
+        print(__about__.__revision__)
+
+    @ap.cmd(name='home')
+    def print_home(self) -> None:
+        print(sys.prefix)
+
+    #
+
+    def _passthrough_args_cmd(
+            self,
+            exe: str,
+            pre_args: ta.Sequence[str] = (),
+            post_args: ta.Sequence[str] = (),
+    ) -> ta.NoReturn:
+        os.execvp(
+            exe,
+            [
+                sys.executable,
+                *pre_args,
+                *self.unknown_args,
+                *self.args.args,
+                *post_args,
+            ],
+        )
+
+    @ap.cmd(
+        ap.arg('args', nargs=ap.REMAINDER),
+        name='python',
+        aliases=['py'],
+        accepts_unknown=True,
+    )
+    def python_cmd(self) -> None:
+        self._passthrough_args_cmd(sys.executable)
+
+    @ap.cmd(
+        ap.arg('args', nargs=ap.REMAINDER),
+        name='pip',
+        accepts_unknown=True,
+    )
+    def pip_cmd(self) -> None:
+        self._passthrough_args_cmd(sys.executable, ['-m', 'pip'])
+
+    #
+
+    @ap.cmd(name='deps')
+    def deps_cmd(self) -> None:
+        print('\n'.join(build_deps()))
+
+    #
+
+    @ap.cmd(
+        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
+        ap.arg('--no-deps', action='store_true'),
+        ap.arg('--version'),
+        ap.arg('extra_deps', nargs='*'),
+    )
+    def recovery(self) -> None:
+        reco_cmd = build_recovery_command(
+            self.args.version or __about__.__version__,
+            url=self.args.url,
+            deps=build_deps(
+                no_deps=self.args.no_deps,
+                extra_deps=self.args.extra_deps,
+            ),
+        )
+
+        print(reco_cmd)
+
+    #
+
+    @ap.cmd(
+        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
+        ap.arg('--local', action='store_true'),
+        ap.arg('--no-deps', action='store_true'),
+        ap.arg('--no-uv', action='store_true'),
+        ap.arg('--dry-run', action='store_true'),
+        ap.arg('--must-upgrade', action='store_true'),
+        ap.arg('--must-upgrade-loop', action='store_true'),
+        ap.arg('--version'),
+        ap.arg('extra_deps', nargs='*'),
+    )
+    def reinstall(self) -> None:
+        Reinstall(Reinstall.Config(
+            url=self.args.url,
+            local=bool(self.args.local),
+            no_deps=bool(self.args.no_deps),
+            no_uv=bool(self.args.no_uv),
+            dry_run=bool(self.args.dry_run),
+            must_upgrade=bool(self.args.must_upgrade),
+            must_upgrade_loop=bool(self.args.must_upgrade_loop),
+            version=self.args.version,
+            extra_deps=self.args.extra_deps,
+        )).run()
+
+
 # @omlish-manifest
 _CLI_MODULE = CliModule('cli', __name__)