isolate 0.13.3__tar.gz → 0.13.5__tar.gz

{isolate-0.13.3 → isolate-0.13.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.13.3
+Version: 0.13.5
 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.13.3 → isolate-0.13.5}/src/isolate/_isolate_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.13.3'
-__version_tuple__ = version_tuple = (0, 13, 3)
+__version__ = version = '0.13.5'
+__version_tuple__ = version_tuple = (0, 13, 5)

{isolate-0.13.3 → isolate-0.13.5}/src/isolate/connections/grpc/_base.py

@@ -16,7 +16,6 @@ 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.logger import logger
 from isolate.logs import LogLevel, LogSource
 
 
@@ -149,5 +148,4 @@ class LocalPythonGRPC(PythonExecutionBase[str], GRPCExecutionBase):
         ]
 
     def handle_agent_log(self, line: str, level: LogLevel, source: LogSource) -> None:
-        logger.log(level, line, source)
         self.log(line, level=level, source=source)

{isolate-0.13.3 → isolate-0.13.5}/src/isolate/connections/grpc/agent.py

@@ -1,4 +1,12 @@
 # agent-requires: isolate[server]
+"""
+This file contains the implementation of the gRPC agent. The agent is a
+separate process that is responsible for running the user code in a
+sandboxed environment.
+
+This file is referenced by the latest version of the `isolate` package
+but then runs it in the context of the frozen agent built environment.
+"""
 
 from __future__ import annotations
 
@@ -17,14 +25,16 @@ from typing import (
 import grpc
 from grpc import ServicerContext, StatusCode
 
-from isolate import __version__ as agent_version
+try:
+    from isolate import __version__ as agent_version
+except ImportError:
+    agent_version = "UNKNOWN"
+
 from isolate.backends.common import sha256_digest_of
 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
-from isolate.logger import logger
-from isolate.logs import LogLevel, LogSource
 
 
 @dataclass
@@ -117,7 +127,7 @@ class AgentServicer(definitions.AgentServicer):
             # depickling is basically involves code execution from the *user*.
             function = from_grpc(function)
         except SerializationError:
-            self.log(traceback.format_exc())
+            traceback.print_exc()
             raise AbortException(
                 f"The {function_kind} function could not be deserialized."
             )
@@ -154,7 +164,8 @@ class AgentServicer(definitions.AgentServicer):
             definition = serialize_object(serialization_method, result)
         except SerializationError:
             if stringized_tb:
-                logger.log(LogLevel.ERROR, stringized_tb, LogSource.BRIDGE)
+                print(stringized_tb, file=sys.stderr)
+            self.log(traceback.format_exc())
             raise AbortException(
                 "Error while serializing the execution result "
                 f"(object of type {type(result)})."
@@ -179,7 +190,7 @@ class AgentServicer(definitions.AgentServicer):
         )
 
     def log(self, message: str) -> None:
-        self._log.write(message)
+        self._log.write(message + "\n")
         self._log.flush()
 
     def abort_with_msg(

{isolate-0.13.3 → isolate-0.13.5}/src/isolate/server/server.py

@@ -9,7 +9,6 @@ from concurrent import futures
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import ExitStack, contextmanager
 from dataclasses import dataclass, field, replace
-from functools import partial
 from queue import Empty as QueueEmpty
 from queue import Queue
 from typing import Any, Callable, Iterator, cast
@@ -26,6 +25,7 @@ from isolate.backends.local import LocalPythonEnvironment
 from isolate.backends.virtualenv import VirtualPythonEnvironment
 from isolate.connections.grpc import AgentError, LocalPythonGRPC
 from isolate.connections.grpc.configuration import get_default_options
+from isolate.logger import logger
 from isolate.logs import Log, LogLevel, LogSource
 from isolate.server import definitions, health
 from isolate.server.health_server import HealthServicer
@@ -191,9 +191,10 @@ class IsolateServicer(definitions.IsolateServicer):
                 StatusCode.INVALID_ARGUMENT,
             )
 
+        log_handler = LogHandler(messages)
         run_settings = replace(
             self.default_settings,
-            log_hook=partial(_add_log_to_queue, messages),
+            log_hook=log_handler.handle,
             serialization_method=request.function.method,
         )
 
@@ -390,14 +391,22 @@ def _proxy_to_queue(
         queue.put_nowait(message)
 
 
-def _add_log_to_queue(messages: Queue, log: Log) -> None:
-    grpc_log = cast(definitions.Log, to_grpc(log))
-    grpc_result = definitions.PartialRunResult(
-        is_complete=False,
-        logs=[grpc_log],
-        result=None,
-    )
-    messages.put_nowait(grpc_result)
+@dataclass
+class LogHandler:
+    messages: Queue
+
+    def handle(self, log: Log) -> None:
+        logger.log(log.level, log.message, source=log.source)
+        self._add_log_to_queue(log)
+
+    def _add_log_to_queue(self, log: Log) -> None:
+        grpc_log = cast(definitions.Log, to_grpc(log))
+        grpc_result = definitions.PartialRunResult(
+            is_complete=False,
+            logs=[grpc_log],
+            result=None,
+        )
+        self.messages.put_nowait(grpc_result)
 
 
 def main() -> None:

{isolate-0.13.3 → isolate-0.13.5}/src/isolate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.13.3
+Version: 0.13.5
 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.13.3 → isolate-0.13.5}/tests/test_server.py

@@ -217,7 +217,7 @@ def test_server_builder_error(stub: definitions.IsolateStub, monkeypatch: Any) -
     assert "Failure during 'pip install': Command" in exc.value.details()
 
     raw_logs = [log.message for log in build_logs]
-    assert "ERROR: Invalid requirement: '$$$$'" in raw_logs
+    assert any("ERROR: Invalid requirement: '$$$$'" in raw_log for raw_log in raw_logs)
 
 
 def test_user_logs_immediate(stub: definitions.IsolateStub, monkeypatch: Any) -> None:
@@ -402,7 +402,7 @@ def test_agent_show_logs_from_agent_requirements(
     assert "Failure during 'pip install': Command" in exc.value.details()
 
     raw_logs = [log.message for log in build_logs]
-    assert "ERROR: Invalid requirement: '$$$$'" in raw_logs
+    assert any("ERROR: Invalid requirement: '$$$$'" in raw_log for raw_log in raw_logs)
 
 
 def test_bridge_connection_reuse(