omdev 0.0.0.dev179__py3-none-any.whl → 0.0.0.dev181__py3-none-any.whl

omdev/.manifests.json

@@ -96,14 +96,14 @@
     }
   },
   {
-    "module": ".magic.find",
+    "module": ".magic.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/magic/find.py",
-    "line": 230,
+    "file": "omdev/magic/__main__.py",
+    "line": 4,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "py/findmagic",
-        "mod_name": "omdev.magic.find"
+        "cmd_name": "magic",
+        "mod_name": "omdev.magic.__main__"
       }
     }
   },

omdev/cli/clicli.py

@@ -21,15 +21,15 @@ class CliCli(ap.Cli):
 
     #
 
-    @ap.command(name='version', aliases=['ver'])
+    @ap.cmd(name='version', aliases=['ver'])
     def print_version(self) -> None:
         print(__about__.__version__)
 
-    @ap.command(name='revision', aliases=['rev'])
+    @ap.cmd(name='revision', aliases=['rev'])
     def print_revision(self) -> None:
         print(__about__.__revision__)
 
-    @ap.command(name='home')
+    @ap.cmd(name='home')
     def print_home(self) -> None:
         print(sys.prefix)
 
@@ -52,7 +52,7 @@ class CliCli(ap.Cli):
             ],
         )
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('args', nargs=ap.REMAINDER),
         name='python',
         accepts_unknown=True,
@@ -60,7 +60,7 @@ class CliCli(ap.Cli):
     def python_cmd(self) -> None:
         self._passthrough_args_cmd(sys.executable)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('args', nargs=ap.REMAINDER),
         name='pip',
         accepts_unknown=True,
@@ -70,7 +70,7 @@ class CliCli(ap.Cli):
 
     #
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('extra_deps', nargs='*'),

omdev/imgur.py

@@ -107,7 +107,7 @@ def _main() -> None:
     from omlish.argparse import all as ap
 
     class Cli(ap.Cli):
-        @ap.command(
+        @ap.cmd(
             ap.arg('file'),
         )
         def upload(self) -> None:

omdev/interp/cli.py

@@ -12,7 +12,7 @@ import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_command
+from omlish.argparse.cli import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.inject import Injector
@@ -37,7 +37,7 @@ class InterpCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-d', '--debug', action='store_true'),
     )
@@ -46,7 +46,7 @@ class InterpCli(ArgparseCli):
         s = InterpSpecifier.parse(self.args.version)
         await r.list(s)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-p', '--provider'),
         argparse_arg('-d', '--debug', action='store_true'),

omdev/interp/inspect.py

@@ -6,7 +6,6 @@ import sys
 import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
-from omlish.lite.logs import log
 
 from ..packaging.versions import Version
 from .types import InterpOpts
@@ -43,9 +42,15 @@ class InterpInspection:
 
 
 class InterpInspector:
-    def __init__(self) -> None:
+    def __init__(
+            self,
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
         super().__init__()
 
+        self._log = log
+
         self._cache: ta.Dict[str, ta.Optional[InterpInspection]] = {}
 
     _RAW_INSPECTION_CODE = """
@@ -94,8 +99,8 @@ class InterpInspector:
             try:
                 ret = await self._inspect(exe)
             except Exception as e:  # noqa
-                if log.isEnabledFor(logging.DEBUG):
-                    log.exception('Failed to inspect interp: %s', exe)
+                if self._log is not None and self._log.isEnabledFor(logging.DEBUG):
+                    self._log.exception('Failed to inspect interp: %s', exe)
                 ret = None
             self._cache[exe] = ret
             return ret

omdev/interp/providers/system.py

@@ -5,13 +5,13 @@ TODO:
  - check if path py's are venvs: sys.prefix != sys.base_prefix
 """
 import dataclasses as dc
+import logging
 import os
 import re
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.logs import log
 
 from ...packaging.versions import InvalidVersion
 from ..inspect import InterpInspector
@@ -37,12 +37,14 @@ class SystemInterpProvider(InterpProvider):
             options: Options = Options(),
             *,
             inspector: ta.Optional[InterpInspector] = None,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
 
         self._options = options
 
         self._inspector = inspector
+        self._log = log
 
     #
 
@@ -116,7 +118,8 @@ class SystemInterpProvider(InterpProvider):
         lst = []
         for e in self.exes():
             if (ev := await self.get_exe_version(e)) is None:
-                log.debug('Invalid system version: %s', e)
+                if self._log is not None:
+                    self._log.debug('Invalid system version: %s', e)
                 continue
             lst.append((e, ev))
         return lst

omdev/interp/pyenv/pyenv.py

@@ -13,6 +13,7 @@ TODO:
 import abc
 import dataclasses as dc
 import itertools
+import logging
 import os.path
 import shutil
 import sys
@@ -22,7 +23,6 @@ from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 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 ...packaging.versions import InvalidVersion
 from ...packaging.versions import Version
@@ -355,6 +355,7 @@ class PyenvInterpProvider(InterpProvider):
             *,
             pyenv: Pyenv,
             inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
 
@@ -362,6 +363,7 @@ class PyenvInterpProvider(InterpProvider):
 
         self._pyenv = pyenv
         self._inspector = inspector
+        self._log = log
 
     #
 
@@ -406,7 +408,8 @@ class PyenvInterpProvider(InterpProvider):
         ret: ta.List[PyenvInterpProvider.Installed] = []
         for vn, ep in await self._pyenv.version_exes():
             if (i := await self._make_installed(vn, ep)) is None:
-                log.debug('Invalid pyenv version: %s', vn)
+                if self._log is not None:
+                    self._log.debug('Invalid pyenv version: %s', vn)
                 continue
             ret.append(i)
         return ret

omdev/interp/venvs.py

@@ -0,0 +1,114 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import logging
+import os.path
+import typing as ta
+
+from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.cached import async_cached_nullary
+from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
+from omlish.lite.typing import Func2
+
+from .default import get_default_interp_resolver
+from .types import InterpSpecifier
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class InterpVenvConfig:
+    interp: ta.Optional[str] = None
+    requires: ta.Optional[ta.Sequence[str]] = None
+    use_uv: ta.Optional[bool] = None
+
+
+class InterpVenvRequirementsProcessor(Func2['InterpVenv', ta.Sequence[str], ta.Sequence[str]]):
+    pass
+
+
+class InterpVenv:
+    def __init__(
+            self,
+            path: str,
+            cfg: InterpVenvConfig,
+            *,
+            requirements_processor: ta.Optional[InterpVenvRequirementsProcessor] = None,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._path = path
+        self._cfg = cfg
+
+        self._requirements_processor = requirements_processor
+        self._log = log
+
+    @property
+    def path(self) -> str:
+        return self._path
+
+    @property
+    def cfg(self) -> InterpVenvConfig:
+        return self._cfg
+
+    @async_cached_nullary
+    async def interp_exe(self) -> str:
+        i = InterpSpecifier.parse(check.not_none(self._cfg.interp))
+        return check.not_none(await get_default_interp_resolver().resolve(i, install=True)).exe
+
+    @cached_nullary
+    def exe(self) -> str:
+        ve = os.path.join(self._path, '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._path):
+            if not os.path.isdir(dn):
+                raise Exception(f'{dn} exists but is not a directory!')
+            return False
+
+        ie = await self.interp_exe()
+
+        if self._log is not None:
+            self._log.info('Using interpreter %s', ie)
+
+        await asyncio_subprocesses.check_call(ie, '-m', 'venv', dn)
+
+        ve = self.exe()
+        uv = self._cfg.use_uv
+
+        await asyncio_subprocesses.check_call(
+            ve,
+            '-m', 'pip',
+            'install', '-v', '--upgrade',
+            'pip',
+            'setuptools',
+            'wheel',
+            *(['uv'] if uv else []),
+        )
+
+        if sr := self._cfg.requires:
+            reqs = list(sr)
+            if self._requirements_processor is not None:
+                reqs = list(self._requirements_processor(self, reqs))
+
+            # 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_subprocesses.check_call(
+                ve,
+                '-m',
+                *(['uv'] if uv else []),
+                'pip',
+                'install',
+                *([] if uv else ['-v']),
+                *reqs,
+            )
+
+        return True

omdev/magic/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('magic', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main
+
+    _main()

omdev/magic/cli.py

@@ -0,0 +1,54 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+from omlish.argparse.cli import ArgparseCli
+from omlish.argparse.cli import argparse_arg
+from omlish.argparse.cli import argparse_cmd
+
+from .find import find_magic_files
+from .find import find_magic_py_modules
+from .styles import C_MAGIC_STYLE
+from .styles import PY_MAGIC_STYLE
+
+
+##
+
+
+class MagicCli(ArgparseCli):
+    @argparse_cmd(
+        argparse_arg('--style', '-s', default='py'),
+        argparse_arg('--key', '-k', dest='keys', action='append'),
+        argparse_arg('--modules', action='store_true'),
+        argparse_arg('roots', nargs='*'),
+    )
+    def find(self) -> None:
+        style = {
+            'py': PY_MAGIC_STYLE,
+            'c': C_MAGIC_STYLE,
+        }[self.args.style]
+
+        kw: dict = dict(
+            roots=self.args.roots,
+            style=style,
+            keys=self.args.keys,
+        )
+
+        fn: ta.Callable
+        if self.args.modules:
+            fn = find_magic_py_modules
+        else:
+            fn = find_magic_files
+
+        for out in fn(**kw):
+            print(out)
+
+
+##
+
+
+def _main(argv=None) -> None:
+    MagicCli(argv).cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

omdev/magic/find.py

@@ -7,7 +7,6 @@ import typing as ta
 from .magic import Magic
 from .prepare import MagicPrepareError
 from .prepare import py_compile_magic_preparer
-from .styles import C_MAGIC_STYLE
 from .styles import PY_MAGIC_STYLE
 from .styles import MagicStyle
 
@@ -222,47 +221,3 @@ def find_magic_py_modules(
             yield fp[:-3].replace(os.sep, '.')
         else:
             yield fp
-
-
-##
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/findmagic',
-    'mod_name': __name__,
-}}
-
-
-if __name__ == '__main__':
-    def _main(argv=None) -> None:
-        import argparse
-
-        arg_parser = argparse.ArgumentParser()
-        arg_parser.add_argument('--style', '-s', default='py')
-        arg_parser.add_argument('--key', '-k', dest='keys', action='append')
-        arg_parser.add_argument('--modules', action='store_true')
-        arg_parser.add_argument('roots', nargs='*')
-        args = arg_parser.parse_args(argv)
-
-        style = {
-            'py': PY_MAGIC_STYLE,
-            'c': C_MAGIC_STYLE,
-        }[args.style]
-
-        kw: dict = dict(
-            roots=args.roots,
-            style=style,
-            keys=args.keys,
-        )
-
-        fn: ta.Callable
-        if args.modules:
-            fn = find_magic_py_modules
-        else:
-            fn = find_magic_files
-
-        for out in fn(**kw):
-            print(out)
-
-    _main()

omdev/pycharm/cli.py

@@ -77,11 +77,11 @@ def parse_wmctrl_lxp_line(l: str) -> WmctrlLine:
 
 
 class Cli(ap.Cli):
-    @ap.command()
+    @ap.cmd()
     def version(self) -> None:
         print(get_pycharm_version())
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('python-exe'),
         ap.arg('args', nargs=ap.REMAINDER),
     )
@@ -99,7 +99,7 @@ class Cli(ap.Cli):
         proc = subprocess.run([exe, src_file, *self.args.args], check=False)
         return proc.returncode
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('dir', nargs='?'),
         ap.arg('--clion', action='store_true'),
     )

omdev/pyproject/cli.py

@@ -35,7 +35,7 @@ import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_command
+from omlish.argparse.cli import argparse_cmd
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
@@ -141,7 +141,7 @@ class Run:
 class PyprojectCli(ArgparseCli):
     _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('name'),
         argparse_arg('-e', '--docker-env', action='append'),
         argparse_arg('cmd', nargs='?'),
@@ -223,7 +223,7 @@ class PyprojectCli(ArgparseCli):
         else:
             raise Exception(f'unknown subcommand: {cmd}')
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('-b', '--build', action='store_true'),
         argparse_arg('-r', '--revision', action='store_true'),
         argparse_arg('-j', '--jobs', type=int),

omdev/pyproject/configs.py

@@ -4,15 +4,14 @@ import typing as ta
 
 from omlish.lite.marshal import unmarshal_obj
 
+from ..interp.venvs import InterpVenvConfig
+
 
 @dc.dataclass(frozen=True)
-class VenvConfig:
+class VenvConfig(InterpVenvConfig):
     inherits: ta.Optional[ta.Sequence[str]] = None
-    interp: ta.Optional[str] = None
-    requires: ta.Optional[ta.List[str]] = None
     docker: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
-    use_uv: ta.Optional[bool] = None
 
 
 @dc.dataclass(frozen=True)

omdev/pyproject/inject.py

@@ -0,0 +1,12 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+
+def bind_pyproject() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = []
+
+    return inj.as_bindings(*lst)

omdev/pyproject/venvs.py

@@ -3,14 +3,12 @@ import glob
 import os.path
 import typing as ta
 
-from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 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.default import get_default_interp_resolver
-from ..interp.types import InterpSpecifier
+from ..interp.venvs import InterpVenv
+from ..interp.venvs import InterpVenvRequirementsProcessor
 from .configs import VenvConfig
 from .reqs import RequirementsRewriter
 
@@ -38,60 +36,26 @@ class Venv:
     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 get_default_interp_resolver().resolve(i, install=True)).exe
+    @cached_nullary
+    def _iv(self) -> InterpVenv:
+        rr = RequirementsRewriter(self._name)
+
+        return InterpVenv(
+            self.dir_name,
+            self._cfg,
+            requirements_processor=InterpVenvRequirementsProcessor(
+                lambda iv, reqs: [rr.rewrite(req) for req in reqs]  # noqa
+            ),
+            log=log,
+        )
 
     @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
+        return self._iv().exe()
 
     @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_subprocesses.check_call(ie, '-m', 'venv', dn)
-
-        ve = self.exe()
-        uv = self._cfg.use_uv
-
-        await asyncio_subprocesses.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_subprocesses.check_call(
-                ve,
-                '-m',
-                *(['uv'] if uv else []),
-                'pip',
-                'install',
-                *([] if uv else ['-v']),
-                *reqs,
-            )
-
-        return True
+        return await self._iv().create()
 
     @staticmethod
     def _resolve_srcs(raw: ta.List[str]) -> ta.List[str]: