isolate 0.12.0__tar.gz → 0.12.1__tar.gz

{isolate-0.12.0 → isolate-0.12.1}/PKG-INFO

@@ -1,25 +1,26 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.12.0
+Version: 0.12.1
 Summary: Managed isolated environments for Python
 Author: Features & Labels
 Author-email: hello@fal.ai
 Requires-Python: >=3.7,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: build
 Provides-Extra: grpc
 Provides-Extra: server
-Requires-Dist: PyYAML (>=6.0); extra == "build"
+Requires-Dist: PyYAML (>=6.0) ; extra == "build"
 Requires-Dist: grpcio (>=1.49)
-Requires-Dist: importlib-metadata (>=4.4); python_version < "3.10"
+Requires-Dist: importlib-metadata (>=4.4) ; python_version < "3.10"
 Requires-Dist: platformdirs
 Requires-Dist: protobuf
 Requires-Dist: tblib (>=1.7.0)
-Requires-Dist: virtualenv (>=20.4); extra == "build"
+Requires-Dist: virtualenv (>=20.4) ; extra == "build"
 Description-Content-Type: text/markdown
 
 # Isolate

{isolate-0.12.0 → isolate-0.12.1}/pyproject.toml

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

{isolate-0.12.0 → isolate-0.12.1}/src/isolate/backends/conda.py

@@ -42,6 +42,7 @@ class CondaEnvironment(BaseEnvironment[Path]):
 
     environment_definition: Dict[str, Any] = field(default_factory=dict)
     python_version: Optional[str] = None
+    tags: List[str] = field(default_factory=list)
 
     @classmethod
     def from_config(
@@ -106,7 +107,11 @@ class CondaEnvironment(BaseEnvironment[Path]):
 
     @property
     def key(self) -> str:
-        return sha256_digest_of(repr(self.environment_definition))
+        return sha256_digest_of(
+            repr(self.environment_definition),
+            self.python_version,
+            *sorted(self.tags),
+        )
 
     def create(self, *, force: bool = False) -> Path:
         env_path = self.settings.cache_dir_for(self)

{isolate-0.12.0 → isolate-0.12.1}/src/isolate/backends/virtualenv.py

@@ -29,6 +29,7 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
     constraints_file: Optional[os.PathLike] = None
     python_version: Optional[str] = None
     extra_index_urls: List[str] = field(default_factory=list)
+    tags: List[str] = field(default_factory=list)
 
     @classmethod
     def from_config(
@@ -54,6 +55,7 @@ class VirtualPythonEnvironment(BaseEnvironment[Path]):
             *self.requirements,
             *constraints,
             *self.extra_index_urls,
+            *sorted(self.tags),
         )
 
     def install_requirements(self, path: Path) -> None:

{isolate-0.12.0 → isolate-0.12.1}/src/isolate/connections/common.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import importlib
 import os
+from dataclasses import dataclass
 from contextlib import contextmanager
 from typing import TYPE_CHECKING, Any, Iterator, Optional, cast
 
@@ -21,9 +22,12 @@ if TYPE_CHECKING:
 AGENT_SIGNATURE = "IS_ISOLATE_AGENT"
 
 
+@dataclass
 class SerializationError(Exception):
     """An error that happened during the serialization process."""
 
+    message: str
+
 
 @contextmanager
 def _step(message: str) -> Iterator[None]:

{isolate-0.12.0 → isolate-0.12.1}/src/isolate/connections/grpc/agent.py

@@ -142,14 +142,17 @@ class AgentServicer(definitions.AgentServicer):
         serialization_method: str,
         result: object,
         was_it_raised: bool,
-        stringized_tb: str,
+        stringized_tb: str | None,
     ) -> Generator[definitions.PartialRunResult, None, Any]:
         try:
             definition = serialize_object(serialization_method, result)
         except SerializationError:
-            yield from self.log(traceback.format_exc(), level=LogLevel.ERROR)
+            if stringized_tb:
+                yield from self.log(
+                    stringized_tb, source=LogSource.USER, level=LogLevel.STDERR
+                )
             raise AbortException(
-                "The result of the input function could not be serialized."
+                f"Error while serializing the execution result (object of type {type(result)})."
             )
         except BaseException:
             yield from self.log(traceback.format_exc(), level=LogLevel.ERROR)

{isolate-0.12.0 → isolate-0.12.1}/src/isolate/server/server.py

@@ -261,6 +261,17 @@ class IsolateServicer(definitions.IsolateServicer):
                 # during the execution, and handle them accordingly.
                 exception = future.exception(timeout=0.1)
                 if exception is not None:
+                    # If this is an RPC error, propagate it as is without any
+                    # further processing.
+                    if isinstance(exception, grpc.RpcError):
+                        return self.abort_with_msg(
+                            exception.details(),
+                            context,
+                            code=exception.code(),
+                        )
+
+                    # Otherwise this is a bug in the agent itself, so needs
+                    # to be propagated with more details.
                     for line in traceback.format_exception(
                         type(exception), exception, exception.__traceback__
                     ):
@@ -282,7 +293,8 @@ class IsolateServicer(definitions.IsolateServicer):
         self, queue: Queue, is_completed: Callable[[], bool]
     ) -> Iterator[definitions.PartialRunResult]:
         """Watch the given queue until the is_completed function returns True. Note that even
-        if the function is completed, this function might not finish until the queue is empty."""
+        if the function is completed, this function might not finish until the queue is empty.
+        """
         while not is_completed():
             try:
                 yield queue.get(timeout=_Q_WAIT_DELAY)

isolate-0.12.0/setup.py

@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-package_dir = \
-{'': 'src'}
-
-packages = \
-['isolate',
- 'isolate.backends',
- 'isolate.common',
- 'isolate.connections',
- 'isolate.connections._local',
- 'isolate.connections.grpc',
- 'isolate.connections.grpc.definitions',
- 'isolate.connections.ipc',
- 'isolate.server',
- 'isolate.server.definitions',
- 'isolate.server.health']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['grpcio>=1.49', 'platformdirs', 'protobuf', 'tblib>=1.7.0']
-
-extras_require = \
-{':python_version < "3.10"': ['importlib-metadata>=4.4'],
- 'build': ['virtualenv>=20.4', 'PyYAML>=6.0']}
-
-entry_points = \
-{'isolate.backends': ['conda = isolate.backends.conda:CondaEnvironment',
-                      'isolate-server = isolate.backends.remote:IsolateServer',
-                      'local = isolate.backends.local:LocalPythonEnvironment',
-                      'pyenv = isolate.backends.pyenv:PyenvEnvironment',
-                      'virtualenv = '
-                      'isolate.backends.virtualenv:VirtualPythonEnvironment']}
-
-setup_kwargs = {
-    'name': 'isolate',
-    'version': '0.12.0',
-    'description': 'Managed isolated environments for Python',
-    'long_description': '# Isolate\n\n> :warning: **Isolate** is still very young, and none of the APIs should be considered stable.\n\nRun any Python function, with any dependencies, in any machine you want. Isolate offers a\npluggable end-to-end solution for building, managing, and using isolated environments (virtualenv,\nconda, remote, and more).\n\n\n## Motivation\n\n![XKCD 1987](https://imgs.xkcd.com/comics/python_environment.png)\n\nThe fact that nearly every piece of software uses some other libraries or some\nother programs is undeniable. Each of these come with their set of dependencies,\nand this chain moves forward. Once there are enough \'nodes\' in the chain, then\nthe ["dependency mess"](https://en.wikipedia.org/wiki/Dependency_hell) starts\nto surface and our lives become much harder.\n\nPython tried to solve it by recommending the "virtual environment" concept. In\ntheory it was designed to isolate environments of different projects, so my project\nA can depend on `pandas==1.0.0` while B depends on `pandas==2.0.0` and whichever\nproject I choose to work with, I just activate its own environment.\n\nOverall this was a very nice solution that did work, and still continues to work\nfor this use case. But as with every other scoped fix, in time other problems started\nto appear that demand a much narrower scope (like defining module-level dependencies,\nor even function-level ones for cloud runtimes that allow seamless integration with the\nrest of your code running in a different machine).\n\nHowever, unlike "virtual environment" concept, each of the projects that tried to tackle\nthis problem lacked a universal interface which one can simply define a set of requirements\n(this might be dependencies, size of the machine that is needed to run it, or something completely\ndifferent) and can change it without any loss. Isolate is working towards a future where this\ntransititon is as seamless as the transition from your local environment to the remote\nenvironment.\n',
-    'author': 'Features & Labels',
-    'author_email': 'hello@fal.ai',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': None,
-    'package_dir': package_dir,
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'extras_require': extras_require,
-    'entry_points': entry_points,
-    'python_requires': '>=3.7,<4.0',
-}
-
-
-setup(**setup_kwargs)