isolate 0.26.7__tar.gz → 0.26.9__tar.gz

{isolate-0.26.7/src/isolate.egg-info → isolate-0.26.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isolate
-Version: 0.26.7
+Version: 0.26.9
 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.26.7 → isolate-0.26.9}/src/isolate/_isolate_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.26.7'
-__version_tuple__ = version_tuple = (0, 26, 7)
+__version__ = version = '0.26.9'
+__version_tuple__ = version_tuple = (0, 26, 9)
 
-__commit_id__ = commit_id = 'g9b3604b86'
+__commit_id__ = commit_id = 'g803409edf'

{isolate-0.26.7 → isolate-0.26.9}/src/isolate/connections/common.py

@@ -35,6 +35,12 @@ class ExceptionDeserializationError(SerializationError):
     module that defines its type isn't importable here)."""
 
     original_traceback: TracebackType | None
+    original_stringized_traceback: str | None
+    # Display-only simple type name, matching traceback text (for example,
+    # "RemoteOnlyError").
+    original_exception_type_name: str | None = None
+    # Display-only str() of the remote exception.
+    original_exception_message: str | None = None
 
 
 # NOTE: tblib's install() will search for BaseException subclasses,
@@ -75,6 +81,8 @@ def load_serialized_object(
     *,
     was_it_raised: bool = False,
     stringized_traceback: str | None = None,
+    exception_type_name: str | None = None,
+    exception_message: str | None = None,
 ) -> Any:
     """Load the given serialized object using the given serialization method. If
     anything fails, then a SerializationError will be raised. If the was_it_raised
@@ -94,9 +102,14 @@ def load_serialized_object(
             # We were trying to reconstruct a remote exception but its type
             # isn't importable here, so loads() failed. Surface the genuine
             # local cause along with the remote traceback.
+            # Keep both traceback forms: Traceback.from_string() preserves
+            # frames, while the string also includes the exception type/message.
             raise ExceptionDeserializationError(
                 exc.message,
                 original_traceback=_prepare_traceback(stringized_traceback),
+                original_stringized_traceback=stringized_traceback,
+                original_exception_type_name=exception_type_name,
+                original_exception_message=exception_message,
             ) from exc.__cause__
         raise
 

{isolate-0.26.7 → isolate-0.26.9}/src/isolate/connections/grpc/agent.py

@@ -542,6 +542,13 @@ class AgentServicer(definitions.AgentServicer):
             was_it_raised=was_it_raised,
             stringized_traceback=stringized_tb,
         )
+        if was_it_raised:
+            # Current agent scripts can run against older installed isolate packages
+            # whose generated protobuf classes do not know about newly added fields.
+            if "exception_type_name" in serialized_obj.DESCRIPTOR.fields_by_name:
+                serialized_obj.exception_type_name = type(result).__name__
+            if "exception_message" in serialized_obj.DESCRIPTOR.fields_by_name:
+                serialized_obj.exception_message = str(result)
         return definitions.PartialRunResult(
             result=serialized_obj,
             is_complete=True,

{isolate-0.26.7 → isolate-0.26.9}/src/isolate/connections/grpc/definitions/common.proto

@@ -13,6 +13,10 @@ message SerializedObject {
     bool was_it_raised = 3;
     // The stringized version of the traceback, if it was raised.
     optional string stringized_traceback = 4;
+    // The remote exception type name, if it was raised.
+    optional string exception_type_name = 5;
+    // The remote exception message, if it was raised.
+    optional string exception_message = 6;
 }
 
 message PartialRunResult {

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

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: common.proto
+# Protobuf Python Version: 4.25.1
+"""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\"\xf9\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\x12 \n\x13\x65xception_type_name\x18\x05 \x01(\tH\x01\x88\x01\x01\x12\x1e\n\x11\x65xception_message\x18\x06 \x01(\tH\x02\x88\x01\x01\x42\x17\n\x15_stringized_tracebackB\x16\n\x14_exception_type_nameB\x14\n\x12_exception_message\"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')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'common_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_LOGSOURCE']._serialized_start=538
+  _globals['_LOGSOURCE']._serialized_end=584
+  _globals['_LOGLEVEL']._serialized_start=586
+  _globals['_LOGLEVEL']._serialized_end=676
+  _globals['_SERIALIZEDOBJECT']._serialized_start=50
+  _globals['_SERIALIZEDOBJECT']._serialized_end=299
+  _globals['_PARTIALRUNRESULT']._serialized_start=301
+  _globals['_PARTIALRUNRESULT']._serialized_end=411
+  _globals['_LOG']._serialized_start=413
+  _globals['_LOG']._serialized_end=536
+# @@protoc_insertion_point(module_scope)

{isolate-0.26.7 → isolate-0.26.9}/src/isolate/connections/grpc/definitions/common_pb2.pyi

@@ -69,6 +69,8 @@ class SerializedObject(google.protobuf.message.Message):
     DEFINITION_FIELD_NUMBER: builtins.int
     WAS_IT_RAISED_FIELD_NUMBER: builtins.int
     STRINGIZED_TRACEBACK_FIELD_NUMBER: builtins.int
+    EXCEPTION_TYPE_NAME_FIELD_NUMBER: builtins.int
+    EXCEPTION_MESSAGE_FIELD_NUMBER: builtins.int
     method: builtins.str
     """The serialization method used to serialize the the raw_object. Must be
     present in the environment that is running the agent itself.
@@ -81,6 +83,10 @@ class SerializedObject(google.protobuf.message.Message):
     """
     stringized_traceback: builtins.str
     """The stringized version of the traceback, if it was raised."""
+    exception_type_name: builtins.str
+    """The remote exception type name, if it was raised."""
+    exception_message: builtins.str
+    """The remote exception message, if it was raised."""
     def __init__(
         self,
         *,
@@ -88,9 +94,16 @@ class SerializedObject(google.protobuf.message.Message):
         definition: builtins.bytes = ...,
         was_it_raised: builtins.bool = ...,
         stringized_traceback: builtins.str | None = ...,
+        exception_type_name: builtins.str | None = ...,
+        exception_message: builtins.str | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_stringized_traceback", b"_stringized_traceback", "stringized_traceback", b"stringized_traceback"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_stringized_traceback", b"_stringized_traceback", "definition", b"definition", "method", b"method", "stringized_traceback", b"stringized_traceback", "was_it_raised", b"was_it_raised"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_exception_message", b"_exception_message", "_exception_type_name", b"_exception_type_name", "_stringized_traceback", b"_stringized_traceback", "exception_message", b"exception_message", "exception_type_name", b"exception_type_name", "stringized_traceback", b"stringized_traceback"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_exception_message", b"_exception_message", "_exception_type_name", b"_exception_type_name", "_stringized_traceback", b"_stringized_traceback", "definition", b"definition", "exception_message", b"exception_message", "exception_type_name", b"exception_type_name", "method", b"method", "stringized_traceback", b"stringized_traceback", "was_it_raised", b"was_it_raised"]) -> None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_exception_message", b"_exception_message"]) -> typing_extensions.Literal["exception_message"] | None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_exception_type_name", b"_exception_type_name"]) -> typing_extensions.Literal["exception_type_name"] | None: ...
+    @typing.overload
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_stringized_traceback", b"_stringized_traceback"]) -> typing_extensions.Literal["stringized_traceback"] | None: ...
 
 global___SerializedObject = SerializedObject

{isolate-0.26.7 → isolate-0.26.9}/src/isolate/connections/grpc/interface.py

@@ -26,11 +26,23 @@ def to_grpc(obj: Any) -> definitions.Message:
 
 @from_grpc.register
 def _(message: definitions.SerializedObject) -> Any:
+    exception_type_name = None
+    if message.HasField("exception_type_name"):
+        exception_type_name = message.exception_type_name
+
+    exception_message = None
+    if message.HasField("exception_message"):
+        exception_message = message.exception_message
+
     return load_serialized_object(
         message.method,
         message.definition,
         was_it_raised=message.was_it_raised,
+        # This field predates optional exception metadata; absent values arrive
+        # as "", and _prepare_traceback treats that the same as None.
         stringized_traceback=message.stringized_traceback,
+        exception_type_name=exception_type_name,
+        exception_message=exception_message,
     )
 
 
@@ -61,11 +73,32 @@ def to_serialized_object(
     method: str,
     was_it_raised: bool = False,
     stringized_traceback: Optional[str] = None,
+    exception_type_name: Optional[str] = None,
+    exception_message: Optional[str] = None,
 ) -> definitions.SerializedObject:
     """Convert a Python object into a gRPC message."""
-    return definitions.SerializedObject(
+    if was_it_raised:
+        if exception_type_name is None:
+            exception_type_name = type(obj).__name__
+        if exception_message is None:
+            exception_message = str(obj)
+
+    serialized_obj = definitions.SerializedObject(
         method=method,
         definition=serialize_object(method, obj),
         was_it_raised=was_it_raised,
         stringized_traceback=stringized_traceback,
     )
+    # Current code can run against older generated protobuf classes that do not
+    # know about newly added optional fields.
+    if (
+        exception_type_name is not None
+        and "exception_type_name" in serialized_obj.DESCRIPTOR.fields_by_name
+    ):
+        serialized_obj.exception_type_name = exception_type_name
+    if (
+        exception_message is not None
+        and "exception_message" in serialized_obj.DESCRIPTOR.fields_by_name
+    ):
+        serialized_obj.exception_message = exception_message
+    return serialized_obj

{isolate-0.26.7 → isolate-0.26.9/src/isolate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isolate
-Version: 0.26.7
+Version: 0.26.9
 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.26.7 → isolate-0.26.9}/tests/test_serialization.py

@@ -10,6 +10,7 @@ from isolate.connections.common import (
     load_serialized_object,
     serialize_object,
 )
+from isolate.connections.grpc.interface import from_grpc, to_serialized_object
 
 
 @pytest.mark.parametrize(
@@ -66,13 +67,57 @@ def test_deserialize_raised_exception_with_unimportable_type_preserves_traceback
             serialized,
             was_it_raised=True,
             stringized_traceback=stringized_traceback,
+            exception_type_name="RemoteOnlyError",
+            exception_message="remote boom",
         )
 
     assert exc_info.value.message == "Error while deserializing the given object"
     assert exc_info.value.original_traceback is not None
+    assert exc_info.value.original_stringized_traceback == stringized_traceback
+    assert exc_info.value.original_exception_type_name == "RemoteOnlyError"
+    assert exc_info.value.original_exception_message == "remote boom"
     assert isinstance(exc_info.value.__cause__, ModuleNotFoundError)
 
 
+def test_to_serialized_object_includes_raised_exception_metadata():
+    serialized = to_serialized_object(
+        ValueError("some error"),
+        method="pickle",
+        was_it_raised=True,
+    )
+
+    assert serialized.exception_type_name == "ValueError"
+    assert serialized.exception_message == "some error"
+
+
+def test_from_grpc_preserves_empty_raised_exception_message_metadata(
+    tmp_path,
+    monkeypatch,
+):
+    module_name = "remote_only_empty_exc_for_isolate_test"
+    module_path = tmp_path / f"{module_name}.py"
+    module_path.write_text("class RemoteOnlyError(Exception):\n    pass\n")
+    monkeypatch.syspath_prepend(str(tmp_path))
+    remote_module = importlib.import_module(module_name)
+
+    serialized = to_serialized_object(
+        remote_module.RemoteOnlyError(),
+        method="pickle",
+        was_it_raised=True,
+    )
+
+    sys.modules.pop(module_name, None)
+    # Keep the remote exception class unimportable while from_grpc reconstructs
+    # the result; monkeypatch teardown would happen too late for this assertion.
+    sys.path.remove(str(tmp_path))
+
+    with pytest.raises(ExceptionDeserializationError) as exc_info:
+        from_grpc(serialized)
+
+    assert exc_info.value.original_exception_type_name == "RemoteOnlyError"
+    assert exc_info.value.original_exception_message == ""
+
+
 def error_while_serializing():
     anon = lambda: 2 + 2  # anonymous functions are not  # noqa: E731
     # serializable by pickle

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

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: common.proto
-# Protobuf Python Version: 4.25.1
-"""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')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'common_pb2', _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
-  DESCRIPTOR._options = None
-  _globals['_LOGSOURCE']._serialized_start=426
-  _globals['_LOGSOURCE']._serialized_end=472
-  _globals['_LOGLEVEL']._serialized_start=474
-  _globals['_LOGLEVEL']._serialized_end=564
-  _globals['_SERIALIZEDOBJECT']._serialized_start=50
-  _globals['_SERIALIZEDOBJECT']._serialized_end=187
-  _globals['_PARTIALRUNRESULT']._serialized_start=189
-  _globals['_PARTIALRUNRESULT']._serialized_end=299
-  _globals['_LOG']._serialized_start=301
-  _globals['_LOG']._serialized_end=424
-# @@protoc_insertion_point(module_scope)