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

omdev/scripts/pyproject.py

@@ -66,7 +66,7 @@ import time
 import types
 import typing as ta
 import uuid
-import weakref  # noqa
+import weakref
 import zipfile
 
 
@@ -108,13 +108,18 @@ CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
 
+# ../../omlish/lite/typing.py
+A0 = ta.TypeVar('A0')
+A1 = ta.TypeVar('A1')
+A2 = ta.TypeVar('A2')
+
 # ../packaging/specifiers.py
 UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 # ../../omlish/argparse/cli.py
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 # ../../omlish/lite/inject.py
 U = ta.TypeVar('U')
@@ -2575,6 +2580,54 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../../omlish/lite/typing.py
+
+
+##
+# A workaround for typing deficiencies (like `Argument 2 to NewType(...) must be subclassable`).
+
+
+@dc.dataclass(frozen=True)
+class AnyFunc(ta.Generic[T]):
+    fn: ta.Callable[..., T]
+
+    def __call__(self, *args: ta.Any, **kwargs: ta.Any) -> T:
+        return self.fn(*args, **kwargs)
+
+
+@dc.dataclass(frozen=True)
+class Func0(ta.Generic[T]):
+    fn: ta.Callable[[], T]
+
+    def __call__(self) -> T:
+        return self.fn()
+
+
+@dc.dataclass(frozen=True)
+class Func1(ta.Generic[A0, T]):
+    fn: ta.Callable[[A0], T]
+
+    def __call__(self, a0: A0) -> T:
+        return self.fn(a0)
+
+
+@dc.dataclass(frozen=True)
+class Func2(ta.Generic[A0, A1, T]):
+    fn: ta.Callable[[A0, A1], T]
+
+    def __call__(self, a0: A0, a1: A1) -> T:
+        return self.fn(a0, a1)
+
+
+@dc.dataclass(frozen=True)
+class Func3(ta.Generic[A0, A1, A2, T]):
+    fn: ta.Callable[[A0, A1, A2], T]
+
+    def __call__(self, a0: A0, a1: A1, a2: A2) -> T:
+        return self.fn(a0, a1, a2)
+
+
 ########################################
 # ../../../omlish/logs/filters.py
 
@@ -2910,16 +2963,6 @@ def find_magic_py_modules(
             yield fp
 
 
-##
-
-
-# # @omlish-manifest
-# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-#     'cmd_name': 'py/findmagic',
-#     'mod_name': __name__,
-# }}
-
-
 ########################################
 # ../../packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -3553,15 +3596,15 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
 
 
 @dc.dataclass(eq=False)
-class ArgparseCommand:
+class ArgparseCmd:
     name: str
-    fn: ArgparseCommandFn
+    fn: ArgparseCmdFn
     args: ta.Sequence[ArgparseArg] = ()  # noqa
 
     # _: dc.KW_ONLY
 
     aliases: ta.Optional[ta.Sequence[str]] = None
-    parent: ta.Optional['ArgparseCommand'] = None
+    parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
@@ -3576,7 +3619,7 @@ class ArgparseCommand:
 
         check.arg(callable(self.fn))
         check.arg(all(isinstance(a, ArgparseArg) for a in self.args))
-        check.isinstance(self.parent, (ArgparseCommand, type(None)))
+        check.isinstance(self.parent, (ArgparseCmd, type(None)))
         check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
@@ -3590,21 +3633,21 @@ class ArgparseCommand:
         return self.fn(*args, **kwargs)
 
 
-def argparse_command(
+def argparse_cmd(
         *args: ArgparseArg,
         name: ta.Optional[str] = None,
         aliases: ta.Optional[ta.Iterable[str]] = None,
-        parent: ta.Optional[ArgparseCommand] = None,
+        parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
-) -> ta.Any:  # ta.Callable[[ArgparseCommandFn], ArgparseCommand]:  # FIXME
+) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
-    check.isinstance(parent, (ArgparseCommand, type(None)))
+    check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
 
     def inner(fn):
-        return ArgparseCommand(
+        return ArgparseCmd(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
@@ -3659,7 +3702,7 @@ class ArgparseCli:
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
             bseen = set()  # type: ignore
             for k, v in bns.items():
-                if isinstance(v, (ArgparseCommand, ArgparseArg)):
+                if isinstance(v, (ArgparseCmd, ArgparseArg)):
                     check.not_in(v, bseen)
                     bseen.add(v)
                     objs[k] = v
@@ -3686,7 +3729,7 @@ class ArgparseCli:
         subparsers = parser.add_subparsers()
 
         for att, obj in objs.items():
-            if isinstance(obj, ArgparseCommand):
+            if isinstance(obj, ArgparseCmd):
                 if obj.parent is not None:
                     raise NotImplementedError
 
@@ -3748,7 +3791,7 @@ class ArgparseCli:
 
     #
 
-    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
         return cmd.__get__(self, type(self))
 
     def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
@@ -5557,104 +5600,6 @@ def bind_interp_uv() -> InjectorBindings:
     return inj.as_bindings(*lst)
 
 
-########################################
-# ../configs.py
-
-
-@dc.dataclass(frozen=True)
-class VenvConfig:
-    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)
-class PyprojectConfig:
-    pkgs: ta.Sequence[str] = dc.field(default_factory=list)
-    srcs: ta.Mapping[str, ta.Sequence[str]] = dc.field(default_factory=dict)
-    venvs: ta.Mapping[str, VenvConfig] = dc.field(default_factory=dict)
-
-    venvs_dir: str = '.venvs'
-    versions_file: ta.Optional[str] = '.versions'
-
-
-class PyprojectConfigPreparer:
-    def __init__(
-            self,
-            *,
-            python_versions: ta.Optional[ta.Mapping[str, str]] = None,
-    ) -> None:
-        super().__init__()
-
-        self._python_versions = python_versions or {}
-
-    def _inherit_venvs(self, m: ta.Mapping[str, VenvConfig]) -> ta.Mapping[str, VenvConfig]:
-        done: ta.Dict[str, VenvConfig] = {}
-
-        def rec(k):
-            try:
-                return done[k]
-            except KeyError:
-                pass
-
-            c = m[k]
-            kw = dc.asdict(c)
-            for i in c.inherits or ():
-                ic = rec(i)
-                kw.update({k: v for k, v in dc.asdict(ic).items() if v is not None and kw.get(k) is None})
-            del kw['inherits']
-
-            d = done[k] = VenvConfig(**kw)
-            return d
-
-        for k in m:
-            rec(k)
-        return done
-
-    def _resolve_srcs(
-            self,
-            lst: ta.Sequence[str],
-            aliases: ta.Mapping[str, ta.Sequence[str]],
-    ) -> ta.List[str]:
-        todo = list(reversed(lst))
-        raw: ta.List[str] = []
-        seen: ta.Set[str] = set()
-
-        while todo:
-            cur = todo.pop()
-            if cur in seen:
-                continue
-
-            seen.add(cur)
-            if not cur.startswith('@'):
-                raw.append(cur)
-                continue
-
-            todo.extend(aliases[cur[1:]][::-1])
-
-        return raw
-
-    def _fixup_interp(self, s: ta.Optional[str]) -> ta.Optional[str]:
-        if not s or not s.startswith('@'):
-            return s
-        return self._python_versions[s[1:]]
-
-    def prepare_config(self, dct: ta.Mapping[str, ta.Any]) -> PyprojectConfig:
-        pcfg: PyprojectConfig = unmarshal_obj(dct, PyprojectConfig)
-
-        ivs = dict(self._inherit_venvs(pcfg.venvs or {}))
-        for k, v in ivs.items():
-            v = dc.replace(v, srcs=self._resolve_srcs(v.srcs or [], pcfg.srcs or {}))
-            v = dc.replace(v, interp=self._fixup_interp(v.interp))
-            ivs[k] = v
-
-        pcfg = dc.replace(pcfg, venvs=ivs)
-        return pcfg
-
-
 ########################################
 # ../../../omlish/logs/standard.py
 """
@@ -6453,9 +6398,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 = """
@@ -6504,8 +6455,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
@@ -6765,12 +6716,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
 
     #
 
@@ -6844,7 +6797,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
@@ -7201,6 +7155,7 @@ class PyenvInterpProvider(InterpProvider):
             *,
             pyenv: Pyenv,
             inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
 
@@ -7208,6 +7163,7 @@ class PyenvInterpProvider(InterpProvider):
 
         self._pyenv = pyenv
         self._inspector = inspector
+        self._log = log
 
     #
 
@@ -7252,7 +7208,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
@@ -7955,31 +7912,47 @@ def get_default_interp_resolver() -> InterpResolver:
 
 
 ########################################
-# ../venvs.py
+# ../../interp/venvs.py
 
 
 ##
 
 
-class Venv:
+@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,
-            name: str,
-            cfg: VenvConfig,
+            path: str,
+            cfg: InterpVenvConfig,
+            *,
+            requirements_processor: ta.Optional[InterpVenvRequirementsProcessor] = None,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
-        self._name = name
+
+        self._path = path
         self._cfg = cfg
 
-    @property
-    def cfg(self) -> VenvConfig:
-        return self._cfg
+        self._requirements_processor = requirements_processor
+        self._log = log
 
-    DIR_NAME = '.venvs'
+    @property
+    def path(self) -> str:
+        return self._path
 
     @property
-    def dir_name(self) -> str:
-        return os.path.join(self.DIR_NAME, self._name)
+    def cfg(self) -> InterpVenvConfig:
+        return self._cfg
 
     @async_cached_nullary
     async def interp_exe(self) -> str:
@@ -7988,19 +7961,23 @@ class Venv:
 
     @cached_nullary
     def exe(self) -> str:
-        ve = os.path.join(self.dir_name, 'bin/python')
+        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.dir_name):
+        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
 
-        log.info('Using interpreter %s', (ie := await self.interp_exe()))
+        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()
@@ -8017,8 +7994,9 @@ class Venv:
         )
 
         if sr := self._cfg.requires:
-            rr = RequirementsRewriter(self._name)
-            reqs = [rr.rewrite(req) for req in sr]
+            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
@@ -8036,6 +8014,150 @@ class Venv:
 
         return True
 
+
+########################################
+# ../configs.py
+
+
+@dc.dataclass(frozen=True)
+class VenvConfig(InterpVenvConfig):
+    inherits: ta.Optional[ta.Sequence[str]] = None
+    docker: ta.Optional[str] = None
+    srcs: ta.Optional[ta.List[str]] = None
+
+
+@dc.dataclass(frozen=True)
+class PyprojectConfig:
+    pkgs: ta.Sequence[str] = dc.field(default_factory=list)
+    srcs: ta.Mapping[str, ta.Sequence[str]] = dc.field(default_factory=dict)
+    venvs: ta.Mapping[str, VenvConfig] = dc.field(default_factory=dict)
+
+    venvs_dir: str = '.venvs'
+    versions_file: ta.Optional[str] = '.versions'
+
+
+class PyprojectConfigPreparer:
+    def __init__(
+            self,
+            *,
+            python_versions: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> None:
+        super().__init__()
+
+        self._python_versions = python_versions or {}
+
+    def _inherit_venvs(self, m: ta.Mapping[str, VenvConfig]) -> ta.Mapping[str, VenvConfig]:
+        done: ta.Dict[str, VenvConfig] = {}
+
+        def rec(k):
+            try:
+                return done[k]
+            except KeyError:
+                pass
+
+            c = m[k]
+            kw = dc.asdict(c)
+            for i in c.inherits or ():
+                ic = rec(i)
+                kw.update({k: v for k, v in dc.asdict(ic).items() if v is not None and kw.get(k) is None})
+            del kw['inherits']
+
+            d = done[k] = VenvConfig(**kw)
+            return d
+
+        for k in m:
+            rec(k)
+        return done
+
+    def _resolve_srcs(
+            self,
+            lst: ta.Sequence[str],
+            aliases: ta.Mapping[str, ta.Sequence[str]],
+    ) -> ta.List[str]:
+        todo = list(reversed(lst))
+        raw: ta.List[str] = []
+        seen: ta.Set[str] = set()
+
+        while todo:
+            cur = todo.pop()
+            if cur in seen:
+                continue
+
+            seen.add(cur)
+            if not cur.startswith('@'):
+                raw.append(cur)
+                continue
+
+            todo.extend(aliases[cur[1:]][::-1])
+
+        return raw
+
+    def _fixup_interp(self, s: ta.Optional[str]) -> ta.Optional[str]:
+        if not s or not s.startswith('@'):
+            return s
+        return self._python_versions[s[1:]]
+
+    def prepare_config(self, dct: ta.Mapping[str, ta.Any]) -> PyprojectConfig:
+        pcfg: PyprojectConfig = unmarshal_obj(dct, PyprojectConfig)
+
+        ivs = dict(self._inherit_venvs(pcfg.venvs or {}))
+        for k, v in ivs.items():
+            v = dc.replace(v, srcs=self._resolve_srcs(v.srcs or [], pcfg.srcs or {}))
+            v = dc.replace(v, interp=self._fixup_interp(v.interp))
+            ivs[k] = v
+
+        pcfg = dc.replace(pcfg, venvs=ivs)
+        return pcfg
+
+
+########################################
+# ../venvs.py
+
+
+##
+
+
+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)
+
+    @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:
+        return self._iv().exe()
+
+    @async_cached_nullary
+    async def create(self) -> bool:
+        return await self._iv().create()
+
     @staticmethod
     def _resolve_srcs(raw: ta.List[str]) -> ta.List[str]:
         out: list[str] = []
@@ -8152,7 +8274,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='?'),
@@ -8234,7 +8356,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/tools/doc.py

@@ -64,7 +64,7 @@ class Cli(ap.Cli):
 
         return src, name
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('input-file', nargs='?'),
         ap.arg('--report-level', type=int),
         ap.arg('-O', '--open', action='store_true'),
@@ -85,7 +85,7 @@ class Cli(ap.Cli):
         else:
             print(html)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('input-file', nargs='?'),
         ap.arg('-O', '--open', action='store_true'),
     )