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

biolib/compute_node/webserver/compute_node_results_proxy.py

@@ -1,4 +1,5 @@
 import io
+import os
 import tarfile
 import threading
 import time
@@ -7,10 +8,10 @@ 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, logger
+from biolib.biolib_logging import logger, logger_no_user_data
 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
+from biolib.typing_utils import Optional
 
 
 class LogStreamingThread(threading.Thread):
@@ -28,7 +29,7 @@ class LogStreamingThread(threading.Thread):
                 if self._stop_event.is_set():
                     break
                 if log_line:
-                    logger.debug(f'ComputeNodeResultsProxy | {log_line.decode("utf-8").rstrip()}')
+                    logger.debug(f'ComputeNodeResultsProxy | {log_line.decode("utf-8", errors="replace").rstrip()}')
         except Exception as error:
             logger_no_user_data.debug(f'Log streaming for container "{self._container_name}" ended: {error}')
 
@@ -40,8 +41,8 @@ class ComputeNodeResultsProxy:
     _instance: Optional['ComputeNodeResultsProxy'] = None
 
     def __init__(self, tls_pem_certificate_path: str, tls_pem_key_path: str):
-        assert tls_pem_certificate_path, "tls_pem_certificate_path is required"
-        assert tls_pem_key_path, "tls_pem_key_path is required"
+        assert tls_pem_certificate_path, 'tls_pem_certificate_path is required'
+        assert tls_pem_key_path, 'tls_pem_key_path is required'
         self._name = 'biolib-compute-node-results-proxy'
         self._container: Optional[Container] = None
         self._docker = BiolibDockerClient().get_docker_client()
@@ -51,8 +52,16 @@ class ComputeNodeResultsProxy:
 
     @staticmethod
     def start_proxy(tls_pem_certificate_path: str, tls_pem_key_path: str) -> None:
+        abs_cert_path = os.path.abspath(tls_pem_certificate_path)
+        abs_key_path = os.path.abspath(tls_pem_key_path)
+        assert os.path.exists(abs_cert_path), f'TLS certificate file does not exist: {abs_cert_path}'
+        assert os.path.exists(abs_key_path), f'TLS key file does not exist: {abs_key_path}'
+
         if ComputeNodeResultsProxy._instance is None:
-            ComputeNodeResultsProxy._instance = ComputeNodeResultsProxy(tls_pem_certificate_path, tls_pem_key_path)
+            logger_no_user_data.debug(
+                f'Creating ComputeNodeResultsProxy instance with cert: {abs_cert_path}, key: {abs_key_path}'
+            )
+            ComputeNodeResultsProxy._instance = ComputeNodeResultsProxy(abs_cert_path, abs_key_path)
             ComputeNodeResultsProxy._instance._start()  # pylint: disable=protected-access
 
     @staticmethod
@@ -93,6 +102,7 @@ class ComputeNodeResultsProxy:
         self._write_nginx_config_to_container()
         self._container.start()
 
+        logger_no_user_data.debug(f'Waiting for container "{self._name}" to be ready...')
         proxy_is_ready = False
         for retry_count in range(1, 5):
             time.sleep(0.5 * retry_count)
@@ -102,22 +112,27 @@ class ComputeNodeResultsProxy:
                 break
 
         if not proxy_is_ready:
+            logger_no_user_data.error('ComputeNodeResultsProxy did not start properly.')
             self._terminate()
             raise Exception('ComputeNodeResultsProxy did not start properly')
 
         self._container.reload()
+        logger.debug(f'ComputeNodeResultsProxy container "{self._name}" started with ID: {self._container.id}')
 
         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):
+        logger_no_user_data.debug(f'Terminating ComputeNodeResultsProxy container "{self._name}"')
         if self._log_streaming_thread:
             self._log_streaming_thread.stop()
             self._log_streaming_thread = None
-        if self._container:
-            self._container.remove(force=True)
 
+        logger.debug(f'Docker container removal temporarily disabled for debugging purposes (container "{self._name}")')
+        # TODO: Figure if we need to remove the container or keep it for debugging purposes
+        # if self._container:
+        #     self._container.remove(force=True)
 
     def _write_nginx_config_to_container(self) -> None:
         if not self._container:
@@ -170,4 +185,5 @@ http {
 
         tarfile_bytes = tarfile_in_memory.getvalue()
         tarfile_in_memory.close()
+        logger_no_user_data.debug('Writing NGINX configuration to ComputeNodeResultsProxy container')
         docker.api.put_archive(self._container.id, '/etc/nginx', tarfile_bytes)

biolib/compute_node/webserver/webserver.py

@@ -154,7 +154,7 @@ def start_webserver(
 
         if utils.IS_RUNNING_IN_CLOUD:
             try:
-                logger_no_user_data.debug('Stopping ComputeNodeResultsProxy')
+                logger_no_user_data.debug('Stopping ComputeNodeResultsProxy...')
                 ComputeNodeResultsProxy.stop_proxy()
             except BaseException:
                 logger_no_user_data.exception('Failed to stop ComputeNodeResultsProxy')
@@ -192,7 +192,7 @@ def start_webserver(
 
             if biolib_proxy_network:
                 try:
-                    logger_no_user_data.debug('Starting ComputeNodeResultsProxy')
+                    logger_no_user_data.debug('Starting ComputeNodeResultsProxy...')
                     ComputeNodeResultsProxy.start_proxy(tls_pem_certificate_path, tls_pem_key_path)
                 except BaseException:
                     logger_no_user_data.exception('Failed to start ComputeNodeResultsProxy')

{pybiolib-1.2.1126.dist-info → pybiolib-1.2.1133.dist-info}/METADATA

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

{pybiolib-1.2.1126.dist-info → pybiolib-1.2.1133.dist-info}/RECORD

@@ -131,10 +131,10 @@ biolib/compute_node/socker_listener_thread.py,sha256=T5_UikA3MB9bD5W_dckYLPTgixh
 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=NS-IeM9DJDZ3on7PQuLknlqTWys150fNiX_UOEoDjrE,6966
+biolib/compute_node/webserver/compute_node_results_proxy.py,sha256=6Li4Fm7sgNVYd_kLVChlx5aUvKtYtMa0hHmv7umECJ4,8168
 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
+biolib/compute_node/webserver/webserver.py,sha256=8SUGXJ0tGuUIQ3HKdac-CFFQwDVpKR6JwEINChBt-Qg,9067
 biolib/compute_node/webserver/webserver_types.py,sha256=2t8EaFKESnves3BA_NBdnS2yAdo1qwamCFHiSt888nE,380
 biolib/compute_node/webserver/webserver_utils.py,sha256=XWvwYPbWNR3qS0FYbLLp-MDDfVk0QdaAmg3xPrT0H2s,4234
 biolib/compute_node/webserver/worker_thread.py,sha256=7uD9yQPhePYvP2HCJ27EeZ_h6psfIWFgqm1RHZxzobs,12483
@@ -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.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,,
+pybiolib-1.2.1133.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.2.1133.dist-info/METADATA,sha256=YFJ8gC4dTDUNDh8H8A6Qpf9yerMrthiUH3xjUG01UZA,1571
+pybiolib-1.2.1133.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pybiolib-1.2.1133.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.2.1133.dist-info/RECORD,,