aplos-nca-saas-sdk 0.0.5__tar.gz → 0.0.6__tar.gz

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/.vscode/launch.json

@@ -25,19 +25,7 @@
             "console": "integratedTerminal"
         },
 
-        {
-            "name": "Build & Deploy To Code Artifacts",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${workspaceFolder}/devops/code_artifacts/main.py",
-            "console": "integratedTerminal",
-            "env": {
-                
-                "ENVRIONMENT": "dev",
-                "DEBUG_MODE": "True",
-                "PYTHONPATH": "${workspaceFolder}:${workspaceFolder}/src:${workspaceFolder}/devops:"
-            }
-        },
+       
         {
             "name": "Run Integration Tests - dev",
             "type": "debugpy",

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/PKG-INFO

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

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/pyproject.toml

@@ -26,7 +26,7 @@ keywords = [
     "Clinical Trials"
 ]
 
-version = "0.0.5"
+version = "0.0.6"
 authors = [
   { name="Eric Wilson", email="eric.wilson@aplosanalytics.com" }
 ]

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/configs/app_settings.py

@@ -14,9 +14,9 @@ class ApplicationDomain(ConfigBase):
 
     """
 
-    def __init__(self):
+    def __init__(self, domain: str | None = None):
         super().__init__()
-        self.__domain: str | None = None
+        self.__domain: str | None = domain
 
     @property
     def domain(self) -> str:
@@ -30,25 +30,32 @@ class ApplicationDomain(ConfigBase):
         self.__domain = value
 
 
-class ApplicationSettings:
+class ApplicationDomains(ConfigBase):
     """
-    Application Settings: Defines the domains that the application settings (configuration endpoint) tests will check against
+    Application ApplicationDomain: Defines the Domains that the application configuration tests will check against
 
     """
 
     def __init__(self):
+        super().__init__()
         self.__domains: List[ApplicationDomain] = []
 
     @property
-    def domains(self) -> List[ApplicationDomain]:
+    def list(self) -> List[ApplicationDomain]:
+        """List the logins"""
         return self.__domains
 
-    @domains.setter
-    def domains(self, value: List[ApplicationDomain]):
-        self.__domains = value
+    def add(self, *, domain: str, enabled: bool = True):
+        """Add a loging"""
+        app_domain = ApplicationDomain()
+        app_domain.domain = domain
+        app_domain.enabled = enabled
+        self.__domains.append(app_domain)
 
     def load(self, test_config: Dict[str, Any]):
-        """Load the domains from the config"""
+        """Load the logins from a list of dictionaries"""
+        # self.enabled = bool(test_config.get("enabled", True))
+        super().load(test_config)
         domains: List[Dict[str, Any]] = test_config.get("domains", [])
 
         domain: Dict[str, Any]
@@ -58,3 +65,24 @@ class ApplicationSettings:
             app_domain.enabled = bool(domain.get("enabled", True))
 
             self.__domains.append(app_domain)
+
+
+class ApplicationSettings(ConfigBase):
+    """
+    Application Settings: Defines the domains that the application settings (configuration endpoint) tests will check against
+
+    """
+
+    def __init__(self):
+        super().__init__()
+        self.__domains: ApplicationDomains = ApplicationDomains()
+
+    @property
+    def domains(self) -> ApplicationDomains:
+        """List of the domain"""
+        return self.__domains
+
+    def load(self, test_config: Dict[str, Any]):
+        """Load the domains from the config"""
+        super().load(test_config)
+        self.domains.load(test_config)

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/configs/login.py

@@ -95,7 +95,8 @@ class Logins(ConfigBase):
 
     def load(self, test_config: Dict[str, Any]):
         """Load the logins from a list of dictionaries"""
-        self.enabled = bool(test_config.get("enabled", True))
+        # self.enabled = bool(test_config.get("enabled", True))
+        super().load(test_config)
         logins: List[Dict[str, str]] = test_config.get("logins", [])
         for login in logins:
             self.add(

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/integration_test_base.py

@@ -22,7 +22,7 @@ class IntegrationTestBase:
     def __init__(self, name: str | None = None, index: int = 0):
         self.name = name
         self.index = index
-        self.__config: TestConfiguration | None = None
+        self.__config: TestConfiguration = TestConfiguration()
         self.__results: List[IntegrationTestResponse] = []
 
     @property

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/integration_test_factory.py

@@ -49,14 +49,14 @@ class IntegrationTestFactory:
                     and obj is not IntegrationTestBase
                 ):
                     # Instantiate the class and store it
-                    self.register_test_class(obj())
+                    self.register_test_instance(obj())
 
     @property
-    def test_classes(self) -> List[IntegrationTestBase]:
+    def test_instances(self) -> List[IntegrationTestBase]:
         """Get the test classes"""
         self.__test_classes.sort(key=lambda x: x.index)
         return self.__test_classes
 
-    def register_test_class(self, test_class: IntegrationTestBase):
+    def register_test_instance(self, test_class: IntegrationTestBase):
         """Register a test class"""
         self.__test_classes.append(test_class)

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/integration_test_response.py

@@ -16,6 +16,7 @@ class IntegrationTestResponse:
         self.response: Dict[str, Any] = {}
         self.error: Optional[str] = None
         self.success: bool = False
+        self.skipped: bool = False
 
     def to_dict(self) -> Dict[str, Any]:
         """JSON Dictionary Object"""
@@ -25,4 +26,5 @@ class IntegrationTestResponse:
             "response": self.response,
             "error": self.error,
             "success": self.success,
+            "skipped": self.skipped,
         }

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/integration_test_suite.py

@@ -38,21 +38,24 @@ class IntegrationTestSuite:
         start_time: datetime = datetime.now(UTC)
         factory: IntegrationTestFactory = IntegrationTestFactory()
         test: IntegrationTestBase | None = None
-        for test in factory.test_classes:
+        for test in factory.test_instances:
             test.config = test_config
             test_result: Dict[str, Any] = {
                 "test_name": test.name,
                 "success": True,
                 "error": None,
-                "start_time_utc": datetime.now(UTC),
+                "skipped": False,
+                "start_time_utc": None,
                 "end_time_utc": None,
             }
 
             logger.info(f"Running test class {test.name}")
             try:
+                test_result["start_time_utc"] = datetime.now(UTC)
                 success = test.test()
                 test_result["success"] = success
                 test_result["results"] = test.results
+
             except Exception as e:  # pylint: disable=broad-except
                 test_result["success"] = False
                 test_result["error"] = str(e)
@@ -96,3 +99,6 @@ class IntegrationTestSuite:
         print(f"Total Tests: {len(self.test_results)}")
         print(f"Successful Tests: {len(self.test_results) - len(failures)}")
         print(f"Failed Tests: {len(failures)}")
+        print(
+            f"Skipped Tests: {len([test for test in self.test_results if test['skipped']])}"
+        )

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/main.py

@@ -53,8 +53,8 @@ def override_config(config: TestConfiguration):
     config.logins.list.clear()
     config.logins.add(username=username, password=password, domain=domain)
 
-    config.app_config.domains.clear()
-    config.app_config.domains.append(domain)
+    config.app_config.domains.list.clear()
+    config.app_config.domains.add(domain=domain)
 
 
 if __name__ == "__main__":

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/tests/app_configuration_test.py

@@ -26,11 +26,17 @@ class TestAppConfiguration(IntegrationTestBase):
         """Test loading the application configuration"""
 
         self.results.clear()
-        for domain_config in self.config.app_config.domains:
+        for domain_config in self.config.app_config.domains.list:
             config: NCAAppConfiguration = NCAAppConfiguration(domain_config.domain)
 
             test_response: IntegrationTestResponse = IntegrationTestResponse()
             test_response.meta = {"domain": domain_config}
+
+            if not domain_config.enabled or not self.config.app_config.enabled:
+                test_response.skipped = True
+                self.results.append(test_response)
+                continue
+
             try:
                 response = config.get()
                 test_response.response = response

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/aplos_nca_saas_sdk/integration_testing/tests/app_login_test.py

@@ -29,6 +29,10 @@ class TestAppLogin(IntegrationTestBase):
         for login in self.config.logins.list:
             test_response: IntegrationTestResponse = IntegrationTestResponse()
             test_response.name = self.name
+            if not login.enabled or not self.config.logins.enabled:
+                test_response.skipped = True
+                self.results.append(test_response)
+                continue
             try:
                 nca_login = NCALogin(aplos_saas_domain=login.domain)
                 token = nca_login.authenticate(

{aplos_nca_saas_sdk-0.0.5 → aplos_nca_saas_sdk-0.0.6}/src/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.5'
+__version__ = '0.0.6'