NGPIris 5.5.0__tar.gz → 5.5.2__tar.gz

{ngpiris-5.5.0 → ngpiris-5.5.2}/NGPIris/hci/hci.py

@@ -14,25 +14,32 @@ from urllib3 import disable_warnings
 from json import load
 
 class HCIHandler:
-    def __init__(self, credentials_path : str, use_ssl : bool = False) -> None:
+    def __init__(self, credentials : str | dict[str, str], use_ssl : bool = False) -> None:
         """
         Class for handling HCI requests.
 
-        :param credentials_path: Path to the JSON credentials file
-        :type credentials_path: str
+        :param credentials_path: If `credentials` is a `str`, then it will be interpreted as a path to the JSON credentials file. If `credentials` is a `dict`, then a dictionary with the appropriate HCI credentials is expected: ```{"username" : "", "password" : "", "address" : "", "auth_port" : "", "api_port" : ""}```
+        :type credentials_path: str | dict[str, str]
 
         :param use_ssl: Boolean choice between using SSL, defaults to False
         :type use_ssl: bool, optional
         """
-        credentials_handler = CredentialsHandler(credentials_path)
-        self.hci = credentials_handler.hci
+        if type(credentials) is str:
+            credentials_handler = CredentialsHandler(credentials)
+            self.hci = credentials_handler.hci
+            
+            self.username = self.hci["username"]
+            self.password = self.hci["password"]
+            self.address = self.hci["address"]
+            self.auth_port = self.hci["auth_port"]
+            self.api_port = self.hci["api_port"]
+        elif type(credentials) is dict:
+            self.username = credentials["username"]
+            self.password = credentials["password"]
+            self.address = credentials["address"]
+            self.auth_port = credentials["auth_port"]
+            self.api_port = credentials["api_port"]
         
-        self.username = self.hci["username"]
-        self.password = self.hci["password"]
-        self.address = self.hci["address"]
-        self.auth_port = self.hci["auth_port"]
-        self.api_port = self.hci["api_port"]
-
         self.token = ""
 
         self.use_ssl = use_ssl

{ngpiris-5.5.0 → ngpiris-5.5.2}/NGPIris/hcp/hcp.py

@@ -55,7 +55,7 @@ class HCPHandler:
         Class for handling HCP requests.
 
         :param credentials: If `credentials` is a `str`, then it will be interpreted as a path to the JSON credentials file. If `credentials` is a `dict`, then a dictionary with the appropriate HCP credentials is expected: ```{"endpoint" : "", "aws_access_key_id" : "", "aws_secret_access_key" : "" }```
-        :type credentials: str | dict
+        :type credentials: str | dict[str, str]
         
         :param use_ssl: Boolean choice between using SSL, defaults to False
         :type use_ssl: bool, optional

{ngpiris-5.5.0 → ngpiris-5.5.2/NGPIris.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.5.0
+Version: 5.5.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==2.5.0
+Requires-Dist: urllib3==2.6.0
 Requires-Dist: boto3==1.35.81
 Requires-Dist: parse>=1.19.1
 Requires-Dist: RapidFuzz>=3.10.1

{ngpiris-5.5.0 → ngpiris-5.5.2}/NGPIris.egg-info/requires.txt

@@ -1,5 +1,5 @@
 requests>=2.31.0
-urllib3==2.5.0
+urllib3==2.6.0
 boto3==1.35.81
 parse>=1.19.1
 RapidFuzz>=3.10.1

{ngpiris-5.5.0/NGPIris.egg-info → ngpiris-5.5.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: NGPIris
-Version: 5.5.0
+Version: 5.5.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==2.5.0
+Requires-Dist: urllib3==2.6.0
 Requires-Dist: boto3==1.35.81
 Requires-Dist: parse>=1.19.1
 Requires-Dist: RapidFuzz>=3.10.1

{ngpiris-5.5.0 → ngpiris-5.5.2}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "NGPIris"
-version = "5.5.0"
+version = "5.5.2"
 readme = "README.md"
 dependencies = [
     "requests >= 2.31.0",
-    "urllib3 == 2.5.0",
+    "urllib3 == 2.6.0",
     "boto3 == 1.35.81",
     "parse >= 1.19.1",
     "RapidFuzz >= 3.10.1",
@@ -41,4 +41,4 @@ filterwarnings = "ignore::urllib3.connectionpool.InsecureRequestWarning"
 
 [project.scripts]
 iris = "NGPIris.cli:cli"
-iris_generate_credentials_file = "NGPIris.cli:iris_generate_credentials_file"
+iris_generate_credentials_file = "NGPIris.cli:iris_generate_credentials_file"