isolate 0.26.1__tar.gz → 0.26.2__tar.gz

{isolate-0.26.1/src/isolate.egg-info → isolate-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isolate
-Version: 0.26.1
+Version: 0.26.2
 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.1 → isolate-0.26.2}/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.1'
-__version_tuple__ = version_tuple = (0, 26, 1)
+__version__ = version = '0.26.2'
+__version_tuple__ = version_tuple = (0, 26, 2)
 
-__commit_id__ = commit_id = 'g68dc2e6e9'
+__commit_id__ = commit_id = 'g7e1de0bc2'

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/backends/_base.py

@@ -2,14 +2,7 @@ from __future__ import annotations
 
 from contextlib import contextmanager
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Callable,
-    ClassVar,
-    Generic,
-    Iterator,
-    TypeVar,
-)
+from typing import Any, Callable, ClassVar, Generic, Iterator, Optional, TypeVar
 
 from isolate.backends.settings import DEFAULT_SETTINGS, IsolateSettings
 from isolate.logs import Log, LogLevel, LogSource
@@ -131,7 +124,7 @@ class EnvironmentConnection:
         self,
         entrypoint: str,
         *,
-        run_on_main_thread: bool = False,
+        run_on_main_thread: Optional[bool] = None,
     ) -> CallResultType:  # type: ignore[type-var]
         """Run a ``"module:attr"`` Python entrypoint inside the environment,
         and return the result. If the entrypoint raises an exception, then it
@@ -139,7 +132,9 @@ class EnvironmentConnection:
 
         If ``run_on_main_thread`` is True, the resolved callable is invoked on
         the agent's main thread (and coroutines it returns are awaited on that
-        loop); otherwise it runs on a thread pool."""
+        loop). If False, it runs on a thread pool. If None, the backend may
+        fall back to legacy callable-level hints such as
+        ``_run_on_main_thread``."""
         raise NotImplementedError
 
     def log(

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/backends/remote.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import copy
 import json
 from dataclasses import dataclass
-from typing import Any, ClassVar, List
+from typing import Any, ClassVar, List, Optional
 
 import grpc
 
@@ -120,15 +120,16 @@ class IsolateServerConnection(EnvironmentConnection):
         self,
         entrypoint: str,
         *,
-        run_on_main_thread: bool = False,
+        run_on_main_thread: Optional[bool] = None,
     ) -> CallResultType:  # type: ignore[type-var]
         validate_entrypoint(entrypoint)
         request = BoundFunction(
             entrypoint=entrypoint,
             environments=self.definitions,
             stream_logs=True,
-            run_on_main_thread=run_on_main_thread,
         )
+        if run_on_main_thread is not None:
+            request.run_on_main_thread = run_on_main_thread
         return self._run_request(request)
 
     def _run_request(self, request: BoundFunction) -> CallResultType:  # type: ignore[type-var]

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/connections/grpc/_base.py

@@ -6,7 +6,7 @@ import time
 from contextlib import contextmanager
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, ContextManager, Iterator, List, Tuple, Union, cast
+from typing import Any, ContextManager, Iterator, List, Optional, Tuple, Union, cast
 
 import grpc
 
@@ -125,15 +125,13 @@ class GRPCExecutionBase(EnvironmentConnection):
         self,
         entrypoint: str,
         *,
-        run_on_main_thread: bool = False,
+        run_on_main_thread: Optional[bool] = None,
     ) -> CallResultType:  # type: ignore[type-var]
         validate_entrypoint(entrypoint)
-        return self._run_function_call(
-            definitions.FunctionCall(
-                entrypoint=entrypoint,
-                run_on_main_thread=run_on_main_thread,
-            ),
-        )
+        function_call = definitions.FunctionCall(entrypoint=entrypoint)
+        if run_on_main_thread is not None:
+            function_call.run_on_main_thread = run_on_main_thread
+        return self._run_function_call(function_call)
 
     def _run_function_call(
         self, function_call: definitions.FunctionCall

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/connections/grpc/agent.py

@@ -26,6 +26,7 @@ from typing import (
     Any,
     AsyncIterator,
     Iterable,
+    Optional,
     TextIO,
 )
 
@@ -328,18 +329,23 @@ class AgentServicer(definitions.AgentServicer):
             extra_args.append(self._run_cache[cache_key])
 
         try:
+            run_on_main_thread = (
+                request.run_on_main_thread
+                if request.HasField("run_on_main_thread")
+                else None
+            )
             if has_entrypoint:
                 invocation = await self.execute_entrypoint(
                     request.entrypoint,
                     "function",
-                    run_on_main_thread=request.run_on_main_thread,
+                    run_on_main_thread=run_on_main_thread,
                 )
             else:
                 invocation = await self.execute_function(
                     request.function,
                     "function",
                     extra_args=extra_args,
-                    run_on_main_thread=request.run_on_main_thread,
+                    run_on_main_thread=run_on_main_thread,
                 )
             result, was_it_raised, stringized_tb = invocation
             yield self.send_object(
@@ -358,7 +364,7 @@ class AgentServicer(definitions.AgentServicer):
         function_kind: str,
         *,
         extra_args: Iterable[Any] = (),
-        run_on_main_thread: bool = False,
+        run_on_main_thread: Optional[bool] = None,
     ) -> tuple[Any, bool, str | None]:
         if function.was_it_raised:
             raise AbortException(
@@ -388,16 +394,37 @@ class AgentServicer(definitions.AgentServicer):
         entrypoint: str,
         function_kind: str,
         *,
-        run_on_main_thread: bool = False,
+        run_on_main_thread: Optional[bool] = None,
     ) -> tuple[Any, bool, str | None]:
         # Resolve lazily so import / attribute errors surface through the
         # regular exception capture in _invoke_callable and reach the client
-        # as a raised result, matching the pickle error path.
-        def function() -> Any:
-            return _resolve_entrypoint(entrypoint)()
+        # as a raised result, matching the pickle error path. The wrapper also
+        # mirrors the resolved callable's legacy `_run_on_main_thread` flag so
+        # absent RPC fields keep the old fallback behavior for entrypoints.
+        unresolved = object()
+
+        class ResolvedEntrypoint:
+            def __init__(self, value: str):
+                self._entrypoint = value
+                self._resolved: Any = unresolved
+
+            def _resolve(self) -> Any:
+                if self._resolved is unresolved:
+                    self._resolved = _resolve_entrypoint(self._entrypoint)
+                return self._resolved
+
+            @property
+            def _run_on_main_thread(self) -> bool:
+                try:
+                    return getattr(self._resolve(), "_run_on_main_thread", False)
+                except Exception:
+                    return False
+
+            def __call__(self) -> Any:
+                return self._resolve()()
 
         return await self._invoke_callable(
-            function,
+            ResolvedEntrypoint(entrypoint),
             function_kind,
             run_on_main_thread=run_on_main_thread,
         )
@@ -408,7 +435,7 @@ class AgentServicer(definitions.AgentServicer):
         function_kind: str,
         extra_args: Iterable[Any] = (),
         *,
-        run_on_main_thread: bool = False,
+        run_on_main_thread: Optional[bool] = None,
     ) -> tuple[Any, bool, str | None]:
         if not callable(function):
             raise AbortException(
@@ -429,7 +456,10 @@ class AgentServicer(definitions.AgentServicer):
             # called from a running event loop" error and stay backward
             # compatible, we offload those unflagged functions to a thread pool.
 
-            if run_on_main_thread or getattr(function, "_run_on_main_thread", False):
+            if run_on_main_thread is None:
+                run_on_main_thread = getattr(function, "_run_on_main_thread", False)
+
+            if run_on_main_thread:
                 result = function(*extra_args)
             else:
                 result = self._thread_pool.submit(function, *extra_args).result()

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/connections/grpc/definitions/agent.proto

@@ -17,7 +17,7 @@ message FunctionCall {
     // event loop, useful for async callables) instead of a thread pool. The
     // agent also honors `_run_on_main_thread` set on the callable itself,
     // for backward compatibility with older clients.
-    bool run_on_main_thread = 4;
+    optional bool run_on_main_thread = 4;
     // Exactly one of the following must be set.
     oneof callable {
         // A serialized callable to execute.

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/connections/grpc/definitions/agent_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: agent.proto
-# Protobuf Python Version: 4.25.1
+# Protobuf Python Version: 5.26.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -15,15 +15,15 @@ _sym_db = _symbol_database.Default()
 from isolate.connections.grpc.definitions import common_pb2 as common__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61gent.proto\x1a\x0c\x63ommon.proto\"\xae\x01\n\x0c\x46unctionCall\x12*\n\nsetup_func\x18\x02 \x01(\x0b\x32\x11.SerializedObjectH\x01\x88\x01\x01\x12\x1a\n\x12run_on_main_thread\x18\x04 \x01(\x08\x12%\n\x08\x66unction\x18\x01 \x01(\x0b\x32\x11.SerializedObjectH\x00\x12\x14\n\nentrypoint\x18\x03 \x01(\tH\x00\x42\n\n\x08\x63\x61llableB\r\n\x0b_setup_func24\n\x05\x41gent\x12+\n\x03Run\x12\r.FunctionCall\x1a\x11.PartialRunResult\"\x00\x30\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61gent.proto\x1a\x0c\x63ommon.proto\"\xca\x01\n\x0c\x46unctionCall\x12*\n\nsetup_func\x18\x02 \x01(\x0b\x32\x11.SerializedObjectH\x01\x88\x01\x01\x12\x1f\n\x12run_on_main_thread\x18\x04 \x01(\x08H\x02\x88\x01\x01\x12%\n\x08\x66unction\x18\x01 \x01(\x0b\x32\x11.SerializedObjectH\x00\x12\x14\n\nentrypoint\x18\x03 \x01(\tH\x00\x42\n\n\x08\x63\x61llableB\r\n\x0b_setup_funcB\x15\n\x13_run_on_main_thread24\n\x05\x41gent\x12+\n\x03Run\x12\r.FunctionCall\x1a\x11.PartialRunResult\"\x00\x30\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'agent_pb2', _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
-  DESCRIPTOR._options = None
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
   _globals['_FUNCTIONCALL']._serialized_start=30
-  _globals['_FUNCTIONCALL']._serialized_end=204
-  _globals['_AGENT']._serialized_start=206
-  _globals['_AGENT']._serialized_end=258
+  _globals['_FUNCTIONCALL']._serialized_end=232
+  _globals['_AGENT']._serialized_start=234
+  _globals['_AGENT']._serialized_end=286
 # @@protoc_insertion_point(module_scope)

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/connections/grpc/definitions/agent_pb2.pyi

@@ -49,12 +49,14 @@ class FunctionCall(google.protobuf.message.Message):
         self,
         *,
         setup_func: common_pb2.SerializedObject | None = ...,
-        run_on_main_thread: builtins.bool = ...,
+        run_on_main_thread: builtins.bool | None = ...,
         function: common_pb2.SerializedObject | None = ...,
         entrypoint: builtins.str = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "function", b"function", "setup_func", b"setup_func"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "function", b"function", "run_on_main_thread", b"run_on_main_thread", "setup_func", b"setup_func"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_run_on_main_thread", b"_run_on_main_thread", "_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "function", b"function", "run_on_main_thread", b"run_on_main_thread", "setup_func", b"setup_func"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_run_on_main_thread", b"_run_on_main_thread", "_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "function", b"function", "run_on_main_thread", b"run_on_main_thread", "setup_func", b"setup_func"]) -> None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_run_on_main_thread", b"_run_on_main_thread"]) -> typing_extensions.Literal["run_on_main_thread"] | None: ...
     @typing.overload
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_setup_func", b"_setup_func"]) -> typing_extensions.Literal["setup_func"] | None: ...
     @typing.overload

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/connections/grpc/definitions/agent_pb2_grpc.py

@@ -5,7 +5,6 @@ import grpc
 from isolate.connections.grpc.definitions import agent_pb2 as agent__pb2
 from isolate.connections.grpc.definitions import common_pb2 as common__pb2
 
-
 class AgentStub(object):
     """Missing associated documentation comment in .proto file."""
 

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/server/definitions/server.proto

@@ -29,7 +29,7 @@ message BoundFunction {
     // event loop, useful for async callables) instead of a thread pool. The
     // agent also honors `_run_on_main_thread` set on the callable itself,
     // for backward compatibility with older clients.
-    bool run_on_main_thread = 6;
+    optional bool run_on_main_thread = 6;
     // Exactly one of the following must be set.
     oneof callable {
         // A serialized callable to run.

isolate-0.26.2/src/isolate/server/definitions/server_pb2.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: server.proto
+# Protobuf Python Version: 5.26.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 isolate.connections.grpc.definitions import common_pb2 as common__pb2
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cserver.proto\x1a\x0c\x63ommon.proto\x1a\x1cgoogle/protobuf/struct.proto\"\x8e\x02\n\rBoundFunction\x12,\n\x0c\x65nvironments\x18\x01 \x03(\x0b\x32\x16.EnvironmentDefinition\x12*\n\nsetup_func\x18\x03 \x01(\x0b\x32\x11.SerializedObjectH\x01\x88\x01\x01\x12\x13\n\x0bstream_logs\x18\x04 \x01(\x08\x12\x1f\n\x12run_on_main_thread\x18\x06 \x01(\x08H\x02\x88\x01\x01\x12%\n\x08\x66unction\x18\x02 \x01(\x0b\x32\x11.SerializedObjectH\x00\x12\x14\n\nentrypoint\x18\x05 \x01(\tH\x00\x42\n\n\x08\x63\x61llableB\r\n\x0b_setup_funcB\x15\n\x13_run_on_main_thread\"d\n\x15\x45nvironmentDefinition\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12.\n\rconfiguration\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\r\n\x05\x66orce\x18\x03 \x01(\x08\"R\n\rSubmitRequest\x12 \n\x08\x66unction\x18\x01 \x01(\x0b\x32\x0e.BoundFunction\x12\x1f\n\x08metadata\x18\x02 \x01(\x0b\x32\r.TaskMetadata\"{\n\x0cTaskMetadata\x12\x36\n\rlogger_labels\x18\x01 \x03(\x0b\x32\x1f.TaskMetadata.LoggerLabelsEntry\x1a\x33\n\x11LoggerLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"!\n\x0eSubmitResponse\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"F\n\x12SetMetadataRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x1f\n\x08metadata\x18\x02 \x01(\x0b\x32\r.TaskMetadata\"\x15\n\x13SetMetadataResponse\"\r\n\x0bListRequest\"\x1b\n\x08TaskInfo\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"(\n\x0cListResponse\x12\x18\n\x05tasks\x18\x01 \x03(\x0b\x32\t.TaskInfo\" \n\rCancelRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"\x10\n\x0e\x43\x61ncelResponse2\xf4\x01\n\x07Isolate\x12,\n\x03Run\x12\x0e.BoundFunction\x1a\x11.PartialRunResult\"\x00\x30\x01\x12+\n\x06Submit\x12\x0e.SubmitRequest\x1a\x0f.SubmitResponse\"\x00\x12:\n\x0bSetMetadata\x12\x13.SetMetadataRequest\x1a\x14.SetMetadataResponse\"\x00\x12%\n\x04List\x12\x0c.ListRequest\x1a\r.ListResponse\"\x00\x12+\n\x06\x43\x61ncel\x12\x0e.CancelRequest\x1a\x0f.CancelResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'server_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._loaded_options = None
+  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_options = b'8\001'
+  _globals['_BOUNDFUNCTION']._serialized_start=61
+  _globals['_BOUNDFUNCTION']._serialized_end=331
+  _globals['_ENVIRONMENTDEFINITION']._serialized_start=333
+  _globals['_ENVIRONMENTDEFINITION']._serialized_end=433
+  _globals['_SUBMITREQUEST']._serialized_start=435
+  _globals['_SUBMITREQUEST']._serialized_end=517
+  _globals['_TASKMETADATA']._serialized_start=519
+  _globals['_TASKMETADATA']._serialized_end=642
+  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_start=591
+  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_end=642
+  _globals['_SUBMITRESPONSE']._serialized_start=644
+  _globals['_SUBMITRESPONSE']._serialized_end=677
+  _globals['_SETMETADATAREQUEST']._serialized_start=679
+  _globals['_SETMETADATAREQUEST']._serialized_end=749
+  _globals['_SETMETADATARESPONSE']._serialized_start=751
+  _globals['_SETMETADATARESPONSE']._serialized_end=772
+  _globals['_LISTREQUEST']._serialized_start=774
+  _globals['_LISTREQUEST']._serialized_end=787
+  _globals['_TASKINFO']._serialized_start=789
+  _globals['_TASKINFO']._serialized_end=816
+  _globals['_LISTRESPONSE']._serialized_start=818
+  _globals['_LISTRESPONSE']._serialized_end=858
+  _globals['_CANCELREQUEST']._serialized_start=860
+  _globals['_CANCELREQUEST']._serialized_end=892
+  _globals['_CANCELRESPONSE']._serialized_start=894
+  _globals['_CANCELRESPONSE']._serialized_end=910
+  _globals['_ISOLATE']._serialized_start=913
+  _globals['_ISOLATE']._serialized_end=1157
+# @@protoc_insertion_point(module_scope)

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/server/definitions/server_pb2.pyi

@@ -54,12 +54,14 @@ class BoundFunction(google.protobuf.message.Message):
         environments: collections.abc.Iterable[global___EnvironmentDefinition] | None = ...,
         setup_func: common_pb2.SerializedObject | None = ...,
         stream_logs: builtins.bool = ...,
-        run_on_main_thread: builtins.bool = ...,
+        run_on_main_thread: builtins.bool | None = ...,
         function: common_pb2.SerializedObject | None = ...,
         entrypoint: builtins.str = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "function", b"function", "setup_func", b"setup_func"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "environments", b"environments", "function", b"function", "run_on_main_thread", b"run_on_main_thread", "setup_func", b"setup_func", "stream_logs", b"stream_logs"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_run_on_main_thread", b"_run_on_main_thread", "_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "function", b"function", "run_on_main_thread", b"run_on_main_thread", "setup_func", b"setup_func"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_run_on_main_thread", b"_run_on_main_thread", "_setup_func", b"_setup_func", "callable", b"callable", "entrypoint", b"entrypoint", "environments", b"environments", "function", b"function", "run_on_main_thread", b"run_on_main_thread", "setup_func", b"setup_func", "stream_logs", b"stream_logs"]) -> None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_run_on_main_thread", b"_run_on_main_thread"]) -> typing_extensions.Literal["run_on_main_thread"] | None: ...
     @typing.overload
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_setup_func", b"_setup_func"]) -> typing_extensions.Literal["setup_func"] | None: ...
     @typing.overload

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/server/definitions/server_pb2_grpc.py

@@ -5,7 +5,6 @@ import grpc
 from isolate.connections.grpc.definitions import common_pb2 as common__pb2
 from isolate.server.definitions import server_pb2 as server__pb2
 
-
 class IsolateStub(object):
     """Missing associated documentation comment in .proto file."""
 

{isolate-0.26.1 → isolate-0.26.2}/src/isolate/server/server.py

@@ -330,16 +330,16 @@ class IsolateServicer(definitions.IsolateServicer):
                 if has_entrypoint:
                     function_call = definitions.FunctionCall(
                         entrypoint=task.request.entrypoint,
-                        run_on_main_thread=task.request.run_on_main_thread,
                     )
                 else:
                     function_call = definitions.FunctionCall(
                         function=task.request.function,
                         setup_func=task.request.setup_func,
-                        run_on_main_thread=task.request.run_on_main_thread,
                     )
                     if not task.request.HasField("setup_func"):
                         function_call.ClearField("setup_func")
+                if task.request.HasField("run_on_main_thread"):
+                    function_call.run_on_main_thread = task.request.run_on_main_thread
 
                 future = local_pool.submit(
                     _proxy_to_queue,

{isolate-0.26.1 → isolate-0.26.2/src/isolate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isolate
-Version: 0.26.1
+Version: 0.26.2
 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.1 → isolate-0.26.2}/tests/test_server.py

@@ -174,7 +174,12 @@ def run_request(
         return cast(definitions.SerializedObject, return_value)
 
 
-def prepare_request(function, *args, **kwargs):
+def prepare_request(
+    function: Any,
+    *args: Any,
+    run_on_main_thread: Optional[bool] = None,
+    **kwargs: Any,
+) -> definitions.BoundFunction:
     import dill
 
     import __main__
@@ -190,10 +195,13 @@ def prepare_request(function, *args, **kwargs):
     if getattr(function, "_run_on_main_thread", False):
         setattr(basic_function, "_run_on_main_thread", True)
     environment = define_environment("virtualenv", requirements=[])
-    return definitions.BoundFunction(
+    request = definitions.BoundFunction(
         function=to_serialized_object(basic_function, method="dill"),
         environments=[environment],
     )
+    if run_on_main_thread is not None:
+        request.run_on_main_thread = run_on_main_thread
+    return request
 
 
 def run_function(stub, function, *args, log_handler=None, **kwargs):
@@ -261,6 +269,108 @@ def test_server_entrypoint(stub: definitions.IsolateStub, monkeypatch: Any) -> N
     assert result != os.getpid()
 
 
+def test_server_entrypoint_honors_legacy_main_thread_flag(
+    stub: definitions.IsolateStub,
+    monkeypatch: Any,
+    tmp_path: Path,
+) -> None:
+    inherit_from_local(monkeypatch)
+
+    package_dir = tmp_path / "entrypoint_main_thread_test_pkg"
+    package_dir.mkdir()
+
+    (package_dir / "setup.py").write_text(
+        textwrap.dedent(
+            """
+            from setuptools import setup
+
+
+            setup(py_modules=["entrypoint_main_thread_test"])
+            """
+        )
+    )
+    (package_dir / "entrypoint_main_thread_test.py").write_text(
+        textwrap.dedent(
+            """
+            import threading
+
+
+            def should_fail_on_main_thread():
+                if threading.current_thread() == threading.main_thread():
+                    raise RuntimeError("should fail on main thread")
+                return "should succeed on non-main thread"
+
+
+            should_fail_on_main_thread._run_on_main_thread = True
+            """
+        )
+    )
+
+    env_definition = define_environment(
+        "virtualenv",
+        requirements=[str(package_dir)],
+    )
+    request = definitions.BoundFunction(
+        entrypoint="entrypoint_main_thread_test:should_fail_on_main_thread",
+        environments=[env_definition],
+    )
+
+    raw_result = run_request(stub, request)
+    with pytest.raises(RuntimeError, match="should fail on main thread"):
+        from_grpc(raw_result)
+
+
+def test_server_entrypoint_explicit_false_overrides_legacy_main_thread_flag(
+    stub: definitions.IsolateStub,
+    monkeypatch: Any,
+    tmp_path: Path,
+) -> None:
+    inherit_from_local(monkeypatch)
+
+    package_dir = tmp_path / "entrypoint_main_thread_override_test_pkg"
+    package_dir.mkdir()
+
+    (package_dir / "setup.py").write_text(
+        textwrap.dedent(
+            """
+            from setuptools import setup
+
+
+            setup(py_modules=["entrypoint_main_thread_override_test"])
+            """
+        )
+    )
+    (package_dir / "entrypoint_main_thread_override_test.py").write_text(
+        textwrap.dedent(
+            """
+            import threading
+
+
+            def should_fail_on_main_thread():
+                if threading.current_thread() == threading.main_thread():
+                    raise RuntimeError("should fail on main thread")
+                return "should succeed on non-main thread"
+
+
+            should_fail_on_main_thread._run_on_main_thread = True
+            """
+        )
+    )
+
+    env_definition = define_environment(
+        "virtualenv",
+        requirements=[str(package_dir)],
+    )
+    request = definitions.BoundFunction(
+        entrypoint="entrypoint_main_thread_override_test:should_fail_on_main_thread",
+        environments=[env_definition],
+        run_on_main_thread=False,
+    )
+
+    raw_result = run_request(stub, request)
+    assert from_grpc(raw_result) == "should succeed on non-main thread"
+
+
 def test_agent_import_falls_back_when_settings_constant_missing(
     monkeypatch: Any,
 ) -> None:
@@ -1072,6 +1182,12 @@ def test_server_run_on_main_thread(
         else:
             return "should succeed on non-main thread"
 
+    def func_should_fail_off_main_thread():
+        if threading.current_thread() != threading.main_thread():
+            raise RuntimeError("should fail on non-main thread")
+        else:
+            return "should succeed on main thread"
+
     result = from_grpc(
         run_request(stub, prepare_request(func_should_fail_on_main_thread))
     )
@@ -1081,6 +1197,28 @@ def test_server_run_on_main_thread(
     with pytest.raises(RuntimeError):
         from_grpc(run_request(stub, prepare_request(func_should_fail_on_main_thread)))
 
+    result = from_grpc(
+        run_request(
+            stub,
+            prepare_request(
+                func_should_fail_on_main_thread,
+                run_on_main_thread=False,
+            ),
+        )
+    )
+    assert result == "should succeed on non-main thread"
+
+    result = from_grpc(
+        run_request(
+            stub,
+            prepare_request(
+                func_should_fail_off_main_thread,
+                run_on_main_thread=True,
+            ),
+        )
+    )
+    assert result == "should succeed on main thread"
+
 
 def test_server_async_function(
     stub: definitions.IsolateStub,

isolate-0.26.1/src/isolate/server/definitions/server_pb2.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: server.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 isolate.connections.grpc.definitions import common_pb2 as common__pb2
-from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cserver.proto\x1a\x0c\x63ommon.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xf2\x01\n\rBoundFunction\x12,\n\x0c\x65nvironments\x18\x01 \x03(\x0b\x32\x16.EnvironmentDefinition\x12*\n\nsetup_func\x18\x03 \x01(\x0b\x32\x11.SerializedObjectH\x01\x88\x01\x01\x12\x13\n\x0bstream_logs\x18\x04 \x01(\x08\x12\x1a\n\x12run_on_main_thread\x18\x06 \x01(\x08\x12%\n\x08\x66unction\x18\x02 \x01(\x0b\x32\x11.SerializedObjectH\x00\x12\x14\n\nentrypoint\x18\x05 \x01(\tH\x00\x42\n\n\x08\x63\x61llableB\r\n\x0b_setup_func\"d\n\x15\x45nvironmentDefinition\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12.\n\rconfiguration\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\r\n\x05\x66orce\x18\x03 \x01(\x08\"R\n\rSubmitRequest\x12 \n\x08\x66unction\x18\x01 \x01(\x0b\x32\x0e.BoundFunction\x12\x1f\n\x08metadata\x18\x02 \x01(\x0b\x32\r.TaskMetadata\"{\n\x0cTaskMetadata\x12\x36\n\rlogger_labels\x18\x01 \x03(\x0b\x32\x1f.TaskMetadata.LoggerLabelsEntry\x1a\x33\n\x11LoggerLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"!\n\x0eSubmitResponse\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"F\n\x12SetMetadataRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x1f\n\x08metadata\x18\x02 \x01(\x0b\x32\r.TaskMetadata\"\x15\n\x13SetMetadataResponse\"\r\n\x0bListRequest\"\x1b\n\x08TaskInfo\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"(\n\x0cListResponse\x12\x18\n\x05tasks\x18\x01 \x03(\x0b\x32\t.TaskInfo\" \n\rCancelRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"\x10\n\x0e\x43\x61ncelResponse2\xf4\x01\n\x07Isolate\x12,\n\x03Run\x12\x0e.BoundFunction\x1a\x11.PartialRunResult\"\x00\x30\x01\x12+\n\x06Submit\x12\x0e.SubmitRequest\x1a\x0f.SubmitResponse\"\x00\x12:\n\x0bSetMetadata\x12\x13.SetMetadataRequest\x1a\x14.SetMetadataResponse\"\x00\x12%\n\x04List\x12\x0c.ListRequest\x1a\r.ListResponse\"\x00\x12+\n\x06\x43\x61ncel\x12\x0e.CancelRequest\x1a\x0f.CancelResponse\"\x00\x62\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'server_pb2', _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
-  DESCRIPTOR._options = None
-  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._options = None
-  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_options = b'8\001'
-  _globals['_BOUNDFUNCTION']._serialized_start=61
-  _globals['_BOUNDFUNCTION']._serialized_end=303
-  _globals['_ENVIRONMENTDEFINITION']._serialized_start=305
-  _globals['_ENVIRONMENTDEFINITION']._serialized_end=405
-  _globals['_SUBMITREQUEST']._serialized_start=407
-  _globals['_SUBMITREQUEST']._serialized_end=489
-  _globals['_TASKMETADATA']._serialized_start=491
-  _globals['_TASKMETADATA']._serialized_end=614
-  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_start=563
-  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_end=614
-  _globals['_SUBMITRESPONSE']._serialized_start=616
-  _globals['_SUBMITRESPONSE']._serialized_end=649
-  _globals['_SETMETADATAREQUEST']._serialized_start=651
-  _globals['_SETMETADATAREQUEST']._serialized_end=721
-  _globals['_SETMETADATARESPONSE']._serialized_start=723
-  _globals['_SETMETADATARESPONSE']._serialized_end=744
-  _globals['_LISTREQUEST']._serialized_start=746
-  _globals['_LISTREQUEST']._serialized_end=759
-  _globals['_TASKINFO']._serialized_start=761
-  _globals['_TASKINFO']._serialized_end=788
-  _globals['_LISTRESPONSE']._serialized_start=790
-  _globals['_LISTRESPONSE']._serialized_end=830
-  _globals['_CANCELREQUEST']._serialized_start=832
-  _globals['_CANCELREQUEST']._serialized_end=864
-  _globals['_CANCELRESPONSE']._serialized_start=866
-  _globals['_CANCELRESPONSE']._serialized_end=882
-  _globals['_ISOLATE']._serialized_start=885
-  _globals['_ISOLATE']._serialized_end=1129
-# @@protoc_insertion_point(module_scope)