Environment wrapper for dumping output logs

Signed-off-by: Adam Wierzbicki <awierzbicki@golem.network>

golem/envs/__init__.py

@@ -20,6 +20,7 @@
 CounterUsage = Any
 
 EnvId = str
+RuntimeId = str
 
 
 class RuntimeEventType(Enum):
@@ -161,6 +162,12 @@ class Runtime(ABC):
     """ A runnable object representing some particular computation. Tied to a
         particular Environment that was used to create this object. """
 
+    @abstractmethod
+    def id(self) -> Optional[RuntimeId]:
+        """ Get unique identifier of this Runtime. Might not be available if the
+            Runtime is not yet prepared. """
+        raise NotImplementedError
+
     @abstractmethod
     def prepare(self) -> Deferred:
         """ Prepare the Runtime to be started. Assumes current status is

golem/envs/docker/cpu.py

@@ -34,6 +34,7 @@
     EnvSupportStatus,
     Prerequisites,
     RuntimeBase,
+    RuntimeId,
     RuntimeInput,
     RuntimeOutput,
     RuntimePayload,
@@ -231,6 +232,9 @@ def _update_status_loop(self) -> None:
         self._logger.info("Runtime is no longer running. "
                           "Stopping status update thread.")
 
+    def id(self) -> Optional[RuntimeId]:
+        return self._container_id
+
     def prepare(self) -> Deferred:
         self._change_status(
             from_status=RuntimeStatus.CREATED,

golem/envs/wrappers/__init__.py

@@ -20,6 +20,7 @@
     Runtime,
     RuntimeEventListener,
     RuntimeEventType,
+    RuntimeId,
     RuntimeInput,
     RuntimeOutput,
     RuntimePayload,
@@ -34,6 +35,9 @@ class RuntimeWrapper(Runtime):
     def __init__(self, runtime: Runtime) -> None:
         self._runtime = runtime
 
+    def id(self) -> Optional[RuntimeId]:
+        return self._runtime.id()
+
     def prepare(self) -> Deferred:
         return self._runtime.prepare()
 

tests/golem/envs/localhost.py

@@ -2,6 +2,7 @@
 import logging
 import multiprocessing
 import signal
+import uuid
 from pathlib import Path
 from typing import Optional, Dict, Any, Tuple, List, Awaitable, Callable
 
@@ -24,6 +25,7 @@
     Prerequisites,
     Runtime,
     RuntimeBase,
+    RuntimeId,
     RuntimeInput,
     RuntimeOutput,
     RuntimePayload
@@ -72,6 +74,7 @@ class LocalhostPayload(RuntimePayload):
     command: str
     shared_dir: Path
     prerequisites: LocalhostPrerequisites
+    runtime_id: Optional[RuntimeId]
 
 
 class LocalhostPayloadBuilder(TaskApiPayloadBuilder):
@@ -150,6 +153,8 @@ def __init__(
             payload: LocalhostPayload,
     ) -> None:
         super().__init__(logger)
+        self._id = payload.runtime_id or str(uuid.uuid4())
+
         # From docs: Start a fresh python interpreter process. Unnecessary
         # file descriptors and handles from the parent process will not
         # be inherited.
@@ -161,6 +166,9 @@ def __init__(
         )
         self._shutdown_deferred: Optional[defer.Deferred] = None
 
+    def id(self) -> Optional[RuntimeId]:
+        return self._id
+
     def prepare(self) -> defer.Deferred:
         self._prepared()
         return defer.succeed(None)