pybiolib 1.2.1117__py3-none-any.whl → 1.2.1126__py3-none-any.whl

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:

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.dist-info → pybiolib-1.2.1126.dist-info}/METADATA

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

@@ -126,12 +126,12 @@ biolib/compute_node/job_worker/large_file_system.py,sha256=Xe_LILVfTD9LXb-0HwLqG
 biolib/compute_node/job_worker/mappings.py,sha256=Z48Kg4nbcOvsT2-9o3RRikBkqflgO4XeaWxTGz-CNvI,2499
 biolib/compute_node/job_worker/utilization_reporter_thread.py,sha256=7tm5Yk9coqJ9VbEdnO86tSXI0iM0omwIyKENxdxiVXk,8575
 biolib/compute_node/job_worker/utils.py,sha256=wgxcIA8yAhUPdCwyvuuJ0JmreyWmmUoBO33vWtG60xg,1282
-biolib/compute_node/remote_host_proxy.py,sha256=W0zzPtiHAOofCslkn9cnjFY1VKEbMSdrer87j23Zv_8,16295
+biolib/compute_node/remote_host_proxy.py,sha256=wNIRznw7_OFI8QHejlXYoWqac4n0IKCwZjQ1aa8i_5I,16953
 biolib/compute_node/socker_listener_thread.py,sha256=T5_UikA3MB9bD5W_dckYLPTgixh72vKUlgbBvj9dbM0,1601
 biolib/compute_node/socket_sender_thread.py,sha256=YgamPHeUm2GjMFGx8qk-99WlZhEs-kAb3q_2O6qByig,971
 biolib/compute_node/utils.py,sha256=fvdbetPKMdfHkPqNZRw6eln_i13myu-n8tuceTUcfPU,4913
 biolib/compute_node/webserver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-biolib/compute_node/webserver/compute_node_results_proxy.py,sha256=sP_ZzjJjAusrHzCQC3qu3ItGY3YZzPinaFOHbattDjs,5565
+biolib/compute_node/webserver/compute_node_results_proxy.py,sha256=NS-IeM9DJDZ3on7PQuLknlqTWys150fNiX_UOEoDjrE,6966
 biolib/compute_node/webserver/gunicorn_flask_application.py,sha256=jPfR_YvNBekLUXWo_vHFV-FIwlb8s8tacKmGHvh93qc,914
 biolib/compute_node/webserver/proxy_utils.py,sha256=JNt1oqPuR5n63E5NC1l8AZN51NLuMw4lqVkocZnq72o,1164
 biolib/compute_node/webserver/webserver.py,sha256=XOLYIJcrs_MU3uvct7SGPn8cYDi8ugA_wkDo6JeOQDU,9061
@@ -157,8 +157,8 @@ biolib/utils/cache_state.py,sha256=u256F37QSRIVwqKlbnCyzAX4EMI-kl6Dwu6qwj-Qmag,3
 biolib/utils/multipart_uploader.py,sha256=XvGP1I8tQuKhAH-QugPRoEsCi9qvbRk-DVBs5PNwwJo,8452
 biolib/utils/seq_util.py,sha256=Ozk0blGtPur_D9MwShD02r_mphyQmgZkx-lOHOwnlIM,6730
 biolib/utils/zip/remote_zip.py,sha256=0wErYlxir5921agfFeV1xVjf29l9VNgGQvNlWOlj2Yc,23232
-pybiolib-1.2.1117.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
-pybiolib-1.2.1117.dist-info/METADATA,sha256=SfoHQrH4vo-GUXZYGyZdjFpwou9KjMBwUH7bIVwA7sM,1571
-pybiolib-1.2.1117.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pybiolib-1.2.1117.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
-pybiolib-1.2.1117.dist-info/RECORD,,
+pybiolib-1.2.1126.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.2.1126.dist-info/METADATA,sha256=gF-zLDskizcBdYx8S0dqfzB9Q-24tRvIzGicdAFjXsc,1571
+pybiolib-1.2.1126.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pybiolib-1.2.1126.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.2.1126.dist-info/RECORD,,