pybiolib 1.1.2226__tar.gz → 1.1.2232__tar.gz

{pybiolib-1.1.2226 → pybiolib-1.1.2232}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybiolib
-Version: 1.1.2226
+Version: 1.1.2232
 Summary: BioLib Python Client
 Home-page: https://github.com/biolib
 License: MIT

{pybiolib-1.1.2226 → pybiolib-1.1.2232}/biolib/compute_node/remote_host_proxy.py

@@ -1,3 +1,4 @@
+import base64
 import io
 import subprocess
 import tarfile
@@ -160,6 +161,9 @@ class RemoteHostProxy:
             access_token = BiolibApiClient.get().access_token
             bearer_token = f'Bearer {access_token}' if access_token else ''
 
+            biolib_index_basic_auth = f'compute_node|admin:{compute_node_auth_token},{self._job_uuid}'
+            biolib_index_basic_auth_base64 = base64.b64encode(biolib_index_basic_auth.encode('utf-8')).decode('utf-8')
+
             nginx_config = f"""
 events {{
   worker_connections  1024;
@@ -315,6 +319,13 @@ http {{
             proxy_ssl_server_name    on;
         }}
 
+        location /proxy/index/ {{
+            proxy_pass               https://$upstream_hostname$request_uri;
+            proxy_set_header         authorization "Basic {biolib_index_basic_auth_base64}";
+            proxy_set_header         cookie "";
+            proxy_ssl_server_name    on;
+        }}
+
         location / {{
             return 404 "Not found";
         }}

{pybiolib-1.1.2226 → pybiolib-1.1.2232}/biolib/compute_node/webserver/worker_thread.py

@@ -221,8 +221,8 @@ class WorkerThread(threading.Thread):
         if self._connection:
             self._connection.close()
 
-        if not utils.IS_RUNNING_IN_CLOUD and self.compute_state['progress'] == 95:
-            seconds_to_sleep = 60  # 1 minute
+        if self.compute_state['progress'] == 95:
+            seconds_to_sleep = 5
             logger_no_user_data.debug(
                 f'Job "{self._job_uuid}" worker thread sleeping for {seconds_to_sleep} seconds before cleaning up'
             )
@@ -231,7 +231,7 @@ class WorkerThread(threading.Thread):
 
         compute_state_dict = webserver_utils.JOB_ID_TO_COMPUTE_STATE_DICT
         if self._job_uuid in compute_state_dict:
-            # Delete result as user has not started download within 60 seconds
+            # Delete result as user has not started download
             if compute_state_dict[self._job_uuid]['progress'] == 95 and os.path.exists(self._job_temporary_dir):
                 shutil.rmtree(self._job_temporary_dir)
 

{pybiolib-1.1.2226 → pybiolib-1.1.2232}/pyproject.toml

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