pilot-platform-common 0.2.6__tar.gz → 0.2.8__tar.gz

{pilot-platform-common-0.2.6/pilot_platform_common.egg-info → pilot-platform-common-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pilot-platform-common
-Version: 0.2.6
+Version: 0.2.8
 Summary: Generates entity ID and connects with Vault (secret engine) to retrieve credentials
 Author: Indoc Research
 Author-email: etaylor@indocresearch.org

pilot-platform-common-0.2.8/common/__init__.py

@@ -0,0 +1,52 @@
+# Copyright (C) 2022 Indoc Research
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from .geid import GEIDClient
+from .jwt_handler import JWTHandler
+from .lineage import LineageClient
+from .logger import LoggerFactory
+from .object_storage_adaptor import NotFoundError
+from .object_storage_adaptor import TokenError
+from .object_storage_adaptor import get_boto3_admin_client
+from .object_storage_adaptor import get_boto3_client
+from .object_storage_adaptor import get_minio_policy_client
+from .permissions import get_project_role
+from .permissions import has_file_permission
+from .permissions import has_permission
+from .project import ProjectClient
+from .project import ProjectClientSync
+from .project import ProjectException
+from .project import ProjectNotFoundException
+from .vault import VaultClient
+
+__all__ = [
+    'GEIDClient',
+    'JWTHandler',
+    'LineageClient',
+    'LoggerFactory',
+    'get_boto3_admin_client',
+    'get_boto3_client',
+    'get_minio_policy_client',
+    'TokenError',
+    'NotFoundError',
+    'get_project_role',
+    'has_file_permission',
+    'has_permission',
+    'ProjectClient',
+    'ProjectClientSync',
+    'ProjectException',
+    'ProjectNotFoundException',
+    'VaultClient',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/geid/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,3 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .geid_client import GEIDClient
+
+__all__ = [
+    'GEIDClient',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/geid/geid_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/jwt_handler/JWTHandler.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/jwt_handler/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,3 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .JWTHandler import JWTHandler
+
+__all__ = [
+    'JWTHandler',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/jwt_handler/jwt_handler_exception.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/lineage/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,3 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .lineage_client import LineageClient
+
+__all__ = [
+    'LineageClient',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/lineage/entity_object.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import copy
-import time
 
 
 class FileDataAttribute:

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/lineage/lineage_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -95,7 +95,7 @@ class LineageClient:
         post_payload = {'entity': entity.json()}
 
         async with httpx.AsyncClient(verify=False) as client:
-            self.logger.info('endpoint: ' + self.atlas_endpoint + '/api/atlas/v2/entity')
+            self.logger.info(f'endpoint: {self.atlas_endpoint}/api/atlas/v2/entity')
             self.logger.info('payload:')
             self.logger.info(post_payload)
 
@@ -129,7 +129,7 @@ class LineageClient:
 
         async with httpx.AsyncClient(verify=False) as client:
             response = await client.delete(
-                self.atlas_endpoint + '/api/atlas/v2/entity/uniqueAttribute/type/{}'.format(entity_type),
+                self.atlas_endpoint + f'/api/atlas/v2/entity/uniqueAttribute/type/{entity_type}',
                 params={'attr:item_id': _id},
                 auth=(self.username, self.password),
                 timeout=60,
@@ -160,7 +160,7 @@ class LineageClient:
 
         async with httpx.AsyncClient(verify=False) as client:
             response = await client.get(
-                self.atlas_endpoint + '/api/atlas/v2/lineage/uniqueAttribute/type/{}'.format(entity_type),
+                self.atlas_endpoint + f'/api/atlas/v2/lineage/uniqueAttribute/type/{entity_type}',
                 params={'attr:item_id': _id, 'depth': 50, 'direction': direction},
                 auth=(self.username, self.password),
                 timeout=60,
@@ -184,7 +184,7 @@ class LineageClient:
             # then loop over each of entity to get the detail attribute
             for atlas_guid in res['guidEntityMap']:
                 response = await client.get(
-                    self.atlas_endpoint + '/api/atlas/v2/entity/guid/{}'.format(atlas_guid),
+                    self.atlas_endpoint + f'/api/atlas/v2/entity/guid/{atlas_guid}',
                     auth=(self.username, self.password),
                     timeout=60,
                 )
@@ -228,13 +228,7 @@ class LineageClient:
             - dict
         """
 
-        name = '{}:{}:{}:to:{}@{}'.format(
-            project_code,
-            pipeline_name,
-            input_name,
-            output_name,
-            created_time,
-        )
+        name = f'{project_code}:{pipeline_name}:{input_name}:to:{output_name}@{created_time}'
 
         # NOTE: the id is the uuid in metadata service NOT the guid in Atlas
         lineage_attirbute = LineageAttirbute(name, entity_type, input_id, entity_type, output_id, description)
@@ -242,7 +236,7 @@ class LineageClient:
         atlas_post_form_json = {'entities': [lineage.json()]}
 
         async with httpx.AsyncClient(verify=False) as client:
-            self.logger.info('endpoint: ' + self.atlas_endpoint + '/api/atlas/v2/entity')
+            self.logger.info(f'endpoint: {self.atlas_endpoint}/api/atlas/v2/entity')
             self.logger.info('payload:')
             self.logger.info(atlas_post_form_json)
 

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/lineage/lineage_object.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/logger/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,3 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .logger_factory import LoggerFactory
+
+__all__ = [
+    'LoggerFactory',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/logger/formatter.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from functools import lru_cache
 from logging import LogRecord
 from typing import Any
 from typing import Dict
@@ -25,13 +24,18 @@ from pythonjsonlogger import jsonlogger
 class CustomJsonFormatter(jsonlogger.JsonFormatter):
     """Custom formatter to format logging records as json strings."""
 
-    @lru_cache(1)
+    def __init__(self, *args: Any, **kwds: Any) -> None:
+        super().__init__(*args, **kwds)
+
+        self.namespace = None
+
     def get_namespace(self) -> str:
         """Get namespace for current service."""
 
-        namespace = os.environ.get('namespace', 'unknown')
+        if self.namespace is None:
+            self.namespace = os.environ.get('namespace', 'unknown')
 
-        return namespace
+        return self.namespace
 
     def add_fields(self, log_record: Dict[str, Any], record: LogRecord, message_dict: Dict[str, Any]) -> None:
         """Add custom fields into the log record."""

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/logger/logger_factory.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/models/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/models/config_center_policy.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/models/service_id_generator.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/object_storage_adaptor/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,3 +18,11 @@ from .boto3_client import TokenError
 from .boto3_client import get_boto3_client
 from .minio_policy_client import NotFoundError
 from .minio_policy_client import get_minio_policy_client
+
+__all__ = [
+    'get_boto3_admin_client',
+    'get_boto3_client',
+    'get_minio_policy_client',
+    'TokenError',
+    'NotFoundError',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/object_storage_adaptor/base_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +13,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 from logging import DEBUG
 from logging import ERROR
 

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/object_storage_adaptor/boto3_admin_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/object_storage_adaptor/boto3_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -149,9 +149,9 @@ class Boto3Client(BaseClient):
                 )
 
                 if result.status_code == 400:
-                    raise TokenError('Get temp token with %s error: %s' % (result.status_code, result.text))
+                    raise TokenError(f'Get temp token with {result.status_code} error: {result.text}')
                 elif result.status_code != 200:
-                    raise Exception('Get temp token with %s error: %s' % (result.status_code, result.text))
+                    raise Exception(f'Get temp token with {result.status_code} error: {result.text}')
 
         except Exception as e:
             error_msg = str(e)
@@ -368,7 +368,7 @@ class Boto3Client(BaseClient):
             res = await client.put(presigned_url, data=content, timeout=60)
 
             if res.status_code != 200:
-                error_msg = 'Fail to upload the chunck %s: %s' % (part_number, str(res.text))
+                error_msg = f'Fail to upload the chunk {part_number}: {str(res.text)}'
                 self.logger.error(error_msg)
                 raise Exception(error_msg)
 

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/object_storage_adaptor/minio_policy_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -141,7 +141,7 @@ class MinioPolicyClient(Minio):
             )
 
         if response.status_code == 404:
-            error_msg = 'Policy %s does not exist' % policy_name
+            error_msg = f'Policy {policy_name} does not exist'
             self.logger.error(error_msg)
             raise NotFoundError(error_msg)
         elif response.status_code != 200:
@@ -189,7 +189,7 @@ class MinioPolicyClient(Minio):
             )
 
         if response.status_code == 404:
-            error_msg = 'Policy %s does not exist' % policy_name
+            error_msg = f'Policy {policy_name} does not exist'
             self.logger.error(error_msg)
             raise NotFoundError(error_msg)
         elif response.status_code != 200:

{pilot-platform-common-0.2.6/common → pilot-platform-common-0.2.8/common/permissions}/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,11 +13,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .geid import *
-from .jwt_handler import *
-from .lineage import *
-from .logger import *
-from .object_storage_adaptor import *
-from .project import *
-from .vault import *
-from .permissions import *
+from .permissions import get_project_role
+from .permissions import has_file_permission
+from .permissions import has_permission
+
+__all__ = [
+    'get_project_role',
+    'has_file_permission',
+    'has_permission',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/permissions/permissions.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -79,10 +79,10 @@ async def has_file_permission(auth_url, file_entity: dict, operation: str, curre
 
     zone = 'greenroom' if file_entity['zone'] == 0 else 'core'
 
-    if not file_entity.get('archived'):
-        path_for_permissions = 'parent_path'
-    else:
+    if file_entity.get('status') == 'ARCHIVED':
         path_for_permissions = 'restore_path'
+    else:
+        path_for_permissions = 'parent_path'
     root_folder = file_entity[path_for_permissions].split('/')[0]
 
     if root_folder != username:

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/project/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,3 +17,10 @@ from .project_client import ProjectClient
 from .project_client import ProjectClientSync
 from .project_exceptions import ProjectException
 from .project_exceptions import ProjectNotFoundException
+
+__all__ = [
+    'ProjectClient',
+    'ProjectClientSync',
+    'ProjectException',
+    'ProjectNotFoundException',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/project/project_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -153,7 +153,7 @@ class ProjectClient(object):
         result['result'] = [self.project_object(item, self) for item in response.json()['result']]
         return result
 
-    async def get(self, id='', code=''):
+    async def get(self, id='', code=''):  # noqa: A002
         await self.connect_redis()
         project_id = ''
         if id:
@@ -182,7 +182,11 @@ class ProjectClient(object):
             logger.error(f"Couldn't connect to redis, skipping cache: {self.redis}")
         return self.project_object(response.json(), self)
 
-    async def create(self, code, name, description, image_url=None, tags=[], system_tags=[], is_discoverable=True):
+    async def create(self, code, name, description, image_url=None, tags=None, system_tags=None, is_discoverable=True):
+        if tags is None:
+            tags = []
+        if system_tags is None:
+            system_tags = []
         data = {
             'code': code,
             'name': name,

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/project/project_exceptions.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/vault/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,3 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from .vault_client import VaultClient
+
+__all__ = [
+    'VaultClient',
+]

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/vault/vault_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/common/vault/vault_exception.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8/pilot_platform_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pilot-platform-common
-Version: 0.2.6
+Version: 0.2.8
 Summary: Generates entity ID and connects with Vault (secret engine) to retrieve credentials
 Author: Indoc Research
 Author-email: etaylor@indocresearch.org

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "common"
-version = "0.2.6"
+version = "0.2.8"
 description = ""
 authors = ["Indoc Research"]
 license = "AGPL-3.0"
@@ -21,7 +21,7 @@ cryptography = "39.0.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "6.2.5"
-pytest-asyncio= "0.18.3"
+pytest-asyncio = "0.18.3"
 testcontainers = "3.4.2"
 coverage = "5.3"
 faker = "9.8.0"

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/setup.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +13,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# read the contents of your README file
 from pathlib import Path
 
 import setuptools
@@ -23,7 +22,7 @@ long_description = (this_directory / 'README.md').read_text()
 
 setuptools.setup(
     name='pilot-platform-common',
-    version='0.2.6',
+    version='0.2.8',
     author='Indoc Research',
     author_email='etaylor@indocresearch.org',
     description='Generates entity ID and connects with Vault (secret engine) to retrieve credentials',

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/__init__.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/conftest.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_formatter.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_geid_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_jwt_handler.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_lineage_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import uuid
-from cgitb import text
 from logging import DEBUG
 from logging import ERROR
 

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_logger_factory.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_permissions.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -178,7 +178,7 @@ class TestFilePermissions:
     @pytest.mark.asyncio
     async def test_has_file_permission_archived(self, httpx_mock):
         file_data = {
-            'archived': True,
+            'status': 'ARCHIVED',
             'restore_path': 'test',
             'zone': 'core',
             'container_code': 'test_project',

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_project_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

{pilot-platform-common-0.2.6 → pilot-platform-common-0.2.8}/tests/test_vault_client.py

@@ -3,7 +3,7 @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
+# License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

pilot-platform-common-0.2.6/common/permissions/__init__.py

@@ -1,16 +0,0 @@
-# Copyright (C) 2022 Indoc Research
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from .permissions import has_permission, has_file_permission, get_project_role