aplos-nca-saas-sdk 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

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/utilities/environment_services.py

@@ -26,7 +26,8 @@ class EnvironmentServices:
 
         if not starting_path:
             starting_path = __file__
-
+        
+        
         environment_file: str | None = self.find_file(
             starting_path=starting_path,
             file_name=file_name,
@@ -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,
@@ -108,3 +87,33 @@ class EnvironmentServices:
             )
 
         return None
+
+    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(paths)}.')
+                                
+
+        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/utilities/file_utility.py

@@ -6,7 +6,6 @@ Property of Aplos Analytics, Utah, USA
 
 import os
 
-
 from aplos_nca_saas_sdk.utilities.environment_services import EnvironmentServices
 
 
@@ -31,3 +30,12 @@ class FileUtility:
         # 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"""
+        
+        es: EnvironmentServices = EnvironmentServices()
+        return es.find_file(starting_path, file_name, raise_error_if_not_found)

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.22'
+__version__ = '0.0.24'

{aplos_nca_saas_sdk-0.0.22.dist-info → aplos_nca_saas_sdk-0.0.24.dist-info}/METADATA

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

{aplos_nca_saas_sdk-0.0.22.dist-info → aplos_nca_saas_sdk-0.0.24.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=gOKyPzMwi8E4tXQBz77NiqUoiJj1L1M3ybEtodYU4Bg,172
+aplos_nca_saas_sdk/version.py,sha256=VXhxq2KBBxSTjGA5lIw5x1NtuFQBxEFFmPDvlV3AQn0,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
@@ -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=zQSxUF_N1c8w61fw9_e1pb2vZd5C6B0wqCdHnlkSQu4,10954
-aplos_nca_saas_sdk/utilities/environment_services.py,sha256=b4FGtdZshidrutE8K3RmVRazBRZ_Z84XQAhw1hsaYNo,3458
+aplos_nca_saas_sdk/utilities/commandline_args.py,sha256=iia2g0sdPfg637GV8PuddRNUAtg46GdmlDx4OJ0iS-s,10242
+aplos_nca_saas_sdk/utilities/environment_services.py,sha256=dCdUSL1GAzvCVLpkgRLnG3Z-h5wAi27SldeQHvH007o,3746
 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/file_utility.py,sha256=J4cN0zizcA-oZnALu1ICiImi_KcIzN1yQ0Bj0lfpeX4,1364
 aplos_nca_saas_sdk/utilities/http_utility.py,sha256=DQ-ClLOmNoyPn5vhrSh4q-2wi4ViP_gplJD9asEKDM8,464
-aplos_nca_saas_sdk-0.0.22.dist-info/METADATA,sha256=aRoTCWp4-UOQQZPgISA9aMzLzMyWBo70Y0phyXqXMts,3792
-aplos_nca_saas_sdk-0.0.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aplos_nca_saas_sdk-0.0.22.dist-info/licenses/LICENSE,sha256=JQMpBrnqu_m2tISmyh6_dTgb8-m3HNnA51fuOh2TzkE,1076
-aplos_nca_saas_sdk-0.0.22.dist-info/RECORD,,
+aplos_nca_saas_sdk-0.0.24.dist-info/METADATA,sha256=rrw6LHlnlYnRLrgB81u1nJX-QYsdcZT_BzJVv9rnBo0,3792
+aplos_nca_saas_sdk-0.0.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aplos_nca_saas_sdk-0.0.24.dist-info/licenses/LICENSE,sha256=JQMpBrnqu_m2tISmyh6_dTgb8-m3HNnA51fuOh2TzkE,1076
+aplos_nca_saas_sdk-0.0.24.dist-info/RECORD,,