NGPIris 5.2.1.dev1__tar.gz → 5.2.2__tar.gz

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2}/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",
@@ -79,12 +80,16 @@ class HCPHandler:
         }
 
         self.tenant = None
-        for endpoint_format_string in ["https://{}.ngp-fs1000.vgregion.se", "https://{}.ngp-fs2000.vgregion.se", "https://{}.ngp-fs3000.vgregion.se", "https://{}.vgregion.sjunet.org"]:
+        for endpoint_format_string in ["https://{}.ngp-fs1000.vgregion.se", "https://{}.ngp-fs2000.vgregion.se", "https://{}.ngp-fs3000.vgregion.se", "https://{}.hcp1.vgregion.se", "https://{}.vgregion.sjunet.org"]:
             tenant_parse = parse(endpoint_format_string, self.endpoint) 
             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"]
@@ -143,7 +148,7 @@ class HCPHandler:
         else:
             self.transfer_config = TransferConfig(
                 multipart_threshold = 10 * _MB,
-                max_concurrency = 60,
+                max_concurrency = 30,
                 multipart_chunksize = 40 * _MB,
                 use_threads = True
             )
@@ -279,6 +284,11 @@ class HCPHandler:
 
         pages_filtered = pages.search(filter_string)
         for object in pages_filtered:
+            # If there are no objects in the bucket, then `object` will be None,
+            # which means that we should break out of the for loop
+            if not object:
+                break
+
             # Split the object key by "/"
             split_object = object["Key"].split("/")
             # Check if the object is within the specified path_key depth

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: NGPIris
-Version: 5.2.1.dev1
+Version: 5.2.2
 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.2/NGPIris.egg-info/SOURCES.txt

@@ -0,0 +1,52 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+NGPIris/__init__.py
+NGPIris.egg-info/PKG-INFO
+NGPIris.egg-info/SOURCES.txt
+NGPIris.egg-info/dependency_links.txt
+NGPIris.egg-info/entry_points.txt
+NGPIris.egg-info/requires.txt
+NGPIris.egg-info/top_level.txt
+NGPIris/cli/__init__.py
+NGPIris/hci/__init__.py
+NGPIris/hci/exceptions.py
+NGPIris/hci/hci.py
+NGPIris/hci/helpers.py
+NGPIris/hcp/__init__.py
+NGPIris/hcp/exceptions.py
+NGPIris/hcp/hcp.py
+NGPIris/hcp/helpers.py
+NGPIris/hcp/statistics.py
+NGPIris/parse_credentials/__init__.py
+NGPIris/parse_credentials/parse_credentials.py
+NGPIris/utils/__init__.py
+NGPIris/utils/utils.py
+docs/IRIS_5_changelog.md
+docs/Makefile
+docs/NGPIris.cli.rst
+docs/NGPIris.hci.rst
+docs/NGPIris.hcp.rst
+docs/NGPIris.parse_credentials.rst
+docs/NGPIris.rst
+docs/NGPIris.utils.rst
+docs/Tutorial.md
+docs/conf.py
+docs/index.rst
+docs/make.bat
+docs/modules.rst
+tests/test_hci.py
+tests/test_hcp.py
+tests/test_parse_credentials.py
+tests/data/80MB_test_file
+tests/data/complete_creds_0.json
+tests/data/complete_creds_1.json
+tests/data/complete_creds_2.json
+tests/data/incomplete_creds_0.json
+tests/data/incomplete_creds_1.json
+tests/data/incomplete_creds_2.json
+tests/data/incomplete_creds_3.json
+tests/data/incomplete_creds_4.json
+tests/data/a folder of data/80MB_test_file_0
+tests/data/a folder of data/80MB_test_file_1

{ngpiris-5.2.1.dev1 → ngpiris-5.2.2}/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}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: NGPIris
-Version: 5.2.1.dev1
+Version: 5.2.2
 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}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "NGPIris"
-version = "5.2.1.dev1"
+version = "5.2.2"
 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}/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)

ngpiris-5.2.1.dev1/NGPIris.egg-info/SOURCES.txt

@@ -1,128 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-NGPIris/__init__.py
-NGPIris.egg-info/PKG-INFO
-NGPIris.egg-info/SOURCES.txt
-NGPIris.egg-info/dependency_links.txt
-NGPIris.egg-info/entry_points.txt
-NGPIris.egg-info/requires.txt
-NGPIris.egg-info/top_level.txt
-NGPIris/cli/__init__.py
-NGPIris/hci/__init__.py
-NGPIris/hci/exceptions.py
-NGPIris/hci/hci.py
-NGPIris/hci/helpers.py
-NGPIris/hcp/__init__.py
-NGPIris/hcp/exceptions.py
-NGPIris/hcp/hcp.py
-NGPIris/hcp/helpers.py
-NGPIris/hcp/statistics.py
-NGPIris/parse_credentials/__init__.py
-NGPIris/parse_credentials/parse_credentials.py
-NGPIris/utils/__init__.py
-NGPIris/utils/utils.py
-docs/IRIS_5_changelog.md
-docs/Makefile
-docs/NGPIris.cli.rst
-docs/NGPIris.hci.rst
-docs/NGPIris.hcp.rst
-docs/NGPIris.parse_credentials.rst
-docs/NGPIris.rst
-docs/NGPIris.utils.rst
-docs/Tutorial.md
-docs/conf.py
-docs/index.rst
-docs/make.bat
-docs/modules.rst
-docs/_build/.DS_Store
-docs/_build/doctrees/IRIS_5_changelog.doctree
-docs/_build/doctrees/NGPIris.cli.doctree
-docs/_build/doctrees/NGPIris.doctree
-docs/_build/doctrees/NGPIris.hci.doctree
-docs/_build/doctrees/NGPIris.hcp.doctree
-docs/_build/doctrees/NGPIris.parse_credentials.doctree
-docs/_build/doctrees/NGPIris.utils.doctree
-docs/_build/doctrees/README.doctree
-docs/_build/doctrees/Tutorial.doctree
-docs/_build/doctrees/environment.pickle
-docs/_build/doctrees/index.doctree
-docs/_build/doctrees/modules.doctree
-docs/_build/html/.buildinfo
-docs/_build/html/IRIS_5_changelog.html
-docs/_build/html/NGPIris.cli.html
-docs/_build/html/NGPIris.hci.html
-docs/_build/html/NGPIris.hcp.html
-docs/_build/html/NGPIris.html
-docs/_build/html/NGPIris.parse_credentials.html
-docs/_build/html/NGPIris.utils.html
-docs/_build/html/README.html
-docs/_build/html/Tutorial.html
-docs/_build/html/genindex.html
-docs/_build/html/index.html
-docs/_build/html/modules.html
-docs/_build/html/objects.inv
-docs/_build/html/py-modindex.html
-docs/_build/html/search.html
-docs/_build/html/searchindex.js
-docs/_build/html/_downloads/ee00c4f6f22dc2671c766f728f00006f/credentials_template.json
-docs/_build/html/_modules/index.html
-docs/_build/html/_modules/NGPIris/cli.html
-docs/_build/html/_modules/NGPIris/hci/exceptions.html
-docs/_build/html/_modules/NGPIris/hci/hci.html
-docs/_build/html/_modules/NGPIris/hci/helpers.html
-docs/_build/html/_modules/NGPIris/hcp/exceptions.html
-docs/_build/html/_modules/NGPIris/hcp/hcp.html
-docs/_build/html/_modules/NGPIris/hcp/helpers.html
-docs/_build/html/_modules/NGPIris/hcp/statistics.html
-docs/_build/html/_modules/NGPIris/parse_credentials/parse_credentials.html
-docs/_build/html/_modules/NGPIris/utils/utils.html
-docs/_build/html/_sources/IRIS_5_changelog.md.txt
-docs/_build/html/_sources/NGPIris.cli.rst.txt
-docs/_build/html/_sources/NGPIris.hci.rst.txt
-docs/_build/html/_sources/NGPIris.hcp.rst.txt
-docs/_build/html/_sources/NGPIris.parse_credentials.rst.txt
-docs/_build/html/_sources/NGPIris.rst.txt
-docs/_build/html/_sources/NGPIris.utils.rst.txt
-docs/_build/html/_sources/README.md.txt
-docs/_build/html/_sources/Tutorial.md.txt
-docs/_build/html/_sources/index.rst.txt
-docs/_build/html/_sources/modules.rst.txt
-docs/_build/html/_static/alabaster.css
-docs/_build/html/_static/basic.css
-docs/_build/html/_static/custom.css
-docs/_build/html/_static/debug.css
-docs/_build/html/_static/doctools.js
-docs/_build/html/_static/documentation_options.js
-docs/_build/html/_static/file.png
-docs/_build/html/_static/language_data.js
-docs/_build/html/_static/minus.png
-docs/_build/html/_static/plus.png
-docs/_build/html/_static/pygments.css
-docs/_build/html/_static/searchtools.js
-docs/_build/html/_static/skeleton.css
-docs/_build/html/_static/sphinx_highlight.js
-docs/_build/html/_static/scripts/furo-extensions.js
-docs/_build/html/_static/scripts/furo.js
-docs/_build/html/_static/scripts/furo.js.LICENSE.txt
-docs/_build/html/_static/scripts/furo.js.map
-docs/_build/html/_static/styles/furo-extensions.css
-docs/_build/html/_static/styles/furo-extensions.css.map
-docs/_build/html/_static/styles/furo.css
-docs/_build/html/_static/styles/furo.css.map
-tests/test_hci.py
-tests/test_hcp.py
-tests/test_parse_credentials.py
-tests/data/.DS_Store
-tests/data/80MB_test_file
-tests/data/complete_creds_0.json
-tests/data/complete_creds_1.json
-tests/data/complete_creds_2.json
-tests/data/incomplete_creds_0.json
-tests/data/incomplete_creds_1.json
-tests/data/incomplete_creds_2.json
-tests/data/incomplete_creds_3.json
-tests/data/incomplete_creds_4.json
-tests/data/a folder of data/80MB_test_file_0
-tests/data/a folder of data/80MB_test_file_1

ngpiris-5.2.1.dev1/docs/_build/html/.buildinfo

@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: d9c1d66de873cf4315be327a96406c4d
-tags: 645f666f9bcd5a90fca523b33c5a78b7