omdev 0.0.0.dev186__tar.gz → 0.0.0.dev188__tar.gz

{omdev-0.0.0.dev186/omdev.egg-info → omdev-0.0.0.dev188}/PKG-INFO

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

omdev-0.0.0.dev186/omdev/interp/uv/uv.py → omdev-0.0.0.dev188/omdev/interp/uv/provider.py

@@ -13,7 +13,7 @@ from ..types import InterpSpecifier
 from ..types import InterpVersion
 
 
-class PyenvInterpProvider(InterpProvider):
+class UvInterpProvider(InterpProvider):
     def get_installed_versions(self, spec: InterpSpecifier) -> ta.Awaitable[ta.Sequence[InterpVersion]]:
         raise NotImplementedError
 

omdev-0.0.0.dev188/omdev/interp/uv/uv.py

@@ -0,0 +1,66 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import logging
+import os.path
+import shutil
+import sys
+import tempfile
+import typing as ta
+
+from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.cached import async_cached_nullary
+from omlish.lite.check import check
+
+
+@dc.dataclass(frozen=True)
+class UvConfig:
+    ignore_path: bool = False
+    pip_bootstrap: bool = True
+
+
+class Uv:
+    def __init__(
+            self,
+            config: UvConfig = UvConfig(),
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._config = config
+        self._log = log
+
+        self._bootstrap_dir: ta.Optional[str] = None
+
+    def delete_bootstrap_dir(self) -> bool:
+        if (bs := self._bootstrap_dir) is None:
+            return False
+
+        shutil.rmtree(bs)
+        self._bootstrap_dir = None
+        return True
+
+    @async_cached_nullary
+    async def uv_exe(self) -> ta.Optional[str]:
+        if not self._config.ignore_path and (uv := shutil.which('uv')):
+            return uv
+
+        if self._config.pip_bootstrap:
+            if (bd := self._bootstrap_dir) is None:
+                bd = self._bootstrap_dir = tempfile.mkdtemp()
+
+            if self._log is not None:
+                self._log.info(f'Bootstrapping uv into %s', bd)
+
+            vn = 'uv-bootstrap'
+            await asyncio_subprocesses.check_call(os.path.realpath(sys.executable), '-m', 'venv', vn, cwd=bd)
+
+            vx = os.path.join(bd, vn, 'bin', 'python3')
+            await asyncio_subprocesses.check_call(vx, '-m', 'pip', 'install', 'uv', cwd=bd)
+
+            ux = os.path.join(bd, vn, 'bin', 'uv')
+            check.state(os.path.isfile(ux))
+
+            return ux
+
+        return None

{omdev-0.0.0.dev186 → omdev-0.0.0.dev188}/omdev/tools/json/rendering.py

@@ -3,10 +3,10 @@ import json
 import typing as ta
 
 from omlish import lang
-from omlish import term
 from omlish.formats.json.render import JsonRenderer
 from omlish.formats.json.stream.parse import JsonStreamParserEvent
 from omlish.formats.json.stream.render import StreamJsonRenderer
+from omlish.term import codes as tc
 
 
 ##
@@ -43,9 +43,9 @@ class Renderer(lang.Abstract):
 
 def term_color(o: ta.Any, state: JsonRenderer.State) -> tuple[str, str]:
     if state is JsonRenderer.State.KEY:
-        return term.SGR(term.SGRs.FG.BRIGHT_BLUE), term.SGR(term.SGRs.RESET)
+        return tc.SGR(tc.SGRs.FG.BRIGHT_BLUE), tc.SGR(tc.SGRs.RESET)
     elif isinstance(o, str):
-        return term.SGR(term.SGRs.FG.GREEN), term.SGR(term.SGRs.RESET)
+        return tc.SGR(tc.SGRs.FG.GREEN), tc.SGR(tc.SGRs.RESET)
     else:
         return '', ''
 

{omdev-0.0.0.dev186 → omdev-0.0.0.dev188/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev186 → omdev-0.0.0.dev188}/omdev.egg-info/SOURCES.txt

@@ -112,6 +112,7 @@ omdev/interp/pyenv/provider.py
 omdev/interp/pyenv/pyenv.py
 omdev/interp/uv/__init__.py
 omdev/interp/uv/inject.py
+omdev/interp/uv/provider.py
 omdev/interp/uv/uv.py
 omdev/magic/__init__.py
 omdev/magic/__main__.py

{omdev-0.0.0.dev186 → omdev-0.0.0.dev188}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev186
+omlish==0.0.0.dev188
 
 [all]
 black~=24.10

{omdev-0.0.0.dev186 → omdev-0.0.0.dev188}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev186'
+version = '0.0.0.dev188'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev186',
+    'omlish == 0.0.0.dev188',
 ]
 
 [project.optional-dependencies]