NGPIris 5.2.1.dev1__tar.gz → 5.2.2.dev1__tar.gz

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/NGPIris/hcp/hcp.py

@@ -67,6 +67,7 @@ class HCPHandler:
         self.hcp = credentials_handler.hcp
         self.endpoint = "https://" + self.hcp["endpoint"]
 
+        # A lookup table for GMC names to HCP tenant names
         gmc_tenant_map = {
             "gmc-joint" : "vgtn0008",
             "gmc-west" : "vgtn0012",
@@ -84,7 +85,11 @@ class HCPHandler:
             if type(tenant_parse) is Result:
                 tenant = str(tenant_parse[0])
                 if endpoint_format_string == "https://{}.vgregion.sjunet.org": # Check if endpoint is Sjunet
-                    self.tenant = gmc_tenant_map[tenant]
+                    mapped_tenant = gmc_tenant_map.get(tenant)
+                    if mapped_tenant:
+                        self.tenant = mapped_tenant
+                    else:
+                        raise RuntimeError("The provided tenant name, \"" + tenant + "\", could is not a valid tenant name. Hint: did you spell it correctly?")
                 else:
                     self.tenant = tenant
                 
@@ -92,7 +97,7 @@ class HCPHandler:
         
 
         if not self.tenant:
-            raise RuntimeError("Unable to parse endpoint. Make sure that you have entered the correct endpoint in your credentials JSON file. Hint: The endpoint should *not* contain \"https://\" or port numbers")
+            raise RuntimeError("Unable to parse endpoint, \"" + self.endpoint + "\". Make sure that you have entered the correct endpoint in your credentials JSON file. Hints:\n - The endpoint should *not* contain \"https://\" or port numbers\n - Is the endpoint spelled correctly?")
         self.base_request_url = self.endpoint + ":9090/mapi/tenants/" + self.tenant
         self.aws_access_key_id = self.hcp["aws_access_key_id"]
         self.aws_secret_access_key = self.hcp["aws_secret_access_key"]

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/NGPIris/hcp/helpers.py

@@ -1,5 +1,5 @@
 
-from os import path as p
+from pathlib import Path
 from typing import Callable, TypeVar, ParamSpec
 
 from NGPIris.hcp.exceptions import NoBucketMounted
@@ -23,7 +23,7 @@ def create_access_control_policy(user_ID_permissions : dict[str, str]) -> dict:
     return access_control_policy
 
 def raise_path_error(path : str):
-    if not p.exists(path):
+    if not Path(path).exists():
         raise FileNotFoundError("\"" + path + "\"" + " does not exist")
 
 # Decorator for checking if a bucket is mounted. This is meant to be used by 

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/NGPIris.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: NGPIris
-Version: 5.2.1.dev1
+Version: 5.2.2.dev1
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.31.0
 Requires-Dist: urllib3==1.26.19
-Requires-Dist: boto3>=1.26.76
+Requires-Dist: boto3==1.35.81
 Requires-Dist: parse>=1.19.1
 Requires-Dist: RapidFuzz>=3.10.1
 Requires-Dist: tqdm>=4.66.2

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/NGPIris.egg-info/requires.txt

@@ -1,6 +1,6 @@
 requests>=2.31.0
 urllib3==1.26.19
-boto3>=1.26.76
+boto3==1.35.81
 parse>=1.19.1
 RapidFuzz>=3.10.1
 tqdm>=4.66.2

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: NGPIris
-Version: 5.2.1.dev1
+Version: 5.2.2.dev1
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.31.0
 Requires-Dist: urllib3==1.26.19
-Requires-Dist: boto3>=1.26.76
+Requires-Dist: boto3==1.35.81
 Requires-Dist: parse>=1.19.1
 Requires-Dist: RapidFuzz>=3.10.1
 Requires-Dist: tqdm>=4.66.2

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "NGPIris"
-version = "5.2.1.dev1"
+version = "5.2.2.dev1"
 readme = "README.md"
 dependencies = [
     "requests >= 2.31.0",
     "urllib3 == 1.26.19",
-    "boto3 >= 1.26.76",
+    "boto3 == 1.35.81",
     "parse >= 1.19.1",
     "RapidFuzz >= 3.10.1",
     "tqdm >= 4.66.2",

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2.dev1}/tests/test_hcp.py

@@ -132,14 +132,23 @@ def test_download_folder(custom_config : CustomConfig) -> None:
     test_mount_bucket(custom_config)
     custom_config.hcp_h.download_folder("a folder of data/", custom_config.result_path) 
 
-def test_search_objects_in_bucket(custom_config : CustomConfig) -> None:
+def test_search_in_bucket(custom_config : CustomConfig) -> None:
     test_mount_bucket(custom_config)
     test_file = Path(custom_config.test_file_path).name 
-    custom_config.hcp_h.search_objects_in_bucket(test_file) 
+    custom_config.hcp_h.search_in_bucket(test_file) 
 
-def test_search_objects_in_bucket_without_mounting(custom_config : CustomConfig) -> None:
+def test_search_in_bucket_without_mounting(custom_config : CustomConfig) -> None:
     _hcp_h = custom_config.hcp_h 
-    _without_mounting(_hcp_h, HCPHandler.search_objects_in_bucket)
+    _without_mounting(_hcp_h, HCPHandler.search_in_bucket)
+
+def test_fuzzy_search_in_bucket(custom_config : CustomConfig) -> None:
+    test_mount_bucket(custom_config)
+    test_file = Path(custom_config.test_file_path).name 
+    custom_config.hcp_h.fuzzy_search_in_bucket(test_file) 
+
+def test_fuzzy_search_in_bucket_without_mounting(custom_config : CustomConfig) -> None:
+    _hcp_h = custom_config.hcp_h 
+    _without_mounting(_hcp_h, HCPHandler.fuzzy_search_in_bucket)
 
 def test_get_object_acl(custom_config : CustomConfig) -> None:
     test_mount_bucket(custom_config)