isolate 0.11.1__tar.gz → 0.12.1__tar.gz

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

@@ -1,25 +1,26 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.11.1
+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.11.1 → isolate-0.12.1}/pyproject.toml

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

{isolate-0.11.1 → isolate-0.12.1}/src/isolate/backends/_base.py

@@ -117,7 +117,7 @@ class EnvironmentConnection:
         executable: BasicCallable,
         *args: Any,
         **kwargs: Any,
-    ) -> CallResultType:
+    ) -> CallResultType:  # type: ignore[type-var]
         """Run the given executable inside the environment, and return the result.
         If the executable raises an exception, then it will be raised directly."""
         raise NotImplementedError

{isolate-0.11.1 → 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.11.1 → 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.1/src/isolate/common/timestamp.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+
+from google.protobuf.timestamp_pb2 import Timestamp
+
+
+def from_datetime(time: datetime) -> Timestamp:
+    timestamp = Timestamp()
+    timestamp.FromDatetime(time)
+    return timestamp
+
+
+def to_datetime(timestamp: Timestamp) -> datetime:
+    return timestamp.ToDatetime(tzinfo=timezone.utc)

{isolate-0.11.1 → 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.11.1 → isolate-0.12.1}/src/isolate/connections/grpc/_base.py

@@ -61,7 +61,7 @@ class GRPCExecutionBase(EnvironmentConnection):
         executable: BasicCallable,
         *args: Any,
         **kwargs: Any,
-    ) -> CallResultType:
+    ) -> CallResultType:  # type: ignore[type-var]
         # Implementation details
         # ======================
         #

{isolate-0.11.1 → 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.11.1 → isolate-0.12.1}/src/isolate/connections/grpc/definitions/common.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "google/protobuf/timestamp.proto";
+
 message SerializedObject {
     // The serialization method used to serialize the the raw_object. Must be
     // present in the environment that is running the agent itself.
@@ -27,6 +29,7 @@ message Log {
     string message = 1;
     LogSource source = 2;
     LogLevel level = 3;
+    google.protobuf.Timestamp timestamp = 4;
 }
 
 enum LogSource {

isolate-0.12.1/src/isolate/connections/grpc/definitions/common_pb2.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: common.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import (
+    timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2,
+)
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n\x0c\x63ommon.proto\x1a\x1fgoogle/protobuf/timestamp.proto"\x89\x01\n\x10SerializedObject\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x12\n\ndefinition\x18\x02 \x01(\x0c\x12\x15\n\rwas_it_raised\x18\x03 \x01(\x08\x12!\n\x14stringized_traceback\x18\x04 \x01(\tH\x00\x88\x01\x01\x42\x17\n\x15_stringized_traceback"n\n\x10PartialRunResult\x12\x13\n\x0bis_complete\x18\x01 \x01(\x08\x12\x12\n\x04logs\x18\x02 \x03(\x0b\x32\x04.Log\x12&\n\x06result\x18\x03 \x01(\x0b\x32\x11.SerializedObjectH\x00\x88\x01\x01\x42\t\n\x07_result"{\n\x03Log\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x1a\n\x06source\x18\x02 \x01(\x0e\x32\n.LogSource\x12\x18\n\x05level\x18\x03 \x01(\x0e\x32\t.LogLevel\x12-\n\ttimestamp\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestamp*.\n\tLogSource\x12\x0b\n\x07\x42UILDER\x10\x00\x12\n\n\x06\x42RIDGE\x10\x01\x12\x08\n\x04USER\x10\x02*Z\n\x08LogLevel\x12\t\n\x05TRACE\x10\x00\x12\t\n\x05\x44\x45\x42UG\x10\x01\x12\x08\n\x04INFO\x10\x02\x12\x0b\n\x07WARNING\x10\x03\x12\t\n\x05\x45RROR\x10\x04\x12\n\n\x06STDOUT\x10\x05\x12\n\n\x06STDERR\x10\x06\x62\x06proto3'
+)
+
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "common_pb2", globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+    DESCRIPTOR._options = None
+    _LOGSOURCE._serialized_start = 426
+    _LOGSOURCE._serialized_end = 472
+    _LOGLEVEL._serialized_start = 474
+    _LOGLEVEL._serialized_end = 564
+    _SERIALIZEDOBJECT._serialized_start = 50
+    _SERIALIZEDOBJECT._serialized_end = 187
+    _PARTIALRUNRESULT._serialized_start = 189
+    _PARTIALRUNRESULT._serialized_end = 299
+    _LOG._serialized_start = 301
+    _LOG._serialized_end = 424
+# @@protoc_insertion_point(module_scope)

{isolate-0.11.1 → isolate-0.12.1}/src/isolate/connections/grpc/definitions/common_pb2.pyi

@@ -8,6 +8,7 @@ import google.protobuf.descriptor
 import google.protobuf.internal.containers
 import google.protobuf.internal.enum_type_wrapper
 import google.protobuf.message
+import google.protobuf.timestamp_pb2
 import sys
 import typing
 
@@ -187,20 +188,34 @@ class Log(google.protobuf.message.Message):
     MESSAGE_FIELD_NUMBER: builtins.int
     SOURCE_FIELD_NUMBER: builtins.int
     LEVEL_FIELD_NUMBER: builtins.int
+    TIMESTAMP_FIELD_NUMBER: builtins.int
     message: builtins.str
     source: global___LogSource.ValueType
     level: global___LogLevel.ValueType
+    @property
+    def timestamp(self) -> google.protobuf.timestamp_pb2.Timestamp: ...
     def __init__(
         self,
         *,
         message: builtins.str = ...,
         source: global___LogSource.ValueType = ...,
         level: global___LogLevel.ValueType = ...,
+        timestamp: google.protobuf.timestamp_pb2.Timestamp | None = ...,
     ) -> None: ...
+    def HasField(
+        self, field_name: typing_extensions.Literal["timestamp", b"timestamp"]
+    ) -> builtins.bool: ...
     def ClearField(
         self,
         field_name: typing_extensions.Literal[
-            "level", b"level", "message", b"message", "source", b"source"
+            "level",
+            b"level",
+            "message",
+            b"message",
+            "source",
+            b"source",
+            "timestamp",
+            b"timestamp",
         ],
     ) -> None: ...
 

{isolate-0.11.1 → isolate-0.12.1}/src/isolate/connections/grpc/interface.py

@@ -4,6 +4,7 @@ and the Isolate Server to share."""
 import functools
 from typing import TYPE_CHECKING, Any, Optional
 
+from isolate.common import timestamp
 from isolate.connections.common import load_serialized_object, serialize_object
 from isolate.connections.grpc import definitions
 from isolate.logs import Log, LogLevel, LogSource
@@ -41,6 +42,7 @@ def _(message: definitions.Log) -> Log:
         message=message.message,
         source=source,
         level=level,
+        timestamp=timestamp.to_datetime(message.timestamp),
     )
 
 
@@ -50,6 +52,7 @@ def _(obj: Log) -> definitions.Log:
         message=obj.message,
         source=definitions.LogSource.Value(obj.source.name.upper()),
         level=definitions.LogLevel.Value(obj.level.name.upper()),
+        timestamp=timestamp.from_datetime(obj.timestamp),
     )
 
 

{isolate-0.11.1 → isolate-0.12.1}/src/isolate/connections/ipc/_base.py

@@ -101,12 +101,12 @@ class IsolatedProcessConnection(EnvironmentConnection):
         """Start the agent process."""
         raise NotImplementedError
 
-    def run(
+    def run(  # type: ignore[return-value]
         self,
         executable: BasicCallable,
         *args: Any,
         **kwargs: Any,
-    ) -> CallResultType:
+    ) -> CallResultType:  # type: ignore[type-var]
         """Spawn an agent process using the given environment, run the given
         `executable` in that process, and return the result object back."""
 
@@ -164,7 +164,7 @@ class IsolatedProcessConnection(EnvironmentConnection):
         self,
         process: subprocess.Popen,
         connection: Connection,
-    ) -> CallResultType:
+    ) -> CallResultType:  # type: ignore[type-var]
         """Take the given process, and poll until either it exits or returns
         a result object."""
 

{isolate-0.11.1 → isolate-0.12.1}/src/isolate/logs.py

@@ -4,6 +4,7 @@ import shutil
 import tempfile
 from contextlib import contextmanager
 from dataclasses import dataclass, field, replace
+from datetime import datetime, timezone
 from enum import Enum
 from functools import total_ordering
 from pathlib import Path
@@ -65,9 +66,10 @@ class Log:
     source: LogSource
     level: LogLevel = LogLevel.INFO
     bound_env: Optional[BaseEnvironment] = field(default=None, repr=False)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
     def __str__(self) -> str:
-        parts = []
+        parts = [self.timestamp.strftime("%m/%d/%Y %H:%M:%S")]
         if self.bound_env:
             parts.append(f"[{self.bound_env.key[:6]}]")
         else:

{isolate-0.11.1 → 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.11.1/setup.py

@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-package_dir = \
-{'': 'src'}
-
-packages = \
-['isolate',
- 'isolate.backends',
- '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.11.1',
-    '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)

isolate-0.11.1/src/isolate/connections/grpc/definitions/common_pb2.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: common.proto
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-    b'\n\x0c\x63ommon.proto"\x89\x01\n\x10SerializedObject\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x12\n\ndefinition\x18\x02 \x01(\x0c\x12\x15\n\rwas_it_raised\x18\x03 \x01(\x08\x12!\n\x14stringized_traceback\x18\x04 \x01(\tH\x00\x88\x01\x01\x42\x17\n\x15_stringized_traceback"n\n\x10PartialRunResult\x12\x13\n\x0bis_complete\x18\x01 \x01(\x08\x12\x12\n\x04logs\x18\x02 \x03(\x0b\x32\x04.Log\x12&\n\x06result\x18\x03 \x01(\x0b\x32\x11.SerializedObjectH\x00\x88\x01\x01\x42\t\n\x07_result"L\n\x03Log\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x1a\n\x06source\x18\x02 \x01(\x0e\x32\n.LogSource\x12\x18\n\x05level\x18\x03 \x01(\x0e\x32\t.LogLevel*.\n\tLogSource\x12\x0b\n\x07\x42UILDER\x10\x00\x12\n\n\x06\x42RIDGE\x10\x01\x12\x08\n\x04USER\x10\x02*Z\n\x08LogLevel\x12\t\n\x05TRACE\x10\x00\x12\t\n\x05\x44\x45\x42UG\x10\x01\x12\x08\n\x04INFO\x10\x02\x12\x0b\n\x07WARNING\x10\x03\x12\t\n\x05\x45RROR\x10\x04\x12\n\n\x06STDOUT\x10\x05\x12\n\n\x06STDERR\x10\x06\x62\x06proto3'
-)
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "common_pb2", globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-    DESCRIPTOR._options = None
-    _LOGSOURCE._serialized_start = 346
-    _LOGSOURCE._serialized_end = 392
-    _LOGLEVEL._serialized_start = 394
-    _LOGLEVEL._serialized_end = 484
-    _SERIALIZEDOBJECT._serialized_start = 17
-    _SERIALIZEDOBJECT._serialized_end = 154
-    _PARTIALRUNRESULT._serialized_start = 156
-    _PARTIALRUNRESULT._serialized_end = 266
-    _LOG._serialized_start = 268
-    _LOG._serialized_end = 344
-# @@protoc_insertion_point(module_scope)