isolate 0.13.10__py3-none-any.whl → 0.14.0__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.10'
-__version_tuple__ = version_tuple = (0, 13, 10)
+__version__ = version = '0.14.0'
+__version_tuple__ = version_tuple = (0, 14, 0)

isolate/connections/grpc/definitions/agent_pb2.pyi

@@ -2,16 +2,20 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
-
 import builtins
 from isolate.connections.grpc.definitions import common_pb2
 import google.protobuf.descriptor
 import google.protobuf.message
-import typing
+import sys
+
+if sys.version_info >= (3, 8):
+    import typing as typing_extensions
+else:
+    import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
-@typing.final
+@typing_extensions.final
 class FunctionCall(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -20,7 +24,6 @@ class FunctionCall(google.protobuf.message.Message):
     @property
     def function(self) -> common_pb2.SerializedObject:
         """The function to execute and return the results to."""
-
     @property
     def setup_func(self) -> common_pb2.SerializedObject:
         """Optionally the setup function which will be passed
@@ -28,15 +31,14 @@ class FunctionCall(google.protobuf.message.Message):
         has to be an idempotent step since the result for
         this executable will be cached.
         """
-
     def __init__(
         self,
         *,
         function: common_pb2.SerializedObject | None = ...,
         setup_func: common_pb2.SerializedObject | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_setup_func", b"_setup_func", "function", b"function", "setup_func", b"setup_func"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_setup_func", b"_setup_func", "function", b"function", "setup_func", b"setup_func"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_setup_func", b"_setup_func"]) -> typing.Literal["setup_func"] | None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "function", b"function", "setup_func", b"setup_func"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "function", b"function", "setup_func", b"setup_func"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_setup_func", b"_setup_func"]) -> typing_extensions.Literal["setup_func"] | None: ...
 
 global___FunctionCall = FunctionCall

isolate/connections/grpc/definitions/common_pb2.pyi

@@ -2,7 +2,6 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
-
 import builtins
 import collections.abc
 import google.protobuf.descriptor
@@ -62,7 +61,7 @@ STDOUT: LogLevel.ValueType  # 5
 STDERR: LogLevel.ValueType  # 6
 global___LogLevel = LogLevel
 
-@typing.final
+@typing_extensions.final
 class SerializedObject(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -90,13 +89,13 @@ class SerializedObject(google.protobuf.message.Message):
         was_it_raised: builtins.bool = ...,
         stringized_traceback: builtins.str | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_stringized_traceback", b"_stringized_traceback", "stringized_traceback", b"stringized_traceback"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.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 WhichOneof(self, oneof_group: typing.Literal["_stringized_traceback", b"_stringized_traceback"]) -> typing.Literal["stringized_traceback"] | 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 WhichOneof(self, oneof_group: typing_extensions.Literal["_stringized_traceback", b"_stringized_traceback"]) -> typing_extensions.Literal["stringized_traceback"] | None: ...
 
 global___SerializedObject = SerializedObject
 
-@typing.final
+@typing_extensions.final
 class PartialRunResult(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -110,11 +109,9 @@ class PartialRunResult(google.protobuf.message.Message):
         """A list of logs collected during this partial execution. It does
         not include old logs.
         """
-
     @property
     def result(self) -> global___SerializedObject:
         """The result of the run, if it is complete."""
-
     def __init__(
         self,
         *,
@@ -122,13 +119,13 @@ class PartialRunResult(google.protobuf.message.Message):
         logs: collections.abc.Iterable[global___Log] | None = ...,
         result: global___SerializedObject | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_result", b"_result", "result", b"result"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_result", b"_result", "is_complete", b"is_complete", "logs", b"logs", "result", b"result"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_result", b"_result"]) -> typing.Literal["result"] | None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_result", b"_result", "result", b"result"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_result", b"_result", "is_complete", b"is_complete", "logs", b"logs", "result", b"result"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_result", b"_result"]) -> typing_extensions.Literal["result"] | None: ...
 
 global___PartialRunResult = PartialRunResult
 
-@typing.final
+@typing_extensions.final
 class Log(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -149,7 +146,7 @@ class Log(google.protobuf.message.Message):
         level: global___LogLevel.ValueType = ...,
         timestamp: google.protobuf.timestamp_pb2.Timestamp | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["timestamp", b"timestamp"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["level", b"level", "message", b"message", "source", b"source", "timestamp", b"timestamp"]) -> 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", "timestamp", b"timestamp"]) -> None: ...
 
 global___Log = Log

isolate/logger.py

@@ -1,24 +1,18 @@
 import json
 import os
+from typing import Dict
+
+from isolate.logs import LogLevel, LogSource
 
 
 # NOTE: we probably should've created a proper `logging.getLogger` here,
 # but it handling `source` would be not trivial, so we are better off
 # just keeping it simple for now.
 class IsolateLogger:
-    def __init__(self):
-        self.log_labels = {}
-        raw = os.getenv("ISOLATE_LOG_LABELS")
-        if raw:
-            labels = json.loads(raw)
-            for key, value in labels.items():
-                if value.startswith("$"):
-                    expanded = os.getenv(value[1:])
-                else:
-                    expanded = value
-                self.log_labels[key] = expanded
-
-    def log(self, level, message, source):
+    def __init__(self, log_labels: Dict[str, str]):
+        self.log_labels = log_labels
+
+    def log(self, level: LogLevel, message: str, source: LogSource) -> None:
         record = {
             "isolate_source": source.name,
             "level": level.name,
@@ -27,5 +21,29 @@ class IsolateLogger:
         }
         print(json.dumps(record))
 
+    @classmethod
+    def with_env_expanded(cls, labels: Dict[str, str]) -> "IsolateLogger":
+        for key, value in labels.items():
+            if value.startswith("$"):
+                expanded = os.getenv(value[1:])
+            else:
+                expanded = value
+            if expanded is not None:
+                labels[key] = expanded
+
+        return cls(labels)
+
+    @classmethod
+    def from_env(cls) -> "IsolateLogger":
+        _labels: Dict[str, str] = {}
+        raw = os.getenv("ISOLATE_LOG_LABELS")
+        if raw:
+            try:
+                _labels = json.loads(raw)
+            except json.JSONDecodeError:
+                print("Failed to parse ISOLATE_LOG_LABELS")
+
+        return cls.with_env_expanded(labels=_labels)
+
 
-logger = IsolateLogger()
+ENV_LOGGER = IsolateLogger.from_env()

isolate/server/definitions/server.proto

@@ -11,6 +11,9 @@ service Isolate {
     // Submit a function to be run without waiting for results.
     rpc Submit (SubmitRequest) returns (SubmitResponse) {}
 
+    // Set the metadata for a task.
+    rpc SetMetadata (SetMetadataRequest) returns (SetMetadataResponse) {}
+
     // List running tasks
     rpc List (ListRequest) returns (ListResponse) {}
 
@@ -36,12 +39,27 @@ message EnvironmentDefinition {
 message SubmitRequest {
     // The function to run.
     BoundFunction function = 1;
+    // Task metadata.
+    TaskMetadata metadata = 2;
+}
+
+message TaskMetadata {
+    // Labels to attach to the logs.
+    map<string, string> logger_labels = 1;
 }
 
 message SubmitResponse {
     string task_id = 1;
 }
 
+message SetMetadataRequest{
+    string task_id = 1;
+    TaskMetadata metadata = 2;
+}
+
+message SetMetadataResponse {
+}
+
 message ListRequest {
 }
 

isolate/server/definitions/server_pb2.py

@@ -16,31 +16,41 @@ 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\"\x9d\x01\n\rBoundFunction\x12,\n\x0c\x65nvironments\x18\x01 \x03(\x0b\x32\x16.EnvironmentDefinition\x12#\n\x08\x66unction\x18\x02 \x01(\x0b\x32\x11.SerializedObject\x12*\n\nsetup_func\x18\x03 \x01(\x0b\x32\x11.SerializedObjectH\x00\x88\x01\x01\x42\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\"1\n\rSubmitRequest\x12 \n\x08\x66unction\x18\x01 \x01(\x0b\x32\x0e.BoundFunction\"!\n\x0eSubmitResponse\x12\x0f\n\x07task_id\x18\x01 \x01(\t\"\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\xb8\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\x04List\x12\x0c.ListRequest\x1a\r.ListResponse\"\x00\x12+\n\x06\x43\x61ncel\x12\x0e.CancelRequest\x1a\x0f.CancelResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cserver.proto\x1a\x0c\x63ommon.proto\x1a\x1cgoogle/protobuf/struct.proto\"\x9d\x01\n\rBoundFunction\x12,\n\x0c\x65nvironments\x18\x01 \x03(\x0b\x32\x16.EnvironmentDefinition\x12#\n\x08\x66unction\x18\x02 \x01(\x0b\x32\x11.SerializedObject\x12*\n\nsetup_func\x18\x03 \x01(\x0b\x32\x11.SerializedObjectH\x00\x88\x01\x01\x42\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 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=218
   _globals['_ENVIRONMENTDEFINITION']._serialized_start=220
   _globals['_ENVIRONMENTDEFINITION']._serialized_end=320
   _globals['_SUBMITREQUEST']._serialized_start=322
-  _globals['_SUBMITREQUEST']._serialized_end=371
-  _globals['_SUBMITRESPONSE']._serialized_start=373
-  _globals['_SUBMITRESPONSE']._serialized_end=406
-  _globals['_LISTREQUEST']._serialized_start=408
-  _globals['_LISTREQUEST']._serialized_end=421
-  _globals['_TASKINFO']._serialized_start=423
-  _globals['_TASKINFO']._serialized_end=450
-  _globals['_LISTRESPONSE']._serialized_start=452
-  _globals['_LISTRESPONSE']._serialized_end=492
-  _globals['_CANCELREQUEST']._serialized_start=494
-  _globals['_CANCELREQUEST']._serialized_end=526
-  _globals['_CANCELRESPONSE']._serialized_start=528
-  _globals['_CANCELRESPONSE']._serialized_end=544
-  _globals['_ISOLATE']._serialized_start=547
-  _globals['_ISOLATE']._serialized_end=731
+  _globals['_SUBMITREQUEST']._serialized_end=404
+  _globals['_TASKMETADATA']._serialized_start=406
+  _globals['_TASKMETADATA']._serialized_end=529
+  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_start=478
+  _globals['_TASKMETADATA_LOGGERLABELSENTRY']._serialized_end=529
+  _globals['_SUBMITRESPONSE']._serialized_start=531
+  _globals['_SUBMITRESPONSE']._serialized_end=564
+  _globals['_SETMETADATAREQUEST']._serialized_start=566
+  _globals['_SETMETADATAREQUEST']._serialized_end=636
+  _globals['_SETMETADATARESPONSE']._serialized_start=638
+  _globals['_SETMETADATARESPONSE']._serialized_end=659
+  _globals['_LISTREQUEST']._serialized_start=661
+  _globals['_LISTREQUEST']._serialized_end=674
+  _globals['_TASKINFO']._serialized_start=676
+  _globals['_TASKINFO']._serialized_end=703
+  _globals['_LISTRESPONSE']._serialized_start=705
+  _globals['_LISTRESPONSE']._serialized_end=745
+  _globals['_CANCELREQUEST']._serialized_start=747
+  _globals['_CANCELREQUEST']._serialized_end=779
+  _globals['_CANCELRESPONSE']._serialized_start=781
+  _globals['_CANCELRESPONSE']._serialized_end=797
+  _globals['_ISOLATE']._serialized_start=800
+  _globals['_ISOLATE']._serialized_end=1044
 # @@protoc_insertion_point(module_scope)

isolate/server/definitions/server_pb2.pyi

@@ -2,7 +2,6 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
-
 import builtins
 import collections.abc
 from isolate.connections.grpc.definitions import common_pb2
@@ -10,11 +9,16 @@ import google.protobuf.descriptor
 import google.protobuf.internal.containers
 import google.protobuf.message
 import google.protobuf.struct_pb2
-import typing
+import sys
+
+if sys.version_info >= (3, 8):
+    import typing as typing_extensions
+else:
+    import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
-@typing.final
+@typing_extensions.final
 class BoundFunction(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -34,13 +38,13 @@ class BoundFunction(google.protobuf.message.Message):
         function: common_pb2.SerializedObject | None = ...,
         setup_func: common_pb2.SerializedObject | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_setup_func", b"_setup_func", "function", b"function", "setup_func", b"setup_func"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_setup_func", b"_setup_func", "environments", b"environments", "function", b"function", "setup_func", b"setup_func"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_setup_func", b"_setup_func"]) -> typing.Literal["setup_func"] | None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "function", b"function", "setup_func", b"setup_func"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_setup_func", b"_setup_func", "environments", b"environments", "function", b"function", "setup_func", b"setup_func"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_setup_func", b"_setup_func"]) -> typing_extensions.Literal["setup_func"] | None: ...
 
 global___BoundFunction = BoundFunction
 
-@typing.final
+@typing_extensions.final
 class EnvironmentDefinition(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -49,12 +53,11 @@ class EnvironmentDefinition(google.protobuf.message.Message):
     FORCE_FIELD_NUMBER: builtins.int
     kind: builtins.str
     """Kind of the isolate environment."""
-    force: builtins.bool
-    """Whether to force-create this environment or not."""
     @property
     def configuration(self) -> google.protobuf.struct_pb2.Struct:
         """A free-form definition of environment properties."""
-
+    force: builtins.bool
+    """Whether to force-create this environment or not."""
     def __init__(
         self,
         *,
@@ -62,31 +65,68 @@ class EnvironmentDefinition(google.protobuf.message.Message):
         configuration: google.protobuf.struct_pb2.Struct | None = ...,
         force: builtins.bool = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["configuration", b"configuration"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["configuration", b"configuration", "force", b"force", "kind", b"kind"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["configuration", b"configuration"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["configuration", b"configuration", "force", b"force", "kind", b"kind"]) -> None: ...
 
 global___EnvironmentDefinition = EnvironmentDefinition
 
-@typing.final
+@typing_extensions.final
 class SubmitRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     FUNCTION_FIELD_NUMBER: builtins.int
+    METADATA_FIELD_NUMBER: builtins.int
     @property
     def function(self) -> global___BoundFunction:
         """The function to run."""
-
+    @property
+    def metadata(self) -> global___TaskMetadata:
+        """Task metadata."""
     def __init__(
         self,
         *,
         function: global___BoundFunction | None = ...,
+        metadata: global___TaskMetadata | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["function", b"function"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["function", b"function"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["function", b"function", "metadata", b"metadata"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["function", b"function", "metadata", b"metadata"]) -> None: ...
 
 global___SubmitRequest = SubmitRequest
 
-@typing.final
+@typing_extensions.final
+class TaskMetadata(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    @typing_extensions.final
+    class LoggerLabelsEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: builtins.str
+        value: builtins.str
+        def __init__(
+            self,
+            *,
+            key: builtins.str = ...,
+            value: builtins.str = ...,
+        ) -> None: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key", b"key", "value", b"value"]) -> None: ...
+
+    LOGGER_LABELS_FIELD_NUMBER: builtins.int
+    @property
+    def logger_labels(self) -> google.protobuf.internal.containers.ScalarMap[builtins.str, builtins.str]:
+        """Labels to attach to the logs."""
+    def __init__(
+        self,
+        *,
+        logger_labels: collections.abc.Mapping[builtins.str, builtins.str] | None = ...,
+    ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["logger_labels", b"logger_labels"]) -> None: ...
+
+global___TaskMetadata = TaskMetadata
+
+@typing_extensions.final
 class SubmitResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -97,11 +137,41 @@ class SubmitResponse(google.protobuf.message.Message):
         *,
         task_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["task_id", b"task_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["task_id", b"task_id"]) -> None: ...
 
 global___SubmitResponse = SubmitResponse
 
-@typing.final
+@typing_extensions.final
+class SetMetadataRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    TASK_ID_FIELD_NUMBER: builtins.int
+    METADATA_FIELD_NUMBER: builtins.int
+    task_id: builtins.str
+    @property
+    def metadata(self) -> global___TaskMetadata: ...
+    def __init__(
+        self,
+        *,
+        task_id: builtins.str = ...,
+        metadata: global___TaskMetadata | None = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["metadata", b"metadata"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["metadata", b"metadata", "task_id", b"task_id"]) -> None: ...
+
+global___SetMetadataRequest = SetMetadataRequest
+
+@typing_extensions.final
+class SetMetadataResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___SetMetadataResponse = SetMetadataResponse
+
+@typing_extensions.final
 class ListRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -111,7 +181,7 @@ class ListRequest(google.protobuf.message.Message):
 
 global___ListRequest = ListRequest
 
-@typing.final
+@typing_extensions.final
 class TaskInfo(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -122,11 +192,11 @@ class TaskInfo(google.protobuf.message.Message):
         *,
         task_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["task_id", b"task_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["task_id", b"task_id"]) -> None: ...
 
 global___TaskInfo = TaskInfo
 
-@typing.final
+@typing_extensions.final
 class ListResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -138,11 +208,11 @@ class ListResponse(google.protobuf.message.Message):
         *,
         tasks: collections.abc.Iterable[global___TaskInfo] | None = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["tasks", b"tasks"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["tasks", b"tasks"]) -> None: ...
 
 global___ListResponse = ListResponse
 
-@typing.final
+@typing_extensions.final
 class CancelRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -153,11 +223,11 @@ class CancelRequest(google.protobuf.message.Message):
         *,
         task_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["task_id", b"task_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["task_id", b"task_id"]) -> None: ...
 
 global___CancelRequest = CancelRequest
 
-@typing.final
+@typing_extensions.final
 class CancelResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 

isolate/server/definitions/server_pb2_grpc.py

@@ -50,6 +50,11 @@ class IsolateStub(object):
                 request_serializer=server__pb2.SubmitRequest.SerializeToString,
                 response_deserializer=server__pb2.SubmitResponse.FromString,
                 _registered_method=True)
+        self.SetMetadata = channel.unary_unary(
+                '/Isolate/SetMetadata',
+                request_serializer=server__pb2.SetMetadataRequest.SerializeToString,
+                response_deserializer=server__pb2.SetMetadataResponse.FromString,
+                _registered_method=True)
         self.List = channel.unary_unary(
                 '/Isolate/List',
                 request_serializer=server__pb2.ListRequest.SerializeToString,
@@ -80,6 +85,13 @@ class IsolateServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def SetMetadata(self, request, context):
+        """Set the metadata for a task.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def List(self, request, context):
         """List running tasks
         """
@@ -107,6 +119,11 @@ def add_IsolateServicer_to_server(servicer, server):
                     request_deserializer=server__pb2.SubmitRequest.FromString,
                     response_serializer=server__pb2.SubmitResponse.SerializeToString,
             ),
+            'SetMetadata': grpc.unary_unary_rpc_method_handler(
+                    servicer.SetMetadata,
+                    request_deserializer=server__pb2.SetMetadataRequest.FromString,
+                    response_serializer=server__pb2.SetMetadataResponse.SerializeToString,
+            ),
             'List': grpc.unary_unary_rpc_method_handler(
                     servicer.List,
                     request_deserializer=server__pb2.ListRequest.FromString,
@@ -182,6 +199,33 @@ class Isolate(object):
             metadata,
             _registered_method=True)
 
+    @staticmethod
+    def SetMetadata(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/Isolate/SetMetadata',
+            server__pb2.SetMetadataRequest.SerializeToString,
+            server__pb2.SetMetadataResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
     @staticmethod
     def List(request,
             target,

isolate/server/health/health_pb2.pyi

@@ -2,7 +2,6 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
-
 import builtins
 import google.protobuf.descriptor
 import google.protobuf.internal.enum_type_wrapper
@@ -17,7 +16,7 @@ else:
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
-@typing.final
+@typing_extensions.final
 class HealthCheckRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -28,11 +27,11 @@ class HealthCheckRequest(google.protobuf.message.Message):
         *,
         service: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["service", b"service"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["service", b"service"]) -> None: ...
 
 global___HealthCheckRequest = HealthCheckRequest
 
-@typing.final
+@typing_extensions.final
 class HealthCheckResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
@@ -62,6 +61,6 @@ class HealthCheckResponse(google.protobuf.message.Message):
         *,
         status: global___HealthCheckResponse.ServingStatus.ValueType = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["status", b"status"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["status", b"status"]) -> None: ...
 
 global___HealthCheckResponse = HealthCheckResponse

isolate/server/server.py

@@ -29,7 +29,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.logger import ENV_LOGGER, IsolateLogger
 from isolate.logs import Log, LogLevel, LogSource
 from isolate.server import definitions, health
 from isolate.server.health_server import HealthServicer
@@ -174,6 +174,7 @@ class RunTask:
     request: definitions.BoundFunction
     future: futures.Future | None = None
     agent: RunnerAgent | None = None
+    logger: IsolateLogger = ENV_LOGGER
 
     def cancel(self):
         while True:
@@ -210,7 +211,8 @@ class IsolateServicer(definitions.IsolateServicer):
                 StatusCode.INVALID_ARGUMENT,
             )
 
-        log_handler = LogHandler(messages)
+        log_handler = LogHandler(messages, task=task)
+
         run_settings = replace(
             self.default_settings,
             log_hook=log_handler.handle,
@@ -321,11 +323,17 @@ class IsolateServicer(definitions.IsolateServicer):
         request: definitions.SubmitRequest,
         context: ServicerContext,
     ) -> definitions.SubmitResponse:
-        task = RunTask(request=request.function)
-        task.future = RUNNER_THREAD_POOL.submit(
-            self._run_task_in_background,
-            task,
-        )
+        logger = ENV_LOGGER
+        if request.metadata.logger_labels:
+            logger_labels_dict = dict(request.metadata.logger_labels)
+            try:
+                logger = IsolateLogger.with_env_expanded(logger_labels_dict)
+            except BaseException:
+                # Ignore the error if the logger couldn't be created.
+                pass
+
+        task = RunTask(request=request.function, logger=logger)
+        task.future = RUNNER_THREAD_POOL.submit(self._run_task_in_background, task)
         task_id = str(uuid.uuid4())
 
         print(f"Submitted a task {task_id}")
@@ -345,6 +353,25 @@ class IsolateServicer(definitions.IsolateServicer):
 
         return definitions.SubmitResponse(task_id=task_id)
 
+    def SetMetadata(
+        self,
+        request: definitions.SetMetadataRequest,
+        context: ServicerContext,
+    ) -> definitions.SetMetadataResponse:
+        if request.task_id not in self.background_tasks:
+            raise GRPCException(
+                f"Task {request.task_id} not found.",
+                StatusCode.NOT_FOUND,
+            )
+
+        task = self.background_tasks[request.task_id]
+
+        task.logger = IsolateLogger.with_env_expanded(
+            dict(request.metadata.logger_labels)
+        )
+
+        return definitions.SetMetadataResponse()
+
     def Run(
         self,
         request: definitions.BoundFunction,
@@ -453,9 +480,11 @@ def _proxy_to_queue(
 @dataclass
 class LogHandler:
     messages: Queue
+    # Reference to the task so we can change the logger
+    task: RunTask
 
     def handle(self, log: Log) -> None:
-        logger.log(log.level, log.message, source=log.source)
+        self.task.logger.log(log.level, log.message, source=log.source)
         self._add_log_to_queue(log)
 
     def _add_log_to_queue(self, log: Log) -> None:

{isolate-0.13.10.dist-info → isolate-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.13.10
+Version: 0.14.0
 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.10.dist-info → isolate-0.14.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 isolate/__init__.py,sha256=uXOKnONs7sXgARNgElwr4_A1sKoA6ACHVEvs3IDiX1M,127
-isolate/_isolate_version.py,sha256=B_BL6eQ9yadF9gaiiJ3EqZhMaaHCCNUTzs-755F92es,415
+isolate/_isolate_version.py,sha256=9XbM6DRatFmjNkeSNxF4a6enpQeo8nPyAy9RTPPwPpY,413
 isolate/_version.py,sha256=05pXvy-yr5t3I1m9JMn42Ilzpg7fa8IB2J8a3G7t1cU,274
-isolate/logger.py,sha256=Pr-P1UVDIHJkel3ZA3pkAOwXgnGiGjTw-KsxTVc5Y6E,894
+isolate/logger.py,sha256=d9mZyTOtplMZeQSNgRNiXhOPwJ0be2B1nGGaQx09C3g,1450
 isolate/logs.py,sha256=R_AHUVYD18z_PhtK_mDWi9Gch79CxmwHY09hUDShtwg,2079
 isolate/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isolate/registry.py,sha256=hpzv4HI7iihG5I7i5r8Pb257ibhEKY18xQcG-w1-BgI,1590
@@ -30,11 +30,11 @@ isolate/connections/grpc/interface.py,sha256=yt63kytgXRXrTnjePGJVdXz4LJJVSSrNkJC
 isolate/connections/grpc/definitions/__init__.py,sha256=Z0453Bbjoq-Oxm2Wfi9fae-BFf8YsZwmuh88strmvxo,459
 isolate/connections/grpc/definitions/agent.proto,sha256=Hx11hHc8PKwhWzyasViLeq7JL33KsRex2-iibfWruTw,568
 isolate/connections/grpc/definitions/agent_pb2.py,sha256=F8KVIE1CK542c7_EJKJ40LY8mPZwEqvdmgBPntAMqE0,1424
-isolate/connections/grpc/definitions/agent_pb2.pyi,sha256=kZsyy2PJX21J6n-hPN_bZPMl8UKNXGTNErdqKkmenes,1589
+isolate/connections/grpc/definitions/agent_pb2.pyi,sha256=IKJHEq01DZRIy4xrtpHalJmM56IQCZRxFEOZEs7hCUw,1744
 isolate/connections/grpc/definitions/agent_pb2_grpc.py,sha256=7tm-RB4CTu_YmqvI7QGRll1Z1NmkMWY2Vm-4AHr57X8,3632
 isolate/connections/grpc/definitions/common.proto,sha256=4W1upvDIPezNj-Ab6FVNa-7cA9_N-2xJMJpwytRhpCw,1260
 isolate/connections/grpc/definitions/common_pb2.py,sha256=lkpvpARZbPDrzrVkKJ-4WZWISN2kzrzJPNBUczmvkHU,2464
-isolate/connections/grpc/definitions/common_pb2.pyi,sha256=R-den8f1m7Lv2EnMXb3do3UjpO0Ncp3zSLtnKdW895c,6082
+isolate/connections/grpc/definitions/common_pb2.pyi,sha256=J3av86ZHoHR28_5zshqCJ0I7v9WCxuQsvOAin-zig9w,6222
 isolate/connections/grpc/definitions/common_pb2_grpc.py,sha256=EvGJ0LYaWTflBesxg0P1nh_EeWKYKqUVRf0_plMISTs,1123
 isolate/connections/ipc/__init__.py,sha256=j2Mbsph2mRhAWmkMyrtPOz0VG-e75h1OOZLwzs6pXUo,131
 isolate/connections/ipc/_base.py,sha256=Jk715XK2ei3yBpFcwUnFZ0owQMMf5jekZFNh2WlKRT4,8009
@@ -42,20 +42,20 @@ 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=9abptODXQIdswNBQqEYY3yRGz6Jr4NFVs15FiftfRdw,20125
+isolate/server/server.py,sha256=THjWTLFxy9Y9atlHtenjtN7ltSGOLAVUAj9lDzl0qUw,21197
 isolate/server/definitions/__init__.py,sha256=f_Q3pdjMuZrjgNlbM60btFKiB1Vg8cnVyKEbp0RmU0A,572
-isolate/server/definitions/server.proto,sha256=GIou0c_RP4sVDxjdYQzUtSptOfJtvbgsU4MGhL9hsMQ,1372
-isolate/server/definitions/server_pb2.py,sha256=SdbigRwRd1pU1yFwvyrA4vkmwQHPelPkQT7dtggKUlk,3194
-isolate/server/definitions/server_pb2.pyi,sha256=kEo781qnfiYpR9ok7CDdn4kaqdkEgB_66wT4qLMk3M4,5594
-isolate/server/definitions/server_pb2_grpc.py,sha256=lSGH6BeQf9cbdESlteNfMlDkFXIFjeVR7PVo-b0k3HM,8455
+isolate/server/definitions/server.proto,sha256=UihlFbYG8fbwm0IUfKDRH1vNkopzP3C-wplXXcAO1c8,1761
+isolate/server/definitions/server_pb2.py,sha256=TYBJC_z_dNf2J6FgHukY9mDyc3WBt9EPQOVFd_ayQNc,4304
+isolate/server/definitions/server_pb2.pyi,sha256=bGDzwxvYJEq_N7R4mvE86t_GhBfUx8eXRYbrvOzFhqc,8352
+isolate/server/definitions/server_pb2_grpc.py,sha256=TUKXKlT-6oOpZ2zg8EhJ-XFvjKGX90ze4iY0f5R6ZHU,10107
 isolate/server/health/__init__.py,sha256=sy349GRK2YGX9KFKqDxM-jdYtBpMXjZu1QwBkjn0SsM,337
 isolate/server/health/health.proto,sha256=wE2_QD0OQAblKkEBG7sALLXEOj1mOLKG-FbC4tFopWE,455
 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.pyi,sha256=AK-DPCpJzoYhU6DydD856c0Ywx84x6k-Cs4m6HpNv5A,2459
 isolate/server/health/health_pb2_grpc.py,sha256=XgsULrnRBmYIqvKr8eI7bqs6NIea5A0kkqdOOc2JHBY,5303
-isolate-0.13.10.dist-info/LICENSE,sha256=427vuyirL5scgBLqA9UWcdnxKrtSGc0u_JfUupk6lAA,11359
-isolate-0.13.10.dist-info/METADATA,sha256=EbD9rw4Ys3Z9DcN0pI5ak-aHndo9zGuqOgAjypuK-uw,3192
-isolate-0.13.10.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-isolate-0.13.10.dist-info/entry_points.txt,sha256=s3prh2EERaVCbL8R45tfY5WFPZ1TsYOsz305YR7s-Pc,360
-isolate-0.13.10.dist-info/top_level.txt,sha256=W9QJBHcq5WXRkbOXf25bvftzFsOZZN4n1DAatdroZrs,8
-isolate-0.13.10.dist-info/RECORD,,
+isolate-0.14.0.dist-info/LICENSE,sha256=427vuyirL5scgBLqA9UWcdnxKrtSGc0u_JfUupk6lAA,11359
+isolate-0.14.0.dist-info/METADATA,sha256=STY6fLw2onLEsBbyyseZBKbWamPsAYrps5b9PvXC_MM,3191
+isolate-0.14.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+isolate-0.14.0.dist-info/entry_points.txt,sha256=s3prh2EERaVCbL8R45tfY5WFPZ1TsYOsz305YR7s-Pc,360
+isolate-0.14.0.dist-info/top_level.txt,sha256=W9QJBHcq5WXRkbOXf25bvftzFsOZZN4n1DAatdroZrs,8
+isolate-0.14.0.dist-info/RECORD,,

{isolate-0.13.10.dist-info → isolate-0.14.0.dist-info}/WHEEL

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