omdev 0.0.0.dev180__tar.gz → 0.0.0.dev181__tar.gz

{omdev-0.0.0.dev180/omdev.egg-info → omdev-0.0.0.dev181}/PKG-INFO

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

{omdev-0.0.0.dev180 → omdev-0.0.0.dev181}/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-0.0.0.dev180 → omdev-0.0.0.dev181}/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-0.0.0.dev180 → omdev-0.0.0.dev181}/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-0.0.0.dev180/omdev/pyproject → omdev-0.0.0.dev181/omdev/interp}/venvs.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP006 UP007
-import glob
+import dataclasses as dc
+import logging
 import os.path
 import typing as ta
 
@@ -7,36 +8,50 @@ 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 omlish.lite.typing import Func2
 
-from ..interp.default import get_default_interp_resolver
-from ..interp.types import InterpSpecifier
-from .configs import VenvConfig
-from .reqs import RequirementsRewriter
+from .default import get_default_interp_resolver
+from .types import InterpSpecifier
 
 
 ##
 
 
-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:
@@ -45,19 +60,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()
@@ -74,8 +93,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
@@ -92,23 +112,3 @@ class Venv:
             )
 
         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 [])

{omdev-0.0.0.dev180 → omdev-0.0.0.dev181}/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-0.0.0.dev181/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-0.0.0.dev181/omdev/pyproject/venvs.py

@@ -0,0 +1,78 @@
+# ruff: noqa: UP006 UP007
+import glob
+import os.path
+import typing as ta
+
+from omlish.lite.cached import async_cached_nullary
+from omlish.lite.cached import cached_nullary
+from omlish.lite.logs import log
+
+from ..interp.venvs import InterpVenv
+from ..interp.venvs import InterpVenvRequirementsProcessor
+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)
+
+    @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] = []
+        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 [])

{omdev-0.0.0.dev180 → omdev-0.0.0.dev181}/omdev/scripts/interp.py

@@ -1050,13 +1050,6 @@ json_dump_compact: ta.Callable[..., bytes] = functools.partial(json.dump, **JSON
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)
 
 
-########################################
-# ../../../omlish/lite/logs.py
-
-
-log = logging.getLogger(__name__)
-
-
 ########################################
 # ../../../omlish/lite/maybes.py
 
@@ -4205,9 +4198,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 = """
@@ -4256,8 +4255,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
@@ -4397,12 +4396,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
 
     #
 
@@ -4476,7 +4477,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
@@ -4833,6 +4835,7 @@ class PyenvInterpProvider(InterpProvider):
             *,
             pyenv: Pyenv,
             inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
 
@@ -4840,6 +4843,7 @@ class PyenvInterpProvider(InterpProvider):
 
         self._pyenv = pyenv
         self._inspector = inspector
+        self._log = log
 
     #
 
@@ -4884,7 +4888,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