isolate 0.12.13__tar.gz → 0.12.15__tar.gz

{isolate-0.12.13 → isolate-0.12.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.12.13
+Version: 0.12.15
 Summary: Managed isolated environments for Python
 Author-email: Features & Labels <hello@fal.ai>
 Project-URL: Issues, https://github.com/fal-ai/isolate/issues

{isolate-0.12.13 → isolate-0.12.15}/pyproject.toml

@@ -56,6 +56,7 @@ dev = [
 "virtualenv" = "isolate.backends.virtualenv:VirtualPythonEnvironment"
 "conda" = "isolate.backends.conda:CondaEnvironment"
 "local" = "isolate.backends.local:LocalPythonEnvironment"
+"container" = "isolate.backends.container:ContainerizedPythonEnvironment"
 "isolate-server" = "isolate.backends.remote:IsolateServer"
 "pyenv" = "isolate.backends.pyenv:PyenvEnvironment"
 

{isolate-0.12.13 → isolate-0.12.15}/src/isolate/_isolate_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.12.13'
-__version_tuple__ = version_tuple = (0, 12, 13)
+__version__ = version = '0.12.15'
+__version_tuple__ = version_tuple = (0, 12, 15)

{isolate-0.12.13 → isolate-0.12.15}/src/isolate/backends/_base.py

@@ -12,7 +12,6 @@ from typing import (
 )
 
 from isolate.backends.settings import DEFAULT_SETTINGS, IsolateSettings
-from isolate.exceptions import IsolateException
 from isolate.logs import Log, LogLevel, LogSource
 
 __all__ = [
@@ -28,7 +27,7 @@ CallResultType = TypeVar("CallResultType")
 BasicCallable = Callable[[], CallResultType]
 
 
-class EnvironmentCreationError(IsolateException):
+class EnvironmentCreationError(Exception):
     """Raised when the environment cannot be created."""
 
 

isolate-0.12.15/src/isolate/backends/container.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+import sys
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any, ClassVar
+
+from isolate.backends import BaseEnvironment
+from isolate.backends.common import sha256_digest_of
+from isolate.backends.settings import DEFAULT_SETTINGS, IsolateSettings
+from isolate.connections import PythonIPC
+
+
+@dataclass
+class ContainerizedPythonEnvironment(BaseEnvironment[Path]):
+    BACKEND_NAME: ClassVar[str] = "container"
+
+    image: dict[str, Any] = field(default_factory=dict)
+    python_version: str | None = None
+    tags: list[str] = field(default_factory=list)
+
+    @classmethod
+    def from_config(
+        cls,
+        config: dict[str, Any],
+        settings: IsolateSettings = DEFAULT_SETTINGS,
+    ) -> BaseEnvironment:
+        environment = cls(**config)
+        environment.apply_settings(settings)
+        return environment
+
+    @property
+    def key(self) -> str:
+        # dockerfile_str is always there, but the validation is handled by the
+        # controller.
+        dockerfile_str = self.image.get("dockerfile_str", "")
+        return sha256_digest_of(dockerfile_str, *sorted(self.tags))
+
+    def create(self, *, force: bool = False) -> Path:
+        return Path(sys.exec_prefix)
+
+    def destroy(self, connection_key: Path) -> None:
+        raise NotImplementedError("ContainerizedPythonEnvironment cannot be destroyed")
+
+    def exists(self) -> bool:
+        return True
+
+    def open_connection(self, connection_key: Path) -> PythonIPC:
+        return PythonIPC(self, connection_key)

{isolate-0.12.13 → isolate-0.12.15}/src/isolate/connections/common.py

@@ -2,13 +2,12 @@ from __future__ import annotations
 
 import importlib
 import os
+from contextlib import contextmanager
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Iterator, cast
 
 from tblib import Traceback, TracebackParseError
 
-from isolate.exceptions import IsolateException
-
 if TYPE_CHECKING:
     from typing import Protocol
 
@@ -22,18 +21,23 @@ AGENT_SIGNATURE = "IS_ISOLATE_AGENT"
 
 
 @dataclass
-class BaseSerializationError(IsolateException):
+class SerializationError(Exception):
     """An error that happened during the serialization process."""
 
     message: str
 
 
-class SerializationError(BaseSerializationError):
-    pass
-
+@contextmanager
+def _step(message: str) -> Iterator[None]:
+    """A context manager to capture every expression
+    underneath it and if any of them fails for any reason
+    then it will raise a SerializationError with the
+    given message."""
 
-class DeserializationError(BaseSerializationError):
-    pass
+    try:
+        yield
+    except BaseException as exception:
+        raise SerializationError("Error while " + message) from exception
 
 
 def as_serialization_method(backend: Any) -> SerializationBackend:
@@ -62,22 +66,13 @@ def load_serialized_object(
     flag is set to true, then the given object will be raised as an exception (instead
     of being returned)."""
 
-    try:
+    with _step(f"preparing the serialization backend ({serialization_method})"):
         serialization_backend = as_serialization_method(
             importlib.import_module(serialization_method)
         )
-    except BaseException as exc:
-        raise DeserializationError(
-            "Error while preparing the serialization backend "
-            f"({serialization_method})"
-        ) from exc
 
-    try:
+    with _step("deserializing the given object"):
         result = serialization_backend.loads(raw_object)
-    except BaseException as exc:
-        raise DeserializationError(
-            "Error while deserializing the given object"
-        ) from exc
 
     if was_it_raised:
         raise prepare_exc(result, stringized_traceback=stringized_traceback)
@@ -89,19 +84,13 @@ def serialize_object(serialization_method: str, object: Any) -> bytes:
     """Serialize the given object using the given serialization method. If
     anything fails, then a SerializationError will be raised."""
 
-    try:
+    with _step(f"preparing the serialization backend ({serialization_method})"):
         serialization_backend = as_serialization_method(
             importlib.import_module(serialization_method)
         )
-    except BaseException as exc:
-        raise SerializationError(
-            f"Error while preparing the serialization backend ({serialization_method})"
-        ) from exc
 
-    try:
+    with _step("serializing the given object"):
         return serialization_backend.dumps(object)
-    except BaseException as exc:
-        raise SerializationError("Error while serializing the given object") from exc
 
 
 def is_agent() -> bool:

{isolate-0.12.13 → isolate-0.12.15}/src/isolate/connections/grpc/_base.py

@@ -16,11 +16,10 @@ from isolate.connections.common import serialize_object
 from isolate.connections.grpc import agent, definitions
 from isolate.connections.grpc.configuration import get_default_options
 from isolate.connections.grpc.interface import from_grpc
-from isolate.exceptions import IsolateException
 from isolate.logs import LogLevel, LogSource
 
 
-class AgentError(IsolateException):
+class AgentError(Exception):
     """An internal problem caused by (most probably) the agent."""
 
 

{isolate-0.12.13 → isolate-0.12.15}/src/isolate/connections/grpc/agent.py

@@ -22,12 +22,11 @@ from isolate.connections.common import SerializationError, serialize_object
 from isolate.connections.grpc import definitions
 from isolate.connections.grpc.configuration import get_default_options
 from isolate.connections.grpc.interface import from_grpc, to_grpc
-from isolate.exceptions import IsolateException
 from isolate.logs import Log, LogLevel, LogSource
 
 
 @dataclass
-class AbortException(IsolateException):
+class AbortException(Exception):
     message: str
 
 
@@ -107,11 +106,14 @@ class AgentServicer(definitions.AgentServicer):
             )
 
         try:
-            # NOTE: technically any sort of exception could be raised here, since
+            # TODO: technically any sort of exception could be raised here, since
             # depickling is basically involves code execution from the *user*.
             function = from_grpc(function)
-        except BaseException as exc:
-            return exc, True, traceback.format_exc()
+        except SerializationError:
+            yield from self.log(traceback.format_exc(), level=LogLevel.ERROR)
+            raise AbortException(
+                f"The {function_kind} function could not be deserialized."
+            )
 
         if not callable(function):
             raise AbortException(

{isolate-0.12.13 → isolate-0.12.15}/src/isolate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.12.13
+Version: 0.12.15
 Summary: Managed isolated environments for Python
 Author-email: Features & Labels <hello@fal.ai>
 Project-URL: Issues, https://github.com/fal-ai/isolate/issues

{isolate-0.12.13 → isolate-0.12.15}/src/isolate.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ pyproject.toml
 src/isolate/__init__.py
 src/isolate/_isolate_version.py
 src/isolate/_version.py
-src/isolate/exceptions.py
 src/isolate/logs.py
 src/isolate/py.typed
 src/isolate/registry.py
@@ -22,6 +21,7 @@ src/isolate/backends/__init__.py
 src/isolate/backends/_base.py
 src/isolate/backends/common.py
 src/isolate/backends/conda.py
+src/isolate/backends/container.py
 src/isolate/backends/local.py
 src/isolate/backends/pyenv.py
 src/isolate/backends/remote.py

{isolate-0.12.13 → isolate-0.12.15}/src/isolate.egg-info/entry_points.txt

@@ -1,5 +1,6 @@
 [isolate.backends]
 conda = isolate.backends.conda:CondaEnvironment
+container = isolate.backends.container:ContainerizedPythonEnvironment
 isolate-server = isolate.backends.remote:IsolateServer
 local = isolate.backends.local:LocalPythonEnvironment
 pyenv = isolate.backends.pyenv:PyenvEnvironment

isolate-0.12.13/src/isolate/exceptions.py

@@ -1,2 +0,0 @@
-class IsolateException(Exception):
-    pass