aplos-nca-saas-sdk 0.0.11__py3-none-any.whl → 0.0.12__py3-none-any.whl

aplos_nca_saas_sdk/utilities/commandline_args.py

@@ -36,18 +36,11 @@ class CommandlineArgs:
         )
 
         self.parser.add_argument("-a", "--api-url", required=False, help="The api url")
-        self.parser.add_argument(
-            "-i", "--client-id", required=False, help="The client id to cognito"
-        )
 
         self.parser.add_argument(
             "-v", "--verbose", required=False, help="Detailed logging information"
         )
 
-        self.parser.add_argument(
-            "-r", "--region", required=False, help="AWS Region. For Cognito Login"
-        )
-
         self.parser.add_argument(
             "-s",
             "--skip",
@@ -69,12 +62,12 @@ class CommandlineArgs:
             help="The full path to an environment file (.env file).",
         )
 
+        # auth information
         self.username: str | None = None
         self.password: str | None = None
         self.api_domain: str | None = None
-        self.cognito_client_id: str | None = None
-        self.aws_region: str | None = None
 
+        # excuction setup
         self.config_file: str | None = None
         self.config_file_default: str | None = None
         self.analysis_file: str | None = None
@@ -103,8 +96,7 @@ class CommandlineArgs:
         # anything with a dash (in the args) is accessed with an underscore
         self.analysis_file = args.analyis_file
         self.api_domain = args.api_domain
-        self.cognito_client_id = args.client_id
-        self.aws_region = args.region
+
         self.metadata_file = args.metadata_file
         self.skip = args.skip
         self.output_directory = args.output_directory
@@ -128,25 +120,13 @@ class CommandlineArgs:
                 self.password = self.prompt_for_input(
                     "password", env.password, is_sensitive=True
                 )
-        if not self.aws_region:
-            if self.skip and env.aws_region:
-                self.aws_region = env.aws_region
-            else:
-                self.aws_region = self.prompt_for_input("AWS Region", env.aws_region)
+
         if not self.api_domain:
             if self.skip and env.api_domain:
                 self.api_domain = env.api_domain
             else:
                 self.api_domain = self.prompt_for_input("Api Domain", env.api_domain)
 
-        if not self.cognito_client_id:
-            if self.skip and env.client_id:
-                self.cognito_client_id = env.client_id
-            else:
-                self.cognito_client_id = self.prompt_for_input(
-                    "Cognito Client Id", env.client_id
-                )
-
         if not self.analysis_file:
             if self.skip and self.analysis_file_default or env.analysis_file:
                 self.analysis_file = self.analysis_file_default or env.analysis_file
@@ -196,8 +176,6 @@ class CommandlineArgs:
         required_fields = [
             self.username,
             self.password,
-            self.aws_region,
-            self.cognito_client_id,
             self.analysis_file,
             self.config_file,
             self.api_domain,
@@ -314,9 +292,9 @@ def main():
         pwd = "************" if args.password else "empty"
         print(f"username = {args.username}")
         print(f"password = {pwd}")
-        print(f"aws_region = {args.aws_region}")
+
         print(f"api_domain = {args.api_domain}")
-        print(f"cognito_client_id = {args.cognito_client_id}")
+
         print(f"config_file = {args.config_file}")
         print(f"metadata_file = {args.metadata_file}")
         print(f"analysis_file = {args.analysis_file}")

aplos_nca_saas_sdk/utilities/environment_vars.py

@@ -21,3 +21,10 @@ class EnvironmentVars:
             self.api_domain = self.api_domain.replace("https://", "")
 
         self.aplos_api_url = f"https://{self.api_domain}"
+
+    @staticmethod
+    def is_running_in_aws_lambda():
+        """
+        A quick way to check if we are running in an AWS Lambda Environment
+        """
+        return "AWS_LAMBDA_FUNCTION_NAME" in os.environ

aplos_nca_saas_sdk/utilities/file_utility.py

@@ -0,0 +1,33 @@
+"""
+Copyright 2024 Aplos Analytics
+All Rights Reserved.   www.aplosanalytics.com   LICENSED MATERIALS
+Property of Aplos Analytics, Utah, USA
+"""
+
+import os
+
+
+from aplos_nca_saas_sdk.utilities.environment_services import EnvironmentServices
+
+
+class FileUtility:
+    """General File Utilities"""
+
+    @staticmethod
+    def load_filepath(file_path: str) -> str:
+        """Load the file_path"""
+        if not file_path:
+            raise RuntimeError("file_path is required")
+        elif file_path.startswith("${module}"):
+            # find the path
+            es: EnvironmentServices = EnvironmentServices()
+            root = es.find_module_path()
+            if not root:
+                raise RuntimeError(
+                    "Unable to find the module path.  Please use the ${module} syntax to define the file path"
+                )
+            file_path = file_path.replace("${module}", root)
+
+        # get the correct os path separator
+        file_path = os.path.normpath(file_path)
+        return file_path

aplos_nca_saas_sdk/utilities/http_utility.py

@@ -1,3 +1,12 @@
+"""
+Copyright 2024 Aplos Analytics
+All Rights Reserved.   www.aplosanalytics.com   LICENSED MATERIALS
+Property of Aplos Analytics, Utah, USA
+"""
+
+from typing import Optional
+
+
 class Routes:
     """NCA Saas Routes"""
 
@@ -9,13 +18,20 @@ class HttpUtilities:
     """Http Utilties"""
 
     @staticmethod
-    def build_url(domain_name: str) -> str:
+    def build_url(
+        domain_name: str, tenant_id: Optional[str] = None, user_id: Optional[str] = None
+    ) -> str:
         """Build the url"""
-        domain_name = domain_name.strip()
-        if domain_name.startswith("http"):
-            return domain_name
-        else:
-            return f"https://{domain_name}"
+        url = domain_name.strip()
+        if not domain_name.startswith("http"):
+            url = f"https://{domain_name}"
+
+        if tenant_id:
+            url = f"{url}/tenants/{tenant_id}"
+            if user_id:
+                url = f"{url}/users/{user_id}"
+
+        return url
 
     @staticmethod
     def get_headers(jwt: str) -> dict:

aplos_nca_saas_sdk/version.py

@@ -1,4 +1,4 @@
 # Aplos NCA SaaS SDK Version File
 # This is automatically generated during the build process. 
 # DO NOT UPDATE IT DIRECTLY. IT WILL BE OVERWRITTEN. 
-__version__ = '0.0.11'
+__version__ = '0.0.12'

{aplos_nca_saas_sdk-0.0.11.dist-info → aplos_nca_saas_sdk-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aplos_nca_saas_sdk
-Version: 0.0.11
+Version: 0.0.12
 Summary: Aplos NCA SaaS SDK
 Project-URL: Homepage, https://aplosanalytics.com/
 Project-URL: Documentation, https://docs.aplosanalytics.com/

{aplos_nca_saas_sdk-0.0.11.dist-info → aplos_nca_saas_sdk-0.0.12.dist-info}/RECORD

@@ -1,23 +1,25 @@
 aplos_nca_saas_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aplos_nca_saas_sdk/version.py,sha256=LFRDGTgR7bT3F8MO6qouK3Rx8voAo9u7FIZ1tVqlWkY,172
-aplos_nca_saas_sdk/aws_resources/aws_cognito.py,sha256=pxyEdIoeeT7of_hjxYlplOnyLQpo3I-dnc5mHeGP47c,6427
+aplos_nca_saas_sdk/version.py,sha256=QS4DGcLLszsg6Z09amX7jk4z-YffH_BMp_53BNMfeCw,172
+aplos_nca_saas_sdk/aws_resources/aws_cognito.py,sha256=zCfgruORpJnoP6DlF_XW_IfyUfiwPYoWf581aIZi3NM,6584
 aplos_nca_saas_sdk/aws_resources/aws_s3_presigned_payload.py,sha256=rbTaeUgPpRsw1KV0YjnmkD5sQvlYet9XBj6Ie7nXz5Y,1987
 aplos_nca_saas_sdk/aws_resources/aws_s3_presigned_upload.py,sha256=ZCAPNtXMXE2-mA9iWJ1xe_DVgeZGv8r0iCLDnJKNmA8,4290
 aplos_nca_saas_sdk/files/analysis_files/single_ev/configuration_single_ev.json,sha256=lLnRV0jwzaSn32D8NlOekOF5oGFfUwugUlvlwoKz540,986
 aplos_nca_saas_sdk/files/analysis_files/single_ev/meta_data.json,sha256=p1KYOAe5Cl3rjtfF1t96oRG-QtFJJCo9otReRPNtvIk,447
 aplos_nca_saas_sdk/files/analysis_files/single_ev/single_ev.csv,sha256=qFSAlgLOmERsabMmp1X6PAZa-8yFthZlHacM_f7_AOY,6528
-aplos_nca_saas_sdk/integration_testing/integration_test_base.py,sha256=DZxTADqxA6VDIdnbddyxku_OAzWBZaeEJobJ-9yZ0Wc,2609
-aplos_nca_saas_sdk/integration_testing/integration_test_configurations.py,sha256=EW3fgRqYVAygskvu68szjRuqW2yRkUxIEWko2QHoSSE,1303
+aplos_nca_saas_sdk/integration_testing/integration_test_base.py,sha256=xmxpsUwue_UC7ETr219Oaj24gZKpD6NoPRfg9DeKvk0,2793
+aplos_nca_saas_sdk/integration_testing/integration_test_configurations.py,sha256=oN9-ne8vtwLprHUqfuWOJ2uKyjvsAHhmdVD7zSNGIC8,1618
 aplos_nca_saas_sdk/integration_testing/integration_test_factory.py,sha256=qEI0m-kpLL8XTBgQu8Sr-GJ6agRormZ6bhYtQzxaUt4,2198
 aplos_nca_saas_sdk/integration_testing/integration_test_response.py,sha256=T5cLdrhN9Dncu3SFZ3JpUnpQGGJ_VpvTO3uEz0KjfY0,814
 aplos_nca_saas_sdk/integration_testing/integration_test_suite.py,sha256=fztqfDzdHe-XvWgtGaqCyk4FvCKVfKd1cXbo3mru7Ys,4212
-aplos_nca_saas_sdk/integration_testing/main.py,sha256=n2q5NPqM6BwQy-qKHYs4WJV9n3YYZqtg_TTX5JHaV5I,2051
+aplos_nca_saas_sdk/integration_testing/main.py,sha256=8mWJCHp9CSjfDv8qAXdDhK8B2XhPGrIOkZHgHM8ACHE,2054
 aplos_nca_saas_sdk/integration_testing/readme.md,sha256=sX-_gzx17UUF-ZqvCWq0R5zcqgOMC4JjQKnjgxQH9vM,629
 aplos_nca_saas_sdk/integration_testing/configs/_config_base.py,sha256=O48Y1r8JFe2KvSMTY5EttZAz1-hQsU6-Su6CzDUKDmE,347
-aplos_nca_saas_sdk/integration_testing/configs/app_settings.py,sha256=qq04xPowq4-4EY0Cf8zzVqmgUfrHk3RAtHOOcyFifEw,2618
-aplos_nca_saas_sdk/integration_testing/configs/config_sample.json,sha256=uAfW9YN2zREi6wNSKs2JWtHsbg9_Dsy7oYRFi1KgwRY,3118
-aplos_nca_saas_sdk/integration_testing/configs/file_upload.py,sha256=eqKXmrzIpjJRGZTx_Tj_CCYS4iZUAaNNx_HAsdxcerY,3560
-aplos_nca_saas_sdk/integration_testing/configs/login.py,sha256=DGcjH4WuyG0oPxdIJBi3qpymzGaLEJjCoRfbQT0PcK4,3002
+aplos_nca_saas_sdk/integration_testing/configs/app_settings_config.py,sha256=nlBflWWhFbc-FOq7Bpw6cKyULO6VT_Oe1sUq4lKhHWk,2672
+aplos_nca_saas_sdk/integration_testing/configs/config_sample.json,sha256=PryYwS3FoQXii53UuAFTN1-yj-PjwhFEDanmJ20wlVo,3586
+aplos_nca_saas_sdk/integration_testing/configs/file_upload_config.py,sha256=wbApZi1ROwgprIlOvpwtYbQ_YSoGhvBEC2KB4Ddq0Pg,3061
+aplos_nca_saas_sdk/integration_testing/configs/login_config.py,sha256=FBmmpdDgIO2ldhJ6yHf-ioWXiFmfd3s_i4VXR4pm4Ig,3564
+aplos_nca_saas_sdk/integration_testing/configs/nca_execution_config.py,sha256=qMsmcn-nMlPlWFBgpdzfnX_eNigp_sTX6lqR2lZmvyw,5764
+aplos_nca_saas_sdk/integration_testing/files/executions/config1.json,sha256=m6-wSzfrB-7w4CgIGpmT9y0_zevp-Q6So9eXU9HsVpQ,945
 aplos_nca_saas_sdk/integration_testing/files/uploads/input1.csv,sha256=9TGDiMkft7ltFFKk_8RyzuhuloIpe_fZs0Nw0PN3BkM,263
 aplos_nca_saas_sdk/integration_testing/files/uploads/input1.dat,sha256=9TGDiMkft7ltFFKk_8RyzuhuloIpe_fZs0Nw0PN3BkM,263
 aplos_nca_saas_sdk/integration_testing/files/uploads/input1.sas7bdat,sha256=bh4w5QPHwjgLEhk752BmUwztkcBmx8iAywZdiiWZuw0,16384
@@ -25,20 +27,21 @@ aplos_nca_saas_sdk/integration_testing/files/uploads/input1.xls,sha256=ymFgWvoUC
 aplos_nca_saas_sdk/integration_testing/files/uploads/input1.xlsx,sha256=i8pOYfA-muNxrtCKfUfi4Hi3JvSx49ZgtfvIUQTzRJo,10481
 aplos_nca_saas_sdk/integration_testing/files/uploads/input1.xpt,sha256=vve5eYrs3nEuGGQgm710tzzYkhrn3cfcy3--CVe4IGs,1920
 aplos_nca_saas_sdk/integration_testing/tests/app_configuration_test.py,sha256=rayFz4YcSpBVXr9aZYQSncBg7ohdYjEZpxIc1P7vrNA,1568
-aplos_nca_saas_sdk/integration_testing/tests/app_execution_test.py,sha256=bDyVvtOKSJdy0sdCVYVuCdUrQYhn8D3peCmM1OCkSVg,145
-aplos_nca_saas_sdk/integration_testing/tests/app_login_test.py,sha256=yCuJzNyQmm_yq7Olt4P-Wrher697fsElI8J8G87f0fU,1682
-aplos_nca_saas_sdk/integration_testing/tests/app_validation_test.py,sha256=bDyVvtOKSJdy0sdCVYVuCdUrQYhn8D3peCmM1OCkSVg,145
-aplos_nca_saas_sdk/integration_testing/tests/file_upload_test.py,sha256=aXC7EBqgxOzOxkb4WbNUpBGu6q2QQ1p8QFRPvg3ryOo,5666
+aplos_nca_saas_sdk/integration_testing/tests/app_login_test.py,sha256=FMKfx4MFoVnfimNUjVsvLqT1FQnt3W-Nd7vvSvPSeg8,1636
+aplos_nca_saas_sdk/integration_testing/tests/file_upload_test.py,sha256=CBQ80gLX4QpKgUghgsV-2nN94zMhlXsBbFGY2bYY0QQ,5906
+aplos_nca_saas_sdk/integration_testing/tests/nca_analysis_test.py,sha256=2YvbKZKqPLqbeCMFAmg6Ksey2a6Xn0ZVhDIs5gwwrw0,3258
+aplos_nca_saas_sdk/integration_testing/tests/validation_test.py,sha256=bDyVvtOKSJdy0sdCVYVuCdUrQYhn8D3peCmM1OCkSVg,145
+aplos_nca_saas_sdk/nca_resources/nca_analysis.py,sha256=JDI9F6MEpu8WdoZsSnCoU_twFpkKBwn1KIEiMwTvsvw,14877
 aplos_nca_saas_sdk/nca_resources/nca_app_configuration.py,sha256=mRK_OK2k0q4o4pH11tpeR3yKve7sgw3XTtQ0HG9KKFU,1877
 aplos_nca_saas_sdk/nca_resources/nca_endpoints.py,sha256=bOY2m9sTMu6UP-eE8rLiPKm22M-j7nLBV2xQFJHa71Q,2247
-aplos_nca_saas_sdk/nca_resources/nca_executions.py,sha256=8yasCC7OEOLhC1CRgjVy4rkUl-WgUrDhXPvZj7QR_7E,12852
-aplos_nca_saas_sdk/nca_resources/nca_file_upload.py,sha256=E5UKgRvPZUzv_V-9-YhNPmcyHArS3AhAU-7UoMAe8Is,1909
-aplos_nca_saas_sdk/nca_resources/nca_login.py,sha256=wTwuQhntyGKgm6C96ock3uyG8bFWCaMzG-0GJgQ3Ouo,3031
-aplos_nca_saas_sdk/utilities/commandline_args.py,sha256=WKIPNKMMMpEk580xXMQY7sGwxZP-uX6DVqD-8SX3NKM,11721
+aplos_nca_saas_sdk/nca_resources/nca_file_upload.py,sha256=Kl0E3hJn9_vpcrDf_9fXyJ_44XRAL2w6OapNY29t-gg,1824
+aplos_nca_saas_sdk/nca_resources/nca_login.py,sha256=d6pflBj73n3KEV_byyVwq5zqkujKWMd9sxf9-xlF6NU,3035
+aplos_nca_saas_sdk/utilities/commandline_args.py,sha256=oY20-VqeXhvSbD3kkU3llO_1mkiRWLpMXCHRbIQfJjE,10645
 aplos_nca_saas_sdk/utilities/environment_services.py,sha256=iytCg55G5EoBC9VPZJyLp5bNKy3_P9sYD9v4dCVorRw,3250
-aplos_nca_saas_sdk/utilities/environment_vars.py,sha256=pfcfX2eYmwYrmY-PZIHCONU9ds_-6GZmb-JibGROJGI,812
-aplos_nca_saas_sdk/utilities/http_utility.py,sha256=7VGWeSOuJbjnUQkzNA6cquKv0g2FJoHsBnDSgE2Buic,696
-aplos_nca_saas_sdk-0.0.11.dist-info/METADATA,sha256=5O9l45xZaC7vZKk1C-Q93nvysAnA9XPXwSw3KUmia7w,3792
-aplos_nca_saas_sdk-0.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aplos_nca_saas_sdk-0.0.11.dist-info/licenses/LICENSE,sha256=pAZXnNE2dxxwXFIduGyn1gpvPefJtUYOYZOi3yeGG94,1068
-aplos_nca_saas_sdk-0.0.11.dist-info/RECORD,,
+aplos_nca_saas_sdk/utilities/environment_vars.py,sha256=f-1oqODH-3wFrRONqmnkiL5AiybHe23g9FL4JAUkWEs,1023
+aplos_nca_saas_sdk/utilities/file_utility.py,sha256=OuVNmkyYNtf7UUHAaQkWEp9Gz8Zo0BsZcNsrUQ4qMXk,1020
+aplos_nca_saas_sdk/utilities/http_utility.py,sha256=G7fX_VQz0UwHbMYdcSh0KNfGcx2tpCx8bBTj_Iy0-Ww,1061
+aplos_nca_saas_sdk-0.0.12.dist-info/METADATA,sha256=O5Q6XDLZcv-7bdP27uxurYjn6jzcfa8fq9IkM62597c,3792
+aplos_nca_saas_sdk-0.0.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aplos_nca_saas_sdk-0.0.12.dist-info/licenses/LICENSE,sha256=pAZXnNE2dxxwXFIduGyn1gpvPefJtUYOYZOi3yeGG94,1068
+aplos_nca_saas_sdk-0.0.12.dist-info/RECORD,,

aplos_nca_saas_sdk/integration_testing/configs/file_upload.py

@@ -1,104 +0,0 @@
-"""
-Copyright 2024 Aplos Analytics
-All Rights Reserved.   www.aplosanalytics.com   LICENSED MATERIALS
-Property of Aplos Analytics, Utah, USA
-"""
-
-import os
-from typing import List, Dict, Any
-from aplos_nca_saas_sdk.integration_testing.configs._config_base import ConfigBase
-from aplos_nca_saas_sdk.integration_testing.configs.login import Login
-from aplos_nca_saas_sdk.utilities.environment_services import EnvironmentServices
-
-
-class FileUpload(ConfigBase):
-    """
-    File Upload: Defines the login that the application configuration tests will check against
-
-    """
-
-    def __init__(self, login: Login, filepath: str):
-        super().__init__()
-        if login is None:
-            raise RuntimeError("Login is required")
-        self.__login = login
-        if filepath is None:
-            raise RuntimeError("Filepath is required")
-        self.__filepath = filepath
-
-    @property
-    def login(self) -> Login:
-        """The users login"""
-        return self.__login
-
-    @property
-    def filepath(self) -> str:
-        """The file path to file being uploaded"""
-        path = self.__load_filepath(self.__filepath)
-
-        if not os.path.exists(path):
-            raise RuntimeError(f"The Upload File was not found: {path}")
-
-        return path
-
-    def __load_filepath(self, filepath: str) -> str:
-        """Load the filepath"""
-        if filepath is None:
-            raise RuntimeError("Filepath is required")
-        elif filepath.startswith("${module}"):
-            # find the path
-            es: EnvironmentServices = EnvironmentServices()
-            root = es.find_module_path()
-            filepath = filepath.replace("${module}", root)
-
-        # get the correct os path separator
-        filepath = os.path.normpath(filepath)
-        return filepath
-
-
-class FileUploads(ConfigBase):
-    """
-    File Uploads: Defines the files that the application file upload tests will check against
-
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.__fileuploads: List[FileUpload] = []
-
-    @property
-    def list(self) -> List[FileUpload]:
-        """List the file uploads"""
-        return filter(lambda x: x.enabled, self.__fileuploads)
-
-    def add(self, *, filepath: str, login: Login, enabled: bool = True):
-        """Add a file upload"""
-        fileupload = FileUpload(login, filepath)
-        fileupload.enabled = enabled
-        self.__fileuploads.append(fileupload)
-
-    def load(self, test_config: Dict[str, Any]):
-        """Load the file uploads from a list of dictionaries"""
-
-        super().load(test_config)
-        test_config_login: Login = self.try_load_login(test_config.get("login", None))
-        fileuploads: List[Dict[str, Any]] = test_config.get("files", [])
-        login: Login = None
-        for fileupload in fileuploads:
-            enabled = bool(fileupload.get("enabled", True))
-            if "login" in fileupload:
-                login = self.try_load_login(fileupload["login"])
-            else:
-                login = test_config_login
-
-            self.add(filepath=fileupload["file"], login=login, enabled=enabled)
-
-    def try_load_login(self, login_config: Dict[str, Any]) -> Login | None:
-        """Attempts to intialize a Login from a configuration object"""
-        login: Login = None
-        if login_config is not None:
-            username = login_config.get("username", None)
-            password = login_config.get("password", None)
-            domain = login_config.get("domain", None)
-            login = Login(username, password, domain)
-        return login

aplos_nca_saas_sdk/integration_testing/tests/app_validation_test.py

@@ -1,5 +0,0 @@
-"""
-Copyright 2024 Aplos Analytics
-All Rights Reserved.   www.aplosanalytics.com   LICENSED MATERIALS
-Property of Aplos Analytics, Utah, USA
-"""