aplos-nca-saas-sdk 0.0.21__tar.gz → 0.0.23__tar.gz

{aplos_nca_saas_sdk-0.0.21 → aplos_nca_saas_sdk-0.0.23}/PKG-INFO

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

{aplos_nca_saas_sdk-0.0.21 → aplos_nca_saas_sdk-0.0.23}/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,7 +104,7 @@ 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
@@ -113,16 +113,39 @@ def run_commands(
             check=True,
             capture_output=capture_output,
             env=env,  # pass any environment vars
+            # capture errors
+            stderr=subprocess.PIPE if not capture_output else None,
+            # capture output
+            stdout=subprocess.PIPE if not capture_output else None,
+            text=True,
         )
 
-        if capture_output:
-            output = result.stdout.decode().strip()
-            print(output)
-            return output
+        # if capture_output:
+        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.21 → aplos_nca_saas_sdk-0.0.23}/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.21"
+version = "0.0.23"
 authors = [
   { name="Eric Wilson", email="eric.wilson@aplosanalytics.com" }
 ]

aplos_nca_saas_sdk-0.0.23/requirements.dev.txt

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

{aplos_nca_saas_sdk-0.0.21 → aplos_nca_saas_sdk-0.0.23}/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.21 → aplos_nca_saas_sdk-0.0.23}/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.21 → aplos_nca_saas_sdk-0.0.23}/src/aplos_nca_saas_sdk/utilities/commandline_args.py

@@ -13,7 +13,7 @@ from typing import List
 from dotenv import load_dotenv
 
 from aplos_nca_saas_sdk.utilities.environment_vars import EnvironmentVars
-
+from aplos_nca_saas_sdk.utilities.file_utility import FileUtility
 # load the environment (.env) file if any
 # this may or may not be the desired results
 load_dotenv(override=True)
@@ -254,29 +254,7 @@ class CommandlineArgs:
 
         return user_input
 
-    def find_file(
-        self, starting_path: str, file_name: str, raise_error_if_not_found: bool = True
-    ) -> str | None:
-        """Searches the project directory structor for a file"""
-        
-        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()
-
-            tmp = os.path.join(path, file_name)
-            paths.append(tmp)
-            if os.path.exists(tmp):
-                return tmp
-
-        if raise_error_if_not_found:
-            searched_paths = "\n".join(paths)
-            raise RuntimeError(
-                f"Failed to locate environment file: {file_name} in: \n {searched_paths}"
-            )
-
-        return None
+   
 
     def check_for_environment_config(self):
         """Attempts to load an environment file"""
@@ -287,7 +265,8 @@ class CommandlineArgs:
 
         if not env_file_path.exists():
             # Try to find the file
-            file = self.find_file(__file__, env_file_path.name)
+            fu: FileUtility = FileUtility()
+            file = fu.find_file(__file__, env_file_path.name)
             file_path = Path(str(file))
 
             if not file_path.exists():

{aplos_nca_saas_sdk-0.0.21 → aplos_nca_saas_sdk-0.0.23}/src/aplos_nca_saas_sdk/utilities/environment_services.py

@@ -9,7 +9,7 @@ import json
 from typing import Dict, List, Any
 from pathlib import Path
 from dotenv import load_dotenv
-
+from aplos_nca_saas_sdk.utilities.file_utility import FileUtility
 
 class EnvironmentServices:
     """Environment Services"""
@@ -26,8 +26,9 @@ class EnvironmentServices:
 
         if not starting_path:
             starting_path = __file__
-
-        environment_file: str | None = self.find_file(
+        fu: FileUtility = FileUtility()
+        
+        environment_file: str | None = fu.find_file(
             starting_path=starting_path,
             file_name=file_name,
             raise_error_if_not_found=raise_error_if_not_found,
@@ -57,29 +58,7 @@ class EnvironmentServices:
 
         return event
 
-    def find_file(
-        self, starting_path: str, file_name: str, raise_error_if_not_found: bool = True
-    ) -> str | None:
-        """Searches the project directory structure for a file"""
-        
-        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()
-
-            tmp = os.path.join(path, file_name)
-            paths.append(tmp)
-            if os.path.exists(tmp):
-                return tmp
-
-        if raise_error_if_not_found:
-            searched_paths = "\n".join(paths)
-            raise RuntimeError(
-                f"Failed to locate environment file: {file_name} in: \n {searched_paths}"
-            )
-
-        return None
+    
 
     def find_module_path(
         self,

aplos_nca_saas_sdk-0.0.23/src/aplos_nca_saas_sdk/utilities/file_utility.py

@@ -0,0 +1,65 @@
+"""
+Copyright 2024-2025 Aplos Analytics
+All Rights Reserved.   www.aplosanalytics.com   LICENSED MATERIALS
+Property of Aplos Analytics, Utah, USA
+"""
+
+import os
+from pathlib import Path
+from typing import List
+
+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
+
+
+    def find_file(
+        self, starting_path: str, file_name: str, raise_error_if_not_found: bool = True
+    ) -> str | None:
+        """Searches the project directory structure for a file"""
+        
+        starting_path = starting_path or __file__
+        parents = len(starting_path.split(os.sep)) -1
+        paths: List[str] = []
+        for parent in range(parents):
+            try:
+                path = Path(starting_path).parents[parent].absolute()
+
+                tmp = os.path.join(path, file_name)
+                paths.append(tmp)
+                if os.path.exists(tmp):
+                    return tmp
+            except Exception as e:
+                print(f"Error {str(e)}")
+                print(f"Failed to find the file: {file_name}.")
+                print(f'Searched: {"\n".join(path)}.')
+                                
+
+        if raise_error_if_not_found:
+            searched_paths = "\n".join(paths)
+            raise RuntimeError(
+                f"Failed to locate environment file: {file_name} in: \n {searched_paths}"
+            )
+
+        return None

{aplos_nca_saas_sdk-0.0.21 → aplos_nca_saas_sdk-0.0.23}/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.21'
+__version__ = '0.0.23'

aplos_nca_saas_sdk-0.0.21/requirements.dev.txt

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

aplos_nca_saas_sdk-0.0.21/src/aplos_nca_saas_sdk/utilities/file_utility.py

@@ -1,33 +0,0 @@
-"""
-Copyright 2024-2025 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