pybiolib 1.2.249__tar.gz → 1.2.257__tar.gz

{pybiolib-1.2.249 → pybiolib-1.2.257}/PKG-INFO

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

{pybiolib-1.2.249 → pybiolib-1.2.257}/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')

{pybiolib-1.2.249 → pybiolib-1.2.257}/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

{pybiolib-1.2.249 → pybiolib-1.2.257}/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.249 → pybiolib-1.2.257}/biolib/biolib_logging.py

@@ -1,6 +1,6 @@
 import logging
-import sys
 import os
+import sys
 
 _DEFAULT_LOGGER_FORMAT = '%(asctime)s | %(levelname)s : %(message)s'
 
@@ -14,7 +14,6 @@ logging.addLevelName(TRACE, 'TRACE')
 
 # note: Logger classes should never be instantiated directly
 class _BioLibLogger(logging.Logger):
-
     def __init__(self, name: str, level=logging.INFO):
         super(_BioLibLogger, self).__init__(name=name, level=level)
 
@@ -44,7 +43,7 @@ class _BioLibLogger(logging.Logger):
 
 def _get_biolib_logger_instance(name: str) -> _BioLibLogger:
     # for thread safety use the global lock of logging
-    logging._acquireLock()  # type: ignore # pylint: disable=protected-access
+    logging._lock.acquire()  # type: ignore # pylint: disable=protected-access
 
     original_logger_class = logging.getLoggerClass()
     try:
@@ -55,7 +54,7 @@ def _get_biolib_logger_instance(name: str) -> _BioLibLogger:
         logging.setLoggerClass(original_logger_class)
         return biolib_logger  # type: ignore
     finally:
-        logging._releaseLock()  # type: ignore # pylint: disable=protected-access
+        logging._lock.release()  # type: ignore # pylint: disable=protected-access
 
 
 def _get_no_user_data_logger() -> _BioLibLogger:

{pybiolib-1.2.249 → pybiolib-1.2.257}/pyproject.toml

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