pybiolib 1.2.252__py3-none-any.whl → 1.2.257__py3-none-any.whl

biolib/_internal/push_application.py

@@ -219,12 +219,6 @@ def push_application(
     docker_tags = new_app_version_json.get('docker_tags', {})
     if not app_version_to_copy_images_from and docker_tags:
         logger.info('Found docker images to push.')
-
-        # Auth to be sent to proxy
-        # The tokens are sent as "{access_token},{job_id}". We leave job_id blank on push.
-        tokens = f'{BiolibApiClient.get().access_token},'
-        auth_config = {'username': 'biolib', 'password': tokens}
-
         docker_client = BiolibDockerClient.get_docker_client()
 
         for module_name, repo_and_tag in docker_tags.items():
@@ -264,7 +258,11 @@ def push_application(
                     tag=tag,
                     stream=True,
                     decode=True,
-                    auth_config=auth_config,
+                    auth_config={
+                        'username': 'biolib',
+                        # For legacy reasons access token is sent with trailing comma ','
+                        'password': api_client.resource_deploy_key or f'{api_client.access_token},',
+                    },
                 )
 
                 process_docker_status_updates(push_status_updates, action='Pushing')

biolib/api/client.py

@@ -75,16 +75,19 @@ class ApiClient(HttpClient):
         # Only keep header keys with a value
         headers: Dict[str, str] = {key: value for key, value in (opt_headers or {}).items() if value}
 
-        deprecated_api_client = DeprecatedApiClient.get()
-
-        if deprecated_api_client.is_signed_in:
-            deprecated_api_client.refresh_access_token()
-
-        # Adding access_token outside is_signed_in check as job_worker.py currently sets access_token
-        # without setting refresh_token
-        access_token = deprecated_api_client.access_token
-        if access_token and authenticate:
-            headers['Authorization'] = f'Bearer {access_token}'
+        if authenticate:
+            deprecated_api_client = DeprecatedApiClient.get()
+            if deprecated_api_client.is_signed_in:
+                deprecated_api_client.refresh_access_token()
+
+            if deprecated_api_client.resource_deploy_key:
+                headers['Authorization'] = f'Token {deprecated_api_client.resource_deploy_key}'
+            else:
+                # Adding access_token outside is_signed_in check as job_worker.py currently sets access_token
+                # without setting refresh_token
+                access_token = deprecated_api_client.access_token
+                if access_token:
+                    headers['Authorization'] = f'Bearer {access_token}'
 
         headers['client-type'] = 'biolib-python'
         headers['client-version'] = ApiClient._biolib_package_version

biolib/biolib_api_client/api_client.py

@@ -30,13 +30,14 @@ class _ApiClient:
         self.base_url: str = base_url
         self.access_token: Optional[str] = access_token  # TODO: Deprecate passing access_token in constructor
         self.refresh_token: Optional[str] = None
+        self.resource_deploy_key: Optional[str] = None
 
         self._user_state = UserState()
         self._sign_in_attempted: bool = False
 
     @property
     def is_signed_in(self) -> bool:
-        return bool(self.refresh_token)
+        return bool(self.refresh_token or self.resource_deploy_key)
 
     def set_user_tokens(self, user_tokens: UserTokens) -> None:
         with self._user_state as user_state:
@@ -57,8 +58,7 @@ class _ApiClient:
             user_state['refresh_token'] = None
 
     def refresh_access_token(self) -> None:
-        if not self.is_signed_in:
-            # Can't refresh access token if not signed in
+        if not self.is_signed_in or self.resource_deploy_key:
             return
 
         if self.access_token:
@@ -95,7 +95,10 @@ class _ApiClient:
         api_token = os.getenv('BIOLIB_TOKEN', default=None)
 
         if api_token:
-            self.sign_in_with_api_token(api_token)
+            if api_token.startswith('bld_'):
+                self.resource_deploy_key = api_token
+            else:
+                self.sign_in_with_api_token(api_token)
         else:
             with self._user_state as user_state:
                 refresh_token_from_state = user_state['refresh_token']

{pybiolib-1.2.252.dist-info → pybiolib-1.2.257.dist-info}/METADATA

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

{pybiolib-1.2.252.dist-info → pybiolib-1.2.257.dist-info}/RECORD

@@ -15,7 +15,7 @@ biolib/_internal/lfs/__init__.py,sha256=gSWo_xg61UniYgD7yNYxeT4I9uaXBCBSi3_nmZjn
 biolib/_internal/lfs/cache.py,sha256=pQS2np21rdJ6I3DpoOutnzPHpLOZgUIS8TMltUJk_k4,2226
 biolib/_internal/libs/__init__.py,sha256=Jdf4tNPqe_oIIf6zYml6TiqhL_02Vyqwge6IELrAFhw,98
 biolib/_internal/libs/fusepy/__init__.py,sha256=AWDzNFS-XV_5yKb0Qx7kggIhPzq1nj_BZS5y2Nso08k,41944
-biolib/_internal/push_application.py,sha256=eu9TGTDQUkgY42SAjbURycrrbX8hesBCWBEg0H5CdQQ,11948
+biolib/_internal/push_application.py,sha256=LQSawvF8uWOGOu-6sEJulvc6ia4Fo3pfQ2m_jLBqXRs,11946
 biolib/_internal/runtime.py,sha256=BiHl4klUHr36MCpqKaUso4idHeBZfPAahLYRQrabFqA,486
 biolib/_internal/types/__init__.py,sha256=xLgOQJFh3GRtiqIJq7MaqHReZx4pp34_zcaFQ_JjuJ4,198
 biolib/_internal/types/app.py,sha256=Mz2QGD_jESX-K9JYnLWPo4YA__Q_1FQQTk9pvidCohU,118
@@ -29,12 +29,12 @@ biolib/_internal/utils/__init__.py,sha256=p5vsIFyu-zYqBgdSMfwW9NC_jk7rXvvCbV4Bzd
 biolib/_internal/utils/multinode.py,sha256=zWrQhcVK5u_xdWX2oIM-D_2fINqNPlqF_h71fu4K8LY,8279
 biolib/_runtime/runtime.py,sha256=bZQ0m39R9jOBVAtlyvzDnOobKueOAQUCwMUZjDQnO7E,4439
 biolib/api/__init__.py,sha256=mQ4u8FijqyLzjYMezMUUbbBGNB3iFmkNdjXnWPZ7Jlw,138
-biolib/api/client.py,sha256=FRpdH5aI187b_I_4HUNi680v4iOP65z5f2RcUo8D8MA,3559
+biolib/api/client.py,sha256=_kmwaGI_-u7kOeWVCYmo-pD2K1imwEv9n2gNZRb5F-I,3790
 biolib/app/__init__.py,sha256=cdPtcfb_U-bxb9iSL4fCEq2rpD9OjkyY4W-Zw60B0LI,37
 biolib/app/app.py,sha256=mJafDLtnoX66egHF94NrUhmhzjpFzvRj2STh0RVGJCY,8862
 biolib/app/search_apps.py,sha256=K4a41f5XIWth2BWI7OffASgIsD0ko8elCax8YL2igaY,1470
 biolib/biolib_api_client/__init__.py,sha256=E5EMa19wJoblwSdQPYrxc_BtIeRsAuO0L_jQweWw-Yk,182
-biolib/biolib_api_client/api_client.py,sha256=ciNx4ybpyKG5LEf4KQdGEz13r0jTxImyQat4_HDecD0,7373
+biolib/biolib_api_client/api_client.py,sha256=ohvbWbpresxLHFGPkvXACfmiTYsBk8RBx5XsBbLYg_M,7546
 biolib/biolib_api_client/app_types.py,sha256=1sXz9XnLRKNALMglNdTbew7AL6OkcUan0MPdj4xQLis,2456
 biolib/biolib_api_client/auth.py,sha256=kjm0ZHnH3I8so3su2sZbBxNHYp-ZUdrZ5lwQ0K36RSw,949
 biolib/biolib_api_client/biolib_app_api.py,sha256=RUXrTxk7XKzm4wxv7NBXttuFjT60DI9vNOvkS-cjKNc,5065
@@ -120,8 +120,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.252.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
-pybiolib-1.2.252.dist-info/METADATA,sha256=1JftPlZ5tUpXRs3iDQk5MZwE_F-h3ZeMjIJc8hFcZos,1558
-pybiolib-1.2.252.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pybiolib-1.2.252.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
-pybiolib-1.2.252.dist-info/RECORD,,
+pybiolib-1.2.257.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.2.257.dist-info/METADATA,sha256=nxPz1_DHtgQxfOuCZbBy5GzPPJrqjCyZNPwBOzlTods,1558
+pybiolib-1.2.257.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pybiolib-1.2.257.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.2.257.dist-info/RECORD,,