pybiolib 1.1.1990__py3-none-any.whl → 1.1.1998__py3-none-any.whl

biolib/_internal/data_record/remote_storage_endpoint.py

@@ -1,23 +1,34 @@
+import os
 from datetime import datetime, timedelta
+from urllib.parse import urlparse
 
 from biolib.api import client as api_client
 from biolib.biolib_api_client.lfs_types import LargeFileSystemVersion
 from biolib.biolib_binary_format.utils import RemoteEndpoint
 from biolib.biolib_logging import logger
+from biolib.typing_utils import Optional
 
 
 class DataRecordRemoteStorageEndpoint(RemoteEndpoint):
     def __init__(self, resource_version_uuid: str):
         self._resource_version_uuid: str = resource_version_uuid
-        self._expires_at = None
-        self._presigned_url = None
+        self._expires_at: Optional[datetime] = None
+        self._presigned_url: Optional[str] = None
 
-    def get_remote_url(self):
-        if not self._presigned_url or datetime.utcnow() > self._expires_at:
+    def get_remote_url(self) -> str:
+        if not self._presigned_url or not self._expires_at or datetime.utcnow() > self._expires_at:
             lfs_version: LargeFileSystemVersion = api_client.get(
                 path=f'/lfs/versions/{self._resource_version_uuid}/',
             ).json()
-            self._presigned_url = lfs_version['presigned_download_url']
+
+            app_caller_proxy_job_storage_base_url = os.getenv('BIOLIB_CLOUD_JOB_STORAGE_BASE_URL', '')
+            if app_caller_proxy_job_storage_base_url:
+                # Done to hit App Caller Proxy when downloading from inside an app
+                parsed_url = urlparse(lfs_version['presigned_download_url'])
+                self._presigned_url = f'{app_caller_proxy_job_storage_base_url}{parsed_url.path}?{parsed_url.query}'
+            else:
+                self._presigned_url = lfs_version['presigned_download_url']
+
             self._expires_at = datetime.utcnow() + timedelta(minutes=8)
             logger.debug(
                 f'DataRecord "{self._resource_version_uuid}" fetched presigned URL '

biolib/compute_node/remote_host_proxy.py

@@ -304,6 +304,13 @@ http {{
             proxy_ssl_server_name    on;
         }}
 
+        location /api/app/ {{
+            proxy_pass               {base_url}/api/app/;
+            proxy_set_header         authorization {'$bearer_token_on_get' if self._can_access_all_data_records_of_user else '""'};
+            proxy_set_header         cookie "";
+            proxy_ssl_server_name    on;
+        }}
+
         location /api/ {{
             proxy_pass               {base_url}/api/;
             proxy_set_header         authorization "";

{pybiolib-1.1.1990.dist-info → pybiolib-1.1.1998.dist-info}/METADATA

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

{pybiolib-1.1.1990.dist-info → pybiolib-1.1.1998.dist-info}/RECORD

@@ -4,7 +4,7 @@ biolib/__init__.py,sha256=nfZvVkrHZLvjvvlAvFzhvem9NMfqgmw8NWaCH9HGzew,4045
 biolib/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biolib/_internal/data_record/__init__.py,sha256=1Bk303i3rFet9veS56fIsrBYtT5X3n9vcsYMA6T6c5o,36
 biolib/_internal/data_record/data_record.py,sha256=ctijrrZ-LfUxtwzS8PEVa1VBuBLVWEhmo2yHcEDkC0A,7178
-biolib/_internal/data_record/remote_storage_endpoint.py,sha256=LPq8Lr5FhKF9_o5K-bUdT7TeLe5XFUD0AAeTkNEVZug,1133
+biolib/_internal/data_record/remote_storage_endpoint.py,sha256=hILu0TmFx-ZyDYbWPC4QEPogP0RRVEqwgJc8OEHYp50,1742
 biolib/_internal/fuse_mount/__init__.py,sha256=B_tM6RM2dBw-vbpoHJC4X3tOAaN1H2RDvqYJOw3xFwg,55
 biolib/_internal/fuse_mount/experiment_fuse_mount.py,sha256=08aUdEq_bvqLBft_gSLjOClKDy5sBnMts1RfJf7AP_U,7012
 biolib/_internal/http_client.py,sha256=DdooXei93JKGYGV4aQmzue_oFzvHkozg2UCxgk9dfDM,5081
@@ -75,7 +75,7 @@ biolib/compute_node/job_worker/large_file_system.py,sha256=XXqRlVtYhs-Ji9zQGIk5K
 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=1YE1GcZswEfi7X4oLMHAqm5iyTpgaXfNoP2o4IfapE4,16031
+biolib/compute_node/remote_host_proxy.py,sha256=BYmdw6LmyS0YouKsgAsoROX3__rVPantcJu1luIsm2Q,16352
 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=M7i_WTyxbFM3Lri9RWZ_8FeQNYrQIWpKGLfp2I55oeY,4677
@@ -109,8 +109,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=jC5WhH63FTD7SLFJbxQGA2hOt9NTwq9zHl_BEec1Z0c,4907
 biolib/utils/zip/remote_zip.py,sha256=0wErYlxir5921agfFeV1xVjf29l9VNgGQvNlWOlj2Yc,23232
-pybiolib-1.1.1990.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
-pybiolib-1.1.1990.dist-info/METADATA,sha256=caKeGITxdxV7LaEVBD3KdmF13EmtBZBBkbG3fZN2KDs,1508
-pybiolib-1.1.1990.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pybiolib-1.1.1990.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
-pybiolib-1.1.1990.dist-info/RECORD,,
+pybiolib-1.1.1998.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.1.1998.dist-info/METADATA,sha256=3V8P0UEv5bTpOlVUAfNJAS7GQPCu2v_l7mu1Xqvr_sc,1508
+pybiolib-1.1.1998.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pybiolib-1.1.1998.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.1.1998.dist-info/RECORD,,