isolate 0.12.3__tar.gz → 0.12.5__tar.gz

{isolate-0.12.3 → isolate-0.12.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.12.3
+Version: 0.12.5
 Summary: Managed isolated environments for Python
 Author: Features & Labels
 Author-email: hello@fal.ai
@@ -25,8 +25,6 @@ Description-Content-Type: text/markdown
 
 # Isolate
 
-> :warning: **Isolate** is still very young, and none of the APIs should be considered stable.
-
 Run any Python function, with any dependencies, in any machine you want. Isolate offers a
 pluggable end-to-end solution for building, managing, and using isolated environments (virtualenv,
 conda, remote, and more).

{isolate-0.12.3 → isolate-0.12.5}/README.md

@@ -1,7 +1,5 @@
 # Isolate
 
-> :warning: **Isolate** is still very young, and none of the APIs should be considered stable.
-
 Run any Python function, with any dependencies, in any machine you want. Isolate offers a
 pluggable end-to-end solution for building, managing, and using isolated environments (virtualenv,
 conda, remote, and more).

{isolate-0.12.3 → isolate-0.12.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "isolate"
-version = "0.12.3"
+version = "0.12.5"
 readme = "README.md"
 description = "Managed isolated environments for Python"
 authors = ["Features & Labels <hello@fal.ai>"]

{isolate-0.12.3 → isolate-0.12.5}/src/isolate/backends/common.py

@@ -238,3 +238,18 @@ def optional_import(module_name: str) -> ModuleType:
             f"accessing {module_name!r} import functionality. Please try: "
             f"'$ pip install \"isolate[build]\"' to install it."
         ) from exc
+
+
+@lru_cache(4)
+def get_executable(command: str, home: str | None = None) -> Path:
+    for path in [home, None]:
+        binary_path = shutil.which(command, path=path)
+        if binary_path is not None:
+            return Path(binary_path)
+    else:
+        # TODO: we should probably show some instructions on how you
+        # can install conda here.
+        raise FileNotFoundError(
+            f"Could not find {command} executable. If {command} executable is not available by default, please point isolate "
+            f" to the path where conda binary is available '{home}'."
+        )

{isolate-0.12.3 → isolate-0.12.5}/src/isolate/backends/conda.py

@@ -14,6 +14,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Union
 from isolate.backends import BaseEnvironment, EnvironmentCreationError
 from isolate.backends.common import (
     active_python,
+    get_executable,
     logged_io,
     optional_import,
     sha256_digest_of,
@@ -48,7 +49,6 @@ class CondaEnvironment(BaseEnvironment[Path]):
     _exec_home: Optional[str] = _ISOLATE_MAMBA_HOME
     _exec_command: Optional[str] = _MAMBA_COMMAND
 
-
     @classmethod
     def from_config(
         cls,
@@ -162,15 +162,17 @@ class CondaEnvironment(BaseEnvironment[Path]):
 
     def _run_create(self, env_path: str, env_name: str) -> None:
         if self._exec_command == "conda":
-            self._run_conda("env", "create", "--force", "--prefix", env_path, "-f", env_name)
+            self._run_conda(
+                "env", "create", "--force", "--prefix", env_path, "-f", env_name
+            )
         else:
             self._run_conda("env", "create", "--prefix", env_path, "-f", env_name)
 
     def _run_destroy(self, connection_key: str) -> None:
-        self._run_conda("remove","--yes","--all","--prefix", connection_key)
+        self._run_conda("remove", "--yes", "--all", "--prefix", connection_key)
 
     def _run_conda(self, *args: Any) -> None:
-        conda_executable = _get_executable(self._exec_command, self._exec_home)
+        conda_executable = get_executable(self._exec_command, self._exec_home)
         with logged_io(partial(self.log, level=LogLevel.INFO)) as (stdout, stderr):
             subprocess.check_call(
                 [conda_executable, *args],
@@ -186,21 +188,6 @@ class CondaEnvironment(BaseEnvironment[Path]):
         return PythonIPC(self, connection_key)
 
 
-@functools.lru_cache(1)
-def _get_executable(command: str, home: str | None = None) -> Path:
-    for path in [home, None]:
-        conda_path = shutil.which(command, path=path)
-        if conda_path is not None:
-            return Path(conda_path)
-    else:
-        # TODO: we should probably show some instructions on how you
-        # can install conda here.
-        raise FileNotFoundError(
-            "Could not find conda executable. If conda executable is not available by default, please point isolate "
-            " to the path where conda binary is available 'ISOLATE_CONDA_HOME'."
-        )
-
-
 def _depends_on(
     dependencies: List[Union[str, Dict[str, List[str]]]],
     package_name: str,

{isolate-0.12.3 → isolate-0.12.5}/src/isolate/backends/virtualenv.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import shlex
 import shutil
 import subprocess
 from dataclasses import dataclass, field
@@ -11,6 +12,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Union
 from isolate.backends import BaseEnvironment, EnvironmentCreationError
 from isolate.backends.common import (
     active_python,
+    get_executable,
     get_executable_path,
     logged_io,
     optional_import,
@@ -20,6 +22,9 @@ from isolate.backends.settings import DEFAULT_SETTINGS, IsolateSettings
 from isolate.connections import PythonIPC
 from isolate.logs import LogLevel
 
+_UV_RESOLVER_EXECUTABLE = os.environ.get("ISOLATE_UV_EXE", "uv")
+_UV_RESOLVER_HOME = os.getenv("ISOLATE_UV_HOME")
+
 
 @dataclass
 class VirtualPythonEnvironment(BaseEnvironment[Path]):
@@ -30,6 +35,7 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
     python_version: Optional[str] = None
     extra_index_urls: List[str] = field(default_factory=list)
     tags: List[str] = field(default_factory=list)
+    resolver: Optional[str] = None
 
     @classmethod
     def from_config(
@@ -39,6 +45,10 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
     ) -> BaseEnvironment:
         environment = cls(**config)
         environment.apply_settings(settings)
+        if environment.resolver not in ("uv", None):
+            raise ValueError(
+                "Only 'uv' is supported as a resolver for virtualenv environments."
+            )
         return environment
 
     @property
@@ -49,6 +59,10 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
         else:
             constraints = []
 
+        extras = []
+        if self.resolver is not None:
+            extras.append(f"resolver={self.resolver}")
+
         active_python_version = self.python_version or active_python()
         return sha256_digest_of(
             active_python_version,
@@ -56,6 +70,9 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
             *constraints,
             *self.extra_index_urls,
             *sorted(self.tags),
+            # This is backwards compatible with environments not using
+            # the 'resolver' field.
+            *extras,
         )
 
     def install_requirements(self, path: Path) -> None:
@@ -69,9 +86,22 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
             return None
 
         self.log(f"Installing requirements: {', '.join(self.requirements)}")
+        environ = os.environ.copy()
+
+        if self.resolver == "uv":
+            # Set VIRTUAL_ENV to the actual path of the environment since that is
+            # how uv discovers the environment. This is necessary when using uv
+            # as the resolver.
+            environ["VIRTUAL_ENV"] = str(path)
+            base_pip_cmd = [
+                get_executable(_UV_RESOLVER_EXECUTABLE, _UV_RESOLVER_HOME),
+                "pip",
+            ]
+        else:
+            base_pip_cmd = [get_executable_path(path, "pip")]
 
         pip_cmd: List[Union[str, os.PathLike]] = [
-            get_executable_path(path, "pip"),
+            *base_pip_cmd,  # type: ignore
             "install",
             *self.requirements,
         ]
@@ -87,6 +117,7 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
                     pip_cmd,
                     stdout=stdout,
                     stderr=stderr,
+                    env=environ,
                 )
             except subprocess.SubprocessError as exc:
                 raise EnvironmentCreationError(f"Failure during 'pip install': {exc}")

{isolate-0.12.3 → isolate-0.12.5}/src/isolate/server/server.py

@@ -134,7 +134,9 @@ class BridgeManager:
                     agent.terminate()
 
         bound_context = ExitStack()
-        stub = bound_context.enter_context(connection._establish_bridge(max_wait_timeout=MAX_GRPC_WAIT_TIMEOUT))
+        stub = bound_context.enter_context(
+            connection._establish_bridge(max_wait_timeout=MAX_GRPC_WAIT_TIMEOUT)
+        )
         return RunnerAgent(stub, queue, bound_context)
 
     def _identify(self, connection: LocalPythonGRPC) -> Tuple[Any, ...]:

{isolate-0.12.3 → isolate-0.12.5}/src/isolate/connections/common.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import importlib
 import os
-from dataclasses import dataclass
 from contextlib import contextmanager
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Iterator, Optional, cast
 
 from tblib import Traceback, TracebackParseError