pilot-platform-common 0.7.2__tar.gz → 0.7.4__tar.gz

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/PKG-INFO

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

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/common/permissions/permissions.py

@@ -92,7 +92,7 @@ async def has_file_permission(
     zone = 'greenroom' if file_entity['zone'] == 0 else 'core'
 
     folder_path_split = get_folder_path(file_entity)
-    root_folder = folder_path_split[0]
+    root_folder = folder_path_split[0] if folder_path_split else None
 
     if root_folder == 'shared':
         if len(folder_path_split) == 1:
@@ -137,7 +137,11 @@ def get_folder_path(file_entity: dict[str, str]) -> list[str]:
         path_for_permissions = 'restore_path'
     else:
         path_for_permissions = 'parent_path'
-    return file_entity.get(path_for_permissions, '').split('/')
+    path = file_entity.get(path_for_permissions, '')
+    if path:
+        return path.split('/')
+    else:
+        return []
 
 
 def get_name_or_path(file_entity: dict[str, str], folder_path_split: list[str]) -> str:

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/common/project/project_client.py

@@ -116,6 +116,9 @@ class ProjectClient:
         created_at_start=None,
         created_at_end=None,
         favourite_by=None,
+        guacamole: bool = False,
+        superset: bool = False,
+        jupyterhub: bool = False,
     ):
         data = {
             'page': page,
@@ -131,9 +134,12 @@ class ProjectClient:
             'created_at_start': created_at_start,
             'created_at_end': created_at_end,
             'favourite_by': favourite_by,
+            'guacamole': guacamole,
+            'superset': superset,
+            'jupyterhub': jupyterhub,
         }
         # remove blank items
-        data = {k: v for k, v in data.items() if v is not None}
+        data = {k: v for k, v in data.items() if v not in [None, False]}
 
         async with httpx.AsyncClient() as client:
             response = await client.get(self.base_url + '/v1/projects/', params=data)

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/pilot_platform_common.egg-info/PKG-INFO

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

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "common"
-version = "0.7.2"
+version = "0.7.4"
 description = ""
 authors = ["Indoc Systems"]
 

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/setup.py

@@ -11,7 +11,7 @@ long_description = (this_directory / 'README.md').read_text()
 
 setuptools.setup(
     name='pilot-platform-common',
-    version='0.7.2',
+    version='0.7.4',
     author='Indoc Systems',
     author_email='etaylor@indocresearch.org',
     description='Generates entity ID and connects with Vault (secret engine) to retrieve credentials',

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/tests/permissions/test_permissions.py

@@ -379,6 +379,8 @@ class TestFilePermissions:
             'zone': 'core',
             'container_code': 'test_project',
             'container_type': 'project',
+            'parent_path': None,
+            'parent': None,
         }
         current_identity = {
             'username': 'test',
@@ -396,6 +398,8 @@ class TestFilePermissions:
             'zone': 'core',
             'container_code': 'test_project',
             'container_type': 'project',
+            'parent_path': None,
+            'parent': None,
         }
         current_identity = {
             'username': 'test',

{pilot-platform-common-0.7.2 → pilot-platform-common-0.7.4}/tests/test_project_client.py

@@ -157,3 +157,22 @@ def test_project_search_200(redis, httpx_mock):
     )
     assert result['result'][0].name == PROJECT_DATA['name']
     assert result['total'] == 1
+
+
+def test_project_search_200_with_workbench_filters(redis, httpx_mock):
+    result = {
+        'result': [PROJECT_DATA],
+        'total': 1,
+    }
+    url = PROJECT_URL + ('/v1/projects/?guacamole=true&superset=true&jupyterhub=true')
+    httpx_mock.add_response(
+        method='GET',
+        url=url,
+        json=result,
+        status_code=200,
+    )
+
+    project_client = ProjectClient(PROJECT_URL, redis.url, enable_cache=False)
+    result = project_client.search(guacamole=True, superset=True, jupyterhub=True)
+    assert result['result'][0].name == PROJECT_DATA['name']
+    assert result['total'] == 1