aplos-nca-saas-sdk 0.0.17__tar.gz → 0.0.19__tar.gz

{aplos_nca_saas_sdk-0.0.17 → aplos_nca_saas_sdk-0.0.19}/PKG-INFO

@@ -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 → aplos_nca_saas_sdk-0.0.19}/pyproject.toml

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

{aplos_nca_saas_sdk-0.0.17 → aplos_nca_saas_sdk-0.0.19}/src/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-0.0.17 → aplos_nca_saas_sdk-0.0.19}/src/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-0.0.17 → aplos_nca_saas_sdk-0.0.19}/src/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-0.0.17 → aplos_nca_saas_sdk-0.0.19}/src/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-0.0.17 → aplos_nca_saas_sdk-0.0.19}/src/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-0.0.17 → aplos_nca_saas_sdk-0.0.19}/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.17'
+__version__ = '0.0.19'