pybiolib 1.2.1117__tar.gz → 1.2.1126__tar.gz

{pybiolib-1.2.1117 → pybiolib-1.2.1126}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pybiolib
-Version: 1.2.1117
+Version: 1.2.1126
 Summary: BioLib Python Client
 License: MIT
 Keywords: biolib

{pybiolib-1.2.1117 → pybiolib-1.2.1126}/biolib/compute_node/remote_host_proxy.py

@@ -355,6 +355,26 @@ http {{
             return 404 "Not found";
         }}
     }}
+
+    server {{
+        listen       1080;
+        resolver 127.0.0.11 ipv6=off valid=30s;
+
+        if ($http_biolib_result_uuid != "{self._job_uuid}") {{
+            return 403 "Invalid or missing biolib-result-uuid header";
+        }}
+
+        if ($http_biolib_result_port = "") {{
+            return 400 "Missing biolib-result-port header";
+        }}
+
+        location / {{
+            proxy_pass               http://main:$http_biolib_result_port$request_uri$is_args$args;
+            proxy_set_header         biolib-result-uuid "";
+            proxy_set_header         biolib-result-port "";
+            proxy_pass_request_headers on;
+        }}
+    }}
 }}
 """
         else:

{pybiolib-1.2.1117 → pybiolib-1.2.1126}/biolib/compute_node/webserver/compute_node_results_proxy.py

@@ -1,16 +1,41 @@
 import io
 import tarfile
+import threading
 import time
 
 from docker.models.containers import Container
 
 from biolib.biolib_docker_client import BiolibDockerClient
 from biolib.biolib_errors import BioLibError
-from biolib.biolib_logging import logger_no_user_data
+from biolib.biolib_logging import logger_no_user_data, logger
 from biolib.compute_node.utils import BIOLIB_PROXY_NETWORK_NAME
 from biolib.typing_utils import Optional
 from biolib.compute_node.webserver.proxy_utils import get_biolib_nginx_proxy_image
 
+
+class LogStreamingThread(threading.Thread):
+    def __init__(self, container, container_name: str):
+        super().__init__(daemon=True)
+        self._container = container
+        self._container_name = container_name
+        self._stop_event = threading.Event()
+
+    def run(self) -> None:
+        try:
+            logger_no_user_data.debug(f'Starting log streaming for container "{self._container_name}"')
+            log_stream = self._container.logs(follow=True, stream=True)
+            for log_line in log_stream:
+                if self._stop_event.is_set():
+                    break
+                if log_line:
+                    logger.debug(f'ComputeNodeResultsProxy | {log_line.decode("utf-8").rstrip()}')
+        except Exception as error:
+            logger_no_user_data.debug(f'Log streaming for container "{self._container_name}" ended: {error}')
+
+    def stop(self) -> None:
+        self._stop_event.set()
+
+
 class ComputeNodeResultsProxy:
     _instance: Optional['ComputeNodeResultsProxy'] = None
 
@@ -22,6 +47,7 @@ class ComputeNodeResultsProxy:
         self._docker = BiolibDockerClient().get_docker_client()
         self._tls_pem_certificate_path = tls_pem_certificate_path
         self._tls_pem_key_path = tls_pem_key_path
+        self._log_streaming_thread: Optional[LogStreamingThread] = None
 
     @staticmethod
     def start_proxy(tls_pem_certificate_path: str, tls_pem_key_path: str) -> None:
@@ -81,7 +107,14 @@ class ComputeNodeResultsProxy:
 
         self._container.reload()
 
+        self._log_streaming_thread = LogStreamingThread(self._container, self._name)
+        self._log_streaming_thread.start()
+        logger_no_user_data.debug(f'Started log streaming for container "{self._name}"')
+
     def _terminate(self):
+        if self._log_streaming_thread:
+            self._log_streaming_thread.stop()
+            self._log_streaming_thread = None
         if self._container:
             self._container.remove(force=True)
 
@@ -119,7 +152,7 @@ http {
             }
 
             set $target_host "biolib-app-caller-proxy-$http_biolib_result_uuid";
-            proxy_pass http://$target_host:1080;
+            proxy_pass http://$target_host:1080$request_uri$is_args$args;
             proxy_set_header biolib-result-uuid $http_biolib_result_uuid;
             proxy_set_header biolib-result-port $http_biolib_result_port;
             proxy_pass_request_headers on;

{pybiolib-1.2.1117 → pybiolib-1.2.1126}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybiolib"
-version = "1.2.1117"
+version = "1.2.1126"
 description = "BioLib Python Client"
 readme = "PYPI_README.md"
 license = "MIT"