aplos-nca-saas-sdk 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

aplos_nca_saas_sdk/integration_testing/configs/nca_execution_config.py

@@ -37,6 +37,9 @@ class NCAExecutionConfig(ConfigBase):
         data_processing: str | dict | None = None,
         post_processing: str | dict | None = None,
         full_payload: str | dict | None = None,
+        wait_for_results: bool = True,
+        max_wait_in_seconds: int = 600,
+        enabled: bool = True
     ):
         super().__init__()
 
@@ -58,6 +61,9 @@ class NCAExecutionConfig(ConfigBase):
         self.__data_processing = data_processing
         self.__post_processing = post_processing
         self.__full_payload = full_payload
+        self.wait_for_results = wait_for_results
+        self.max_wait_in_seconds = max_wait_in_seconds
+        self.enabled = enabled
 
     @property
     def login(self) -> LoginConfig:
@@ -132,6 +138,8 @@ class NCAExecutionConfigs(ConfigBase):
         unzip_after_download: bool = False,
         enabled: bool = True,
         full_payload: str | dict | None = None,
+        wait_for_results: bool = True,
+        max_wait_in_seconds: int = 600
     ):
         """Add an NCA Execution Config"""
         nca_execution_config = NCAExecutionConfig(
@@ -144,6 +152,8 @@ class NCAExecutionConfigs(ConfigBase):
             data_processing,
             post_processing,
             full_payload,
+            wait_for_results=wait_for_results,
+            max_wait_in_seconds=max_wait_in_seconds
         )
         nca_execution_config.enabled = enabled
         self.__nca_executions.append(nca_execution_config)
@@ -186,6 +196,8 @@ class NCAExecutionConfigs(ConfigBase):
             meta_data = self.__load_dictionary_data_or_file(key="meta", analysis=analysis, optional=True)
             data_cleaning = self.__load_dictionary_data_or_file(key="data_cleaning", analysis=analysis, optional=True)
             post_processing = self.__load_dictionary_data_or_file(key="post_processing", analysis=analysis, optional=True) 
+            wait_for_results =str(analysis.get("wait_for_results", True)).lower() == "true"
+            max_wait_in_seconds = int(analysis.get("max_wait_in_seconds", 600))
 
             self.add(
                 login=login,
@@ -197,7 +209,9 @@ class NCAExecutionConfigs(ConfigBase):
                 enabled=enabled,
                 full_payload=full_payload,
                 data_processing=data_cleaning,
-                post_processing=post_processing
+                post_processing=post_processing,
+                wait_for_results=wait_for_results,
+                max_wait_in_seconds=max_wait_in_seconds
             )
 
 
@@ -217,6 +231,11 @@ class NCAExecutionConfigs(ConfigBase):
                 "file_path": file_path,
             }
         )
+        if not file_path:
+            if optional:
+                return None
+            raise RuntimeError(f"Data for {key} not found: {file_path}")
+        
         path = FileUtility.load_filepath(file_path)
         if os.path.exists(path) is False:
             if optional:

aplos_nca_saas_sdk/integration_testing/tests/nca_analysis_test.py

@@ -63,7 +63,8 @@ class NCAAnalysisTest(IntegrationTestBase):
                     ),
                     config_data=nca_execution_config.config_data,
                     meta_data=nca_execution_config.meta_data,
-                    wait_for_results=True,
+                    wait_for_results=nca_execution_config.wait_for_results,
+                    wait_for_results_timeout=nca_execution_config.max_wait_in_seconds,
                     output_directory=nca_execution_config.output_dir,
                     unzip_after_download=False,
                     data_processing=nca_execution_config.data_processing,

aplos_nca_saas_sdk/nca_resources/nca_analysis.py

@@ -89,6 +89,9 @@ class NCAAnalysis(NCAApiBaseClass):
             file_id=file_id,
             config_data=config_data,
             meta_data=meta_data,
+            post_processing=post_processing,
+            data_processing=data_processing,
+            full_payload=full_payload
         )
 
         execution_id: str = execution_response.get("execution_id", "")

aplos_nca_saas_sdk/utilities/commandline_args.py

@@ -258,9 +258,9 @@ class CommandlineArgs:
         self, starting_path: str, file_name: str, raise_error_if_not_found: bool = True
     ) -> str | None:
         """Searches the project directory structor for a file"""
-        parents = 10
+        
         starting_path = starting_path or __file__
-
+        parents = len(starting_path.split(os.sep)) -1
         paths: List[str] = []
         for parent in range(parents):
             path = Path(starting_path).parents[parent].absolute()

aplos_nca_saas_sdk/utilities/environment_services.py

@@ -61,9 +61,9 @@ class EnvironmentServices:
         self, starting_path: str, file_name: str, raise_error_if_not_found: bool = True
     ) -> str | None:
         """Searches the project directory structure for a file"""
-        parents = 10
+        
         starting_path = starting_path or __file__
-
+        parents = len(starting_path.split(os.sep)) -1
         paths: List[str] = []
         for parent in range(parents):
             path = Path(starting_path).parents[parent].absolute()
@@ -87,8 +87,9 @@ class EnvironmentServices:
         raise_error_if_not_found: bool = True,
     ) -> str | None:
         """From a given starting point, move up the directory chain until you find the modules root"""
-        parents = 10
+        
         starting_path = starting_path or __file__
+        parents = len(starting_path.split(os.sep)) -1
         MODULE_ROOT = "aplos_nca_saas_sdk"  # pylint: disable=c0103
         paths: List[str] = []
         for parent in range(parents):

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.17'
+__version__ = '0.0.19'

{aplos_nca_saas_sdk-0.0.17.dist-info → aplos_nca_saas_sdk-0.0.19.dist-info}/METADATA

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

{aplos_nca_saas_sdk-0.0.17.dist-info → aplos_nca_saas_sdk-0.0.19.dist-info}/RECORD

@@ -1,6 +1,6 @@
 aplos_nca_saas_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aplos_nca_saas_sdk/run_analysis_execution.py,sha256=H425VMCtxIX1vlWac0Wex2CJXVzQQwgv5AGNCpaVqN4,4446
-aplos_nca_saas_sdk/version.py,sha256=L4Zhr6jSGcoVRfH-0zApHUoaMex-pJ-CVY9FWFJBEN4,172
+aplos_nca_saas_sdk/version.py,sha256=_iHa2A8tJWdQhL7TaWz6y9E_ZfWXKgEK2W8iINguGRk,172
 aplos_nca_saas_sdk/integration_testing/example_main.py,sha256=9SXu8s7B4MLe53WDkr0GuMu8h4oyfmltYOH1XT_fqC4,2500
 aplos_nca_saas_sdk/integration_testing/integration_test_base.py,sha256=ci3oOfz_McdDKGSrqOHF7F_vrvgTWo7HzxydNdPSHLs,2787
 aplos_nca_saas_sdk/integration_testing/integration_test_configurations.py,sha256=GRDHSy0ZiAJtZQvL7uPlYG2oYVo9nWlP7hNZbNnrz7U,1900
@@ -13,7 +13,7 @@ aplos_nca_saas_sdk/integration_testing/configs/app_settings_config.py,sha256=F2g
 aplos_nca_saas_sdk/integration_testing/configs/config_sample.json,sha256=zeflEvdtpknGjk42FXHGG3cBbvLcbSnj1_99o21JiDc,3566
 aplos_nca_saas_sdk/integration_testing/configs/file_upload_config.py,sha256=NZsE7n9bkZOVEDFC8jDEO4XAIb5Vzsd62_CnSDLNDj8,3034
 aplos_nca_saas_sdk/integration_testing/configs/login_config.py,sha256=5AaCzlT9T9aC_gBLs9vsS4dDCXB3FhDnlbIrp5NGaeM,3612
-aplos_nca_saas_sdk/integration_testing/configs/nca_execution_config.py,sha256=SGLsfFlmbG1cTAURymlQDx4phP6c--3S9V0LCi5Uu8A,7405
+aplos_nca_saas_sdk/integration_testing/configs/nca_execution_config.py,sha256=1Fj-OdSHJZZMVR0HxGlxO71fSSO9EYN-THVuS9-HRWQ,8266
 aplos_nca_saas_sdk/integration_testing/configs/nca_validation_config.py,sha256=veqCTMsRTailuP-P5JX8JU7BkRMzC4-sxZM9tYG52ug,2595
 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
@@ -25,13 +25,13 @@ aplos_nca_saas_sdk/integration_testing/files/uploads/input1.xpt,sha256=vve5eYrs3
 aplos_nca_saas_sdk/integration_testing/tests/app_configuration_test.py,sha256=f5kvHEAOmYKUn9gjuVNjEI5t7G8aJSbz3rfIh9133VQ,1567
 aplos_nca_saas_sdk/integration_testing/tests/app_login_test.py,sha256=NLI4DUICspa_uZi-w2Q3XufDL0ERLVvn1DavNpYDK7I,1650
 aplos_nca_saas_sdk/integration_testing/tests/file_upload_test.py,sha256=7DihdcbmrL5Fr9RPIjxIdAmrgdBaDM0ccCerh2VLMV4,3666
-aplos_nca_saas_sdk/integration_testing/tests/nca_analysis_test.py,sha256=YCvdCwzDbjjTqnYUpv3oiiQi1Vss-c0c7BLnmUpJYX8,3477
+aplos_nca_saas_sdk/integration_testing/tests/nca_analysis_test.py,sha256=x_8Socqrx1R39UA4QlZyGVo3CEHbQO6Vy8NfTOrs6SM,3597
 aplos_nca_saas_sdk/integration_testing/tests/nca_analysis_validation_test.py,sha256=IlnkaO_KSrm0tch0gxM0rZP59m1PHzUow4kZm9CiBqY,2042
 aplos_nca_saas_sdk/nca_resources/_api_base.py,sha256=qxMSiHV4014L733ii4EJ2JUwQwKkuHi5Rm6cPEdS3cA,1278
 aplos_nca_saas_sdk/nca_resources/aws_cognito.py,sha256=lc6GCvoTBx_Dmezoxt80xksiuxXjSwkynj-1Sg0vzwY,6576
 aplos_nca_saas_sdk/nca_resources/aws_s3_presigned_payload.py,sha256=S9LvUEjzJqLYob-JmNXdIe0Uj__fVtcF4LDQB5538vk,2001
 aplos_nca_saas_sdk/nca_resources/aws_s3_presigned_upload.py,sha256=ExZUjJ4Yyu-oQyVMNtyl7KqxFfr4hIwIN31RFxg6EfM,4476
-aplos_nca_saas_sdk/nca_resources/nca_analysis.py,sha256=BAI7d4QIN8TAF6fmlU3kTGAPqhFfvrdrSvgO03pgHlQ,11005
+aplos_nca_saas_sdk/nca_resources/nca_analysis.py,sha256=lW957B4L1jnEMIknhx-thOTFFPKsL4r2srbBvG_w8mk,11133
 aplos_nca_saas_sdk/nca_resources/nca_app_configuration.py,sha256=VZNZi0_NV4QjNgBSM9csq5qedc6-qvzaXwXyLfymB6M,1845
 aplos_nca_saas_sdk/nca_resources/nca_authenticator.py,sha256=tyhAHrf4PlLYarYXtY4ARCtSdGAL9GciqifDDck1KSQ,3354
 aplos_nca_saas_sdk/nca_resources/nca_endpoints.py,sha256=4nAh6JD-EUZj-Zv4EGv-W1Lgf3ww5OAQqqZu56IkPuw,2538
@@ -41,12 +41,12 @@ aplos_nca_saas_sdk/nca_resources/nca_validations.py,sha256=b9i-kXH52tXezgzOCwi9D
 aplos_nca_saas_sdk/sample_files/analysis_files/single_ev/config.json,sha256=lLnRV0jwzaSn32D8NlOekOF5oGFfUwugUlvlwoKz540,986
 aplos_nca_saas_sdk/sample_files/analysis_files/single_ev/input.csv,sha256=qFSAlgLOmERsabMmp1X6PAZa-8yFthZlHacM_f7_AOY,6528
 aplos_nca_saas_sdk/sample_files/analysis_files/single_ev/meta_data.json,sha256=p1KYOAe5Cl3rjtfF1t96oRG-QtFJJCo9otReRPNtvIk,447
-aplos_nca_saas_sdk/utilities/commandline_args.py,sha256=5kooP0Rz3_xVqnK34cM03u-Svroun92xGeddP2cMTR8,10913
-aplos_nca_saas_sdk/utilities/environment_services.py,sha256=LQQVXq1zOos3wHt5mLI1Fsa27kdMBjmU-FhbfKgfrGo,3375
+aplos_nca_saas_sdk/utilities/commandline_args.py,sha256=zQSxUF_N1c8w61fw9_e1pb2vZd5C6B0wqCdHnlkSQu4,10954
+aplos_nca_saas_sdk/utilities/environment_services.py,sha256=b4FGtdZshidrutE8K3RmVRazBRZ_Z84XQAhw1hsaYNo,3458
 aplos_nca_saas_sdk/utilities/environment_vars.py,sha256=aXheFXg6FVMaSYLe2LmoWRF5Ks9vwxDazO4XYb4vLjc,1132
 aplos_nca_saas_sdk/utilities/file_utility.py,sha256=EUvQ65aXN6OdILniuiDQ2rPRA9sFmvUoAehifEjRgUY,1025
 aplos_nca_saas_sdk/utilities/http_utility.py,sha256=DQ-ClLOmNoyPn5vhrSh4q-2wi4ViP_gplJD9asEKDM8,464
-aplos_nca_saas_sdk-0.0.17.dist-info/METADATA,sha256=RBDBr7DjE30Dka671Umk8dsMhI9eMJGwsrjL40FQL14,3792
-aplos_nca_saas_sdk-0.0.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aplos_nca_saas_sdk-0.0.17.dist-info/licenses/LICENSE,sha256=JQMpBrnqu_m2tISmyh6_dTgb8-m3HNnA51fuOh2TzkE,1076
-aplos_nca_saas_sdk-0.0.17.dist-info/RECORD,,
+aplos_nca_saas_sdk-0.0.19.dist-info/METADATA,sha256=uCY5095YdFis8NuxVkBp1FTm59FblFRUPBkivsaaWVI,3792
+aplos_nca_saas_sdk-0.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aplos_nca_saas_sdk-0.0.19.dist-info/licenses/LICENSE,sha256=JQMpBrnqu_m2tISmyh6_dTgb8-m3HNnA51fuOh2TzkE,1076
+aplos_nca_saas_sdk-0.0.19.dist-info/RECORD,,