isolate 0.13.3__py3-none-any.whl → 0.13.5__py3-none-any.whl

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/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/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/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.dist-info → isolate-0.13.5.dist-info}/METADATA

@@ -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.dist-info → isolate-0.13.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 isolate/__init__.py,sha256=uXOKnONs7sXgARNgElwr4_A1sKoA6ACHVEvs3IDiX1M,127
-isolate/_isolate_version.py,sha256=VXQPyzbmOGe0nuuEEus9EQY40THABR5BB9WWse8Z8LI,413
+isolate/_isolate_version.py,sha256=nyWjzUs9M1XFc5MLonkyorh4rhe5dHRCj707gnafzf4,413
 isolate/_version.py,sha256=05pXvy-yr5t3I1m9JMn42Ilzpg7fa8IB2J8a3G7t1cU,274
 isolate/logger.py,sha256=SehnK6rPx-HDqQHJ3sKWqhDGmD3fTDGBIkjnNQYnFJU,453
 isolate/logs.py,sha256=R_AHUVYD18z_PhtK_mDWi9Gch79CxmwHY09hUDShtwg,2079
@@ -23,8 +23,8 @@ isolate/connections/_local/__init__.py,sha256=6FtCKRSFBvTvjm5LNlNA-mieKEq3J7DZZR
 isolate/connections/_local/_base.py,sha256=YGf141VgXErrXYNyRN7sXcts2SemlFEEocZsKmLQfVM,6659
 isolate/connections/_local/agent_startup.py,sha256=swCs6Q0yVkDw7w-RftizHSMyJDM7DQwuP3TB0qI1ucg,1552
 isolate/connections/grpc/__init__.py,sha256=tcesLxlC36P6wSg2lBcO2egsJWMbSKwc8zFXhWac3YU,85
-isolate/connections/grpc/_base.py,sha256=qyagLVl4BOmkJvbFDLyA2-IZNkXeTRGOgRGGcvcyQwM,5713
-isolate/connections/grpc/agent.py,sha256=eXEVHqwqT1p-8V8UEVC5qD5jsTcYaZicaRFLxxmJLec,7757
+isolate/connections/grpc/_base.py,sha256=6cBlJRoKDoJFQudLgkEeUcGVxcIyaAzkB-Zec14hm8k,5639
+isolate/connections/grpc/agent.py,sha256=fZF4-v8WN1qPzFp17UxOX_A3Jq8bXD8Wss-7eNgNoYg,8071
 isolate/connections/grpc/configuration.py,sha256=50YvGGHA9uyKg74xU_gc73j7bsFk973uIpMhmw2HhxY,788
 isolate/connections/grpc/interface.py,sha256=yt63kytgXRXrTnjePGJVdXz4LJJVSSrNkJCF1yz6FIE,2270
 isolate/connections/grpc/definitions/__init__.py,sha256=Z0453Bbjoq-Oxm2Wfi9fae-BFf8YsZwmuh88strmvxo,459
@@ -42,7 +42,7 @@ isolate/connections/ipc/agent.py,sha256=hGlL4x78FhRvMZ4DkVh3dk-EmWQqxHW4LIipgyOk
 isolate/server/__init__.py,sha256=7R3GuWmxuqe0q28rVqETJN9OCrP_-Svjv9h0NR1GFL0,79
 isolate/server/health_server.py,sha256=yN7F1Q28DdX8-Zk3gef7XcQEE25XwlHwzV5GBM75aQM,1249
 isolate/server/interface.py,sha256=nGbjdxrN0p9m1LNdeds8NIoJOwPYW2NM6ktmbhfG4_s,687
-isolate/server/server.py,sha256=RIB9wsG_IzR7qZN-7KMTxuZ8iupjufQJxMcLfe-M_QI,14639
+isolate/server/server.py,sha256=rDTiZCGPTgJ5cdrgl6l6xaoV-0twBNm8PzZRsAdii5U,14883
 isolate/server/definitions/__init__.py,sha256=f_Q3pdjMuZrjgNlbM60btFKiB1Vg8cnVyKEbp0RmU0A,572
 isolate/server/definitions/server.proto,sha256=-Wv0LAexj2GXfR3TSyGEcd3qkKgpvvQHQBEp7y3f-9Y,1002
 isolate/server/definitions/server_pb2.py,sha256=tOYlfoh2C5j1PGxAVBuKEtT5s-qeAK7iDaP9sIvOyqw,2293
@@ -53,9 +53,9 @@ isolate/server/health/health.proto,sha256=wE2_QD0OQAblKkEBG7sALLXEOj1mOLKG-FbC4t
 isolate/server/health/health_pb2.py,sha256=onOdP3M4Tpqhqs2PlGcyfoKe2VVKUEDx5ALeRcObb9A,1899
 isolate/server/health/health_pb2.pyi,sha256=CPyvxvDzra-1d-mBsukaJnscMUDBaqSACvo9LiXlFzo,2416
 isolate/server/health/health_pb2_grpc.py,sha256=XgsULrnRBmYIqvKr8eI7bqs6NIea5A0kkqdOOc2JHBY,5303
-isolate-0.13.3.dist-info/LICENSE,sha256=427vuyirL5scgBLqA9UWcdnxKrtSGc0u_JfUupk6lAA,11359
-isolate-0.13.3.dist-info/METADATA,sha256=o-iPomzdzL4NPtUhM1hze-RI6UJbLl0xyibSks4oOdg,3209
-isolate-0.13.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-isolate-0.13.3.dist-info/entry_points.txt,sha256=s3prh2EERaVCbL8R45tfY5WFPZ1TsYOsz305YR7s-Pc,360
-isolate-0.13.3.dist-info/top_level.txt,sha256=W9QJBHcq5WXRkbOXf25bvftzFsOZZN4n1DAatdroZrs,8
-isolate-0.13.3.dist-info/RECORD,,
+isolate-0.13.5.dist-info/LICENSE,sha256=427vuyirL5scgBLqA9UWcdnxKrtSGc0u_JfUupk6lAA,11359
+isolate-0.13.5.dist-info/METADATA,sha256=4HUFRzvXN8INQYJHZbOk8Ry8xrrIyOmcrfiWhoW4itE,3209
+isolate-0.13.5.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+isolate-0.13.5.dist-info/entry_points.txt,sha256=s3prh2EERaVCbL8R45tfY5WFPZ1TsYOsz305YR7s-Pc,360
+isolate-0.13.5.dist-info/top_level.txt,sha256=W9QJBHcq5WXRkbOXf25bvftzFsOZZN4n1DAatdroZrs,8
+isolate-0.13.5.dist-info/RECORD,,

{isolate-0.13.3.dist-info → isolate-0.13.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any