aplos-nca-saas-sdk 0.0.20__tar.gz → 0.0.22__tar.gz

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/PKG-INFO

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

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/devops/pypi/build.py

@@ -15,7 +15,7 @@ def main():
     """build the artifacts"""
     project_root = Path(__file__).parents[2]
 
-    # extact the version
+    # extract the version
     pyproject_toml = os.path.join(project_root, "pyproject.toml")
     version_file = os.path.join(project_root, "src", "aplos_nca_saas_sdk", "version.py")
 
@@ -72,7 +72,7 @@ def extract_version_and_write_to_file(pyproject_toml: str, version_file: str):
 
 def run_build():
     """Run python build commands"""
-    run_commands(["python", "-m", "build"])
+    output = run_commands(["python", "-m", "build"], capture_output=True)
 
 
 def run_publish():
@@ -104,25 +104,48 @@ def get_url(payload: str):
 
 def run_commands(
     commands: List[str], capture_output: bool = False, env=None
-) -> str | None:
+) -> str | int | None:
     """centralized area for running process commands"""
     try:
         # Run the publish command
         result = subprocess.run(
             commands,
             check=True,
-            capture_output=capture_output,
+            # capture_output=capture_output,
             env=env,  # pass any environment vars
+            # capture errors
+            stderr=subprocess.PIPE,
+            # capture output
+            stdout=subprocess.PIPE,
+            text=True,
         )
 
         if capture_output:
-            output = result.stdout.decode().strip()
+            output = str(result.stdout)
             print(output)
             return output
 
     except subprocess.CalledProcessError as e:
         logger.exception(f"An error occurred: {e}")
-
+        if e.stderr:
+            error = str(e.stderr)
+            if "401 Error" in error:
+                logger.error("401 Error: Invalid credentials")
+                if "amazonaws" in error:
+                    logger.error(
+                        "Please check your AWS credentials and try again."
+                    )
+                    print("🚨 If you this package doesn't use aws code artifact, check your pip config file "
+                          "and remove the aws code artifact reference "
+                          "mac: ~./.config/pip/pip.conf"
+                          )
+                else:
+                    logger.error(
+                        "Please check your PYPI_API_TOKEN environment variable."
+                    )   
+                
+                logger.error("If you need help, please contact support.")
+        return e.returncode
 
 if __name__ == "__main__":
     main()

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/pyproject.toml

@@ -7,7 +7,6 @@ packages = ["src/aplos_nca_saas_sdk"]
 
 [project]
 name = "aplos_nca_saas_sdk"
-source = "src/aplos_nca_saas_sdk"
 keywords = [
     "PK Analysis",
     "Pharmacokinetics",
@@ -26,7 +25,7 @@ keywords = [
     "Clinical Trials"
 ]
 
-version = "0.0.20"
+version = "0.0.22"
 authors = [
   { name="Eric Wilson", email="eric.wilson@aplosanalytics.com" }
 ]

aplos_nca_saas_sdk-0.0.22/requirements.dev.txt

@@ -0,0 +1,8 @@
+mypy
+pytest
+types-python-dateutil
+build
+toml
+twine
+wheel
+pkginfo

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/requirements.txt

@@ -3,5 +3,5 @@ boto3
 python-dotenv # load env values
 PyJWT # jwt in the imports
 requests
-boto3-stubs[cognito]
+boto3-stubs
 mypy_boto3_cognito_idp

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/src/aplos_nca_saas_sdk/integration_testing/configs/nca_execution_config.py

@@ -194,7 +194,7 @@ class NCAExecutionConfigs(ConfigBase):
                 raise RuntimeError("Failed to load the config data")
 
             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)
+            data_cleaning = self.__load_dictionary_data_or_file(key="data_processing", 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))

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/src/aplos_nca_saas_sdk/integration_testing/tests/nca_analysis_test.py

@@ -76,14 +76,17 @@ class NCAAnalysisTest(IntegrationTestBase):
                 logger.info(
                     {"message": "Execution complete. Verifying results download."}
                 )
-
-                expected_output_file = execution_response.get("results", {}).get("file")
-                if expected_output_file is None:
-                    raise RuntimeError(
-                        "Expected populated output_file from NCAExecution was None."
-                    )
-                elif not Path(expected_output_file).is_file():
-                    raise RuntimeError("Expected downloaded file does not exist.")
+                status_code = execution_response.get("results", {}).get("status_code")
+                if status_code == 201:
+                    pass  # No output file expected
+                else:
+                    expected_output_file = execution_response.get("results", {}).get("file")
+                    if expected_output_file is None:
+                        raise RuntimeError(
+                            "Expected populated output_file from NCAExecution was None."
+                        )
+                    elif not Path(expected_output_file).is_file():
+                        raise RuntimeError("Expected downloaded file does not exist.")
 
             except Exception as e:  # pylint: disable=w0718
                 test_response.error = str(e)

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/src/aplos_nca_saas_sdk/nca_resources/nca_analysis.py

@@ -128,7 +128,8 @@ class NCAAnalysis(NCAApiBaseClass):
                 response["results"]["file"] = file_path
         else:
             self.log("Bypassed results download.")
-
+            response["results"]["status_code"] = 201
+            response["results"]["message"] = "Waiting for results download bypassed. Running Fast Executions."
         return response
 
     def __add_to_queue(
@@ -165,6 +166,8 @@ class NCAAnalysis(NCAApiBaseClass):
 
         if full_payload:
             submission = full_payload
+            # we still need to add the file id at this point
+            submission["file"] = {"id": file_id}
         else:
             submission = {
                 "file": {"id": file_id},

{aplos_nca_saas_sdk-0.0.20 → aplos_nca_saas_sdk-0.0.22}/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.20'
+__version__ = '0.0.22'

aplos_nca_saas_sdk-0.0.20/requirements.dev.txt

@@ -1 +0,0 @@
-mypy