omdev 0.0.0.dev151__py3-none-any.whl → 0.0.0.dev153__py3-none-any.whl

omdev/cache/data/cache.py

@@ -24,8 +24,8 @@ import urllib.request
 from omlish import check
 from omlish import lang
 from omlish import marshal as msh
-from omlish import os as osu
 from omlish.formats import json
+from omlish.os.files import touch
 
 from ... import git
 from .actions import Action
@@ -262,7 +262,7 @@ class Cache:
         if not os.path.isdir(item_dir):
             self._fetch_item(spec, item_dir)
 
-        osu.touch(os.path.join(item_dir, 'accessed'))
+        touch(os.path.join(item_dir, 'accessed'))
 
         data_dir = os.path.join(item_dir, 'data')
         return self._return_val(spec, data_dir)

omdev/imgur.py

@@ -124,7 +124,7 @@ def _main() -> None:
 
             print(resp.data.link)
 
-    Cli().call_and_exit()
+    Cli()(exit=True)
 
 
 # @omlish-manifest

omdev/pycharm/cli.py

@@ -141,7 +141,7 @@ class Cli(ap.Cli):
 
 
 def _main() -> None:
-    Cli().call_and_exit()
+    Cli()(exit=True)
 
 
 if __name__ == '__main__':

omdev/pyproject/cli.py

@@ -25,7 +25,6 @@ import asyncio
 import concurrent.futures as cf
 import dataclasses as dc
 import functools
-import glob
 import itertools
 import multiprocessing as mp
 import os.path
@@ -34,23 +33,21 @@ import shutil
 import sys
 import typing as ta
 
-from omlish.lite.cached import async_cached_nullary
+from omlish.argparse.cli import ArgparseCli
+from omlish.argparse.cli import argparse_arg
+from omlish.argparse.cli import argparse_command
+from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_call
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.logs import configure_standard_logging
-from omlish.lite.logs import log
 from omlish.lite.runtime import check_runtime_version
-from omlish.lite.subprocesses import subprocess_check_call
 
-from ..interp.resolvers import DEFAULT_INTERP_RESOLVER
-from ..interp.types import InterpSpecifier
 from ..toml.parser import toml_loads
 from .configs import PyprojectConfig
 from .configs import PyprojectConfigPreparer
-from .configs import VenvConfig
 from .pkg import BasePyprojectPackageGenerator
 from .pkg import PyprojectPackageGenerator
-from .reqs import RequirementsRewriter
+from .venvs import Venv
 
 
 ##
@@ -101,105 +98,6 @@ def _script_rel_path() -> str:
 ##
 
 
-class Venv:
-    def __init__(
-            self,
-            name: str,
-            cfg: VenvConfig,
-    ) -> None:
-        super().__init__()
-        self._name = name
-        self._cfg = cfg
-
-    @property
-    def cfg(self) -> VenvConfig:
-        return self._cfg
-
-    DIR_NAME = '.venvs'
-
-    @property
-    def dir_name(self) -> str:
-        return os.path.join(self.DIR_NAME, self._name)
-
-    @async_cached_nullary
-    async def interp_exe(self) -> str:
-        i = InterpSpecifier.parse(check.not_none(self._cfg.interp))
-        return check.not_none(await DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
-
-    @cached_nullary
-    def exe(self) -> str:
-        ve = os.path.join(self.dir_name, 'bin/python')
-        if not os.path.isfile(ve):
-            raise Exception(f'venv exe {ve} does not exist or is not a file!')
-        return ve
-
-    @async_cached_nullary
-    async def create(self) -> bool:
-        if os.path.exists(dn := self.dir_name):
-            if not os.path.isdir(dn):
-                raise Exception(f'{dn} exists but is not a directory!')
-            return False
-
-        log.info('Using interpreter %s', (ie := await self.interp_exe()))
-        subprocess_check_call(ie, '-m', 'venv', dn)
-
-        ve = self.exe()
-        uv = self._cfg.use_uv
-
-        subprocess_check_call(
-            ve,
-            '-m', 'pip',
-            'install', '-v', '--upgrade',
-            'pip',
-            'setuptools',
-            'wheel',
-            *(['uv'] if uv else []),
-        )
-
-        if sr := self._cfg.requires:
-            rr = RequirementsRewriter(self._name)
-            reqs = [rr.rewrite(req) for req in sr]
-
-            # TODO: automatically try slower uv download when it fails? lol
-            #   Caused by: Failed to download distribution due to network timeout. Try increasing UV_HTTP_TIMEOUT (current value: 30s).  # noqa
-            #   UV_CONCURRENT_DOWNLOADS=4 UV_HTTP_TIMEOUT=3600
-
-            subprocess_check_call(
-                ve,
-                '-m',
-                *(['uv'] if uv else []),
-                'pip',
-                'install',
-                *([] if uv else ['-v']),
-                *reqs,
-            )
-
-        return True
-
-    @staticmethod
-    def _resolve_srcs(raw: ta.List[str]) -> ta.List[str]:
-        out: list[str] = []
-        seen: ta.Set[str] = set()
-        for r in raw:
-            es: list[str]
-            if any(c in r for c in '*?'):
-                es = list(glob.glob(r, recursive=True))
-            else:
-                es = [r]
-            for e in es:
-                if e not in seen:
-                    seen.add(e)
-                    out.append(e)
-        return out
-
-    @cached_nullary
-    def srcs(self) -> ta.Sequence[str]:
-        return self._resolve_srcs(self._cfg.srcs or [])
-
-
-##
-
-
 class Run:
     def __init__(
             self,
@@ -240,183 +138,160 @@ class Run:
 ##
 
 
-async def _venv_cmd(args) -> None:
-    venv = Run().venvs()[args.name]
-    if (sd := venv.cfg.docker) is not None and sd != (cd := args._docker_container):  # noqa
-        script = ' '.join([
-            'python3',
-            shlex.quote(_script_rel_path()),
-            f'--_docker_container={shlex.quote(sd)}',
-            *map(shlex.quote, sys.argv[1:]),
-        ])
+class PyprojectCli(ArgparseCli):
+    _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
+
+    @argparse_command(
+        argparse_arg('name'),
+        argparse_arg('-e', '--docker-env', action='append'),
+        argparse_arg('cmd', nargs='?'),
+        argparse_arg('args', nargs=argparse.REMAINDER),
+    )
+    async def venv(self) -> None:
+        venv = Run().venvs()[self.args.name]
+        if (sd := venv.cfg.docker) is not None and sd != (cd := self.args._docker_container):  # noqa
+            script = ' '.join([
+                'python3',
+                shlex.quote(_script_rel_path()),
+                f'--_docker_container={shlex.quote(sd)}',
+                *map(shlex.quote, sys.argv[1:]),
+            ])
+
+            docker_env = {
+                'DOCKER_HOST_PLATFORM': os.environ.get('DOCKER_HOST_PLATFORM', sys.platform),
+            }
+            for e in self.args.docker_env or []:
+                if '=' in e:
+                    k, _, v = e.split('=')
+                    docker_env[k] = v
+                else:
+                    docker_env[e] = os.environ.get(e, '')
+
+            await asyncio_subprocess_check_call(
+                'docker',
+                'compose',
+                '-f', 'docker/compose.yml',
+                'exec',
+                *itertools.chain.from_iterable(
+                    ('-e', f'{k}={v}')
+                    for k, v in docker_env.items()
+                ),
+                '-it', sd,
+                'bash', '--login', '-c', script,
+            )
 
-        docker_env = {
-            'DOCKER_HOST_PLATFORM': os.environ.get('DOCKER_HOST_PLATFORM', sys.platform),
-        }
-        for e in args.docker_env or []:
-            if '=' in e:
-                k, _, v = e.split('=')
-                docker_env[k] = v
-            else:
-                docker_env[e] = os.environ.get(e, '')
-
-        subprocess_check_call(
-            'docker',
-            'compose',
-            '-f', 'docker/compose.yml',
-            'exec',
-            *itertools.chain.from_iterable(
-                ('-e', f'{k}={v}')
-                for k, v in docker_env.items()
-            ),
-            '-it', sd,
-            'bash', '--login', '-c', script,
-        )
-
-        return
-
-    cmd = args.cmd
-    if not cmd:
-        await venv.create()
-
-    elif cmd == 'python':
-        await venv.create()
-        os.execl(
-            (exe := venv.exe()),
-            exe,
-            *args.args,
-        )
-
-    elif cmd == 'exe':
-        await venv.create()
-        check.arg(not args.args)
-        print(venv.exe())
-
-    elif cmd == 'run':
-        await venv.create()
-        sh = check.not_none(shutil.which('bash'))
-        script = ' '.join(args.args)
-        if not script:
-            script = sh
-        os.execl(
-            (bash := check.not_none(sh)),
-            bash,
-            '-c',
-            f'. {venv.dir_name}/bin/activate && ' + script,
-        )
-
-    elif cmd == 'srcs':
-        check.arg(not args.args)
-        print('\n'.join(venv.srcs()))
-
-    elif cmd == 'test':
-        await venv.create()
-        subprocess_check_call(venv.exe(), '-m', 'pytest', *(args.args or []), *venv.srcs())
-
-    else:
-        raise Exception(f'unknown subcommand: {cmd}')
+            return
 
+        cmd = self.args.cmd
+        if not cmd:
+            await venv.create()
 
-##
+        elif cmd == 'python':
+            await venv.create()
+            os.execl(
+                (exe := venv.exe()),
+                exe,
+                *self.args.args,
+            )
 
+        elif cmd == 'exe':
+            await venv.create()
+            check.arg(not self.args.args)
+            print(venv.exe())
+
+        elif cmd == 'run':
+            await venv.create()
+            sh = check.not_none(shutil.which('bash'))
+            script = ' '.join(self.args.args)
+            if not script:
+                script = sh
+            os.execl(
+                (bash := check.not_none(sh)),
+                bash,
+                '-c',
+                f'. {venv.dir_name}/bin/activate && ' + script,
+            )
 
-async def _pkg_cmd(args) -> None:
-    run = Run()
+        elif cmd == 'srcs':
+            check.arg(not self.args.args)
+            print('\n'.join(venv.srcs()))
 
-    cmd = args.cmd
-    if not cmd:
-        raise Exception('must specify command')
+        elif cmd == 'test':
+            await venv.create()
+            await asyncio_subprocess_check_call(venv.exe(), '-m', 'pytest', *(self.args.args or []), *venv.srcs())
 
-    elif cmd == 'gen':
-        pkgs_root = os.path.join('.pkg')
+        else:
+            raise Exception(f'unknown subcommand: {cmd}')
 
-        if os.path.exists(pkgs_root):
-            shutil.rmtree(pkgs_root)
+    @argparse_command(
+        argparse_arg('-b', '--build', action='store_true'),
+        argparse_arg('-r', '--revision', action='store_true'),
+        argparse_arg('-j', '--jobs', type=int),
+        argparse_arg('cmd', nargs='?'),
+        argparse_arg('args', nargs=argparse.REMAINDER),
+    )
+    async def pkg(self) -> None:
+        run = Run()
 
-        build_output_dir = 'dist'
-        run_build = bool(args.build)
-        add_revision = bool(args.revision)
+        cmd = self.args.cmd
+        if not cmd:
+            raise Exception('must specify command')
 
-        if run_build:
-            os.makedirs(build_output_dir, exist_ok=True)
+        elif cmd == 'gen':
+            pkgs_root = os.path.join('.pkg')
 
-        pgs: ta.List[BasePyprojectPackageGenerator] = [
-            PyprojectPackageGenerator(
-                dir_name,
-                pkgs_root,
-            )
-            for dir_name in run.cfg().pkgs
-        ]
-        pgs = list(itertools.chain.from_iterable([pg, *pg.children()] for pg in pgs))
+            if os.path.exists(pkgs_root):
+                shutil.rmtree(pkgs_root)
 
-        num_threads = args.jobs or int(max(mp.cpu_count() // 1.5, 1))
-        futs: ta.List[cf.Future]
-        with cf.ThreadPoolExecutor(num_threads) as ex:
-            futs = [ex.submit(pg.gen) for pg in pgs]
-            for fut in futs:
-                fut.result()
+            build_output_dir = 'dist'
+            run_build = bool(self.args.build)
+            add_revision = bool(self.args.revision)
 
             if run_build:
-                futs = [
-                    ex.submit(functools.partial(
-                        pg.build,
-                        build_output_dir,
-                        BasePyprojectPackageGenerator.BuildOpts(
-                            add_revision=add_revision,
-                        ),
-                    ))
-                    for pg in pgs
-                ]
+                os.makedirs(build_output_dir, exist_ok=True)
+
+            pgs: ta.List[BasePyprojectPackageGenerator] = [
+                PyprojectPackageGenerator(
+                    dir_name,
+                    pkgs_root,
+                )
+                for dir_name in run.cfg().pkgs
+            ]
+            pgs = list(itertools.chain.from_iterable([pg, *pg.children()] for pg in pgs))
+
+            num_threads = self.args.jobs or int(max(mp.cpu_count() // 1.5, 1))
+            futs: ta.List[cf.Future]
+            with cf.ThreadPoolExecutor(num_threads) as ex:
+                futs = [ex.submit(pg.gen) for pg in pgs]
                 for fut in futs:
                     fut.result()
 
-    else:
-        raise Exception(f'unknown subcommand: {cmd}')
+                if run_build:
+                    futs = [
+                        ex.submit(functools.partial(
+                            pg.build,
+                            build_output_dir,
+                            BasePyprojectPackageGenerator.BuildOpts(
+                                add_revision=add_revision,
+                            ),
+                        ))
+                        for pg in pgs
+                    ]
+                    for fut in futs:
+                        fut.result()
 
+        else:
+            raise Exception(f'unknown subcommand: {cmd}')
 
-##
-
-
-def _build_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--_docker_container', help=argparse.SUPPRESS)
-
-    subparsers = parser.add_subparsers()
-
-    #
-
-    parser_venv = subparsers.add_parser('venv')
-    parser_venv.add_argument('name')
-    parser_venv.add_argument('-e', '--docker-env', action='append')
-    parser_venv.add_argument('cmd', nargs='?')
-    parser_venv.add_argument('args', nargs=argparse.REMAINDER)
-    parser_venv.set_defaults(func=_venv_cmd)
-
-    #
-
-    parser_pkg = subparsers.add_parser('pkg')
-    parser_pkg.add_argument('-b', '--build', action='store_true')
-    parser_pkg.add_argument('-r', '--revision', action='store_true')
-    parser_pkg.add_argument('-j', '--jobs', type=int)
-    parser_pkg.add_argument('cmd', nargs='?')
-    parser_pkg.add_argument('args', nargs=argparse.REMAINDER)
-    parser_pkg.set_defaults(func=_pkg_cmd)
-
-    #
 
-    return parser
+##
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
     check_runtime_version()
     configure_standard_logging()
 
-    parser = _build_parser()
-    args = parser.parse_args(argv)
-    if not getattr(args, 'func', None):
-        parser.print_help()
-    else:
-        await args.func(args)
+    await PyprojectCli(argv).async_cli_run()
 
 
 def _main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:

omdev/pyproject/venvs.py

@@ -0,0 +1,114 @@
+# ruff: noqa: UP006 UP007
+import glob
+import os.path
+import typing as ta
+
+from omlish.lite.asyncio.subprocesses import asyncio_subprocess_check_call
+from omlish.lite.cached import async_cached_nullary
+from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
+from omlish.lite.logs import log
+
+from ..interp.resolvers import DEFAULT_INTERP_RESOLVER
+from ..interp.types import InterpSpecifier
+from .configs import VenvConfig
+from .reqs import RequirementsRewriter
+
+
+##
+
+
+class Venv:
+    def __init__(
+            self,
+            name: str,
+            cfg: VenvConfig,
+    ) -> None:
+        super().__init__()
+        self._name = name
+        self._cfg = cfg
+
+    @property
+    def cfg(self) -> VenvConfig:
+        return self._cfg
+
+    DIR_NAME = '.venvs'
+
+    @property
+    def dir_name(self) -> str:
+        return os.path.join(self.DIR_NAME, self._name)
+
+    @async_cached_nullary
+    async def interp_exe(self) -> str:
+        i = InterpSpecifier.parse(check.not_none(self._cfg.interp))
+        return check.not_none(await DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
+
+    @cached_nullary
+    def exe(self) -> str:
+        ve = os.path.join(self.dir_name, 'bin/python')
+        if not os.path.isfile(ve):
+            raise Exception(f'venv exe {ve} does not exist or is not a file!')
+        return ve
+
+    @async_cached_nullary
+    async def create(self) -> bool:
+        if os.path.exists(dn := self.dir_name):
+            if not os.path.isdir(dn):
+                raise Exception(f'{dn} exists but is not a directory!')
+            return False
+
+        log.info('Using interpreter %s', (ie := await self.interp_exe()))
+        await asyncio_subprocess_check_call(ie, '-m', 'venv', dn)
+
+        ve = self.exe()
+        uv = self._cfg.use_uv
+
+        await asyncio_subprocess_check_call(
+            ve,
+            '-m', 'pip',
+            'install', '-v', '--upgrade',
+            'pip',
+            'setuptools',
+            'wheel',
+            *(['uv'] if uv else []),
+        )
+
+        if sr := self._cfg.requires:
+            rr = RequirementsRewriter(self._name)
+            reqs = [rr.rewrite(req) for req in sr]
+
+            # TODO: automatically try slower uv download when it fails? lol
+            #   Caused by: Failed to download distribution due to network timeout. Try increasing UV_HTTP_TIMEOUT (current value: 30s).  # noqa
+            #   UV_CONCURRENT_DOWNLOADS=4 UV_HTTP_TIMEOUT=3600
+
+            await asyncio_subprocess_check_call(
+                ve,
+                '-m',
+                *(['uv'] if uv else []),
+                'pip',
+                'install',
+                *([] if uv else ['-v']),
+                *reqs,
+            )
+
+        return True
+
+    @staticmethod
+    def _resolve_srcs(raw: ta.List[str]) -> ta.List[str]:
+        out: list[str] = []
+        seen: ta.Set[str] = set()
+        for r in raw:
+            es: list[str]
+            if any(c in r for c in '*?'):
+                es = list(glob.glob(r, recursive=True))
+            else:
+                es = [r]
+            for e in es:
+                if e not in seen:
+                    seen.add(e)
+                    out.append(e)
+        return out
+
+    @cached_nullary
+    def srcs(self) -> ta.Sequence[str]:
+        return self._resolve_srcs(self._cfg.srcs or [])