Merge pull request #175 from CURENT/misc

Format

Author: jinningwang

ams/core/matprocessor.py

@@ -94,7 +94,7 @@ def export_csv(self, path=None):
         path, file_name = get_export_path(self.owner.system,
                                           self.name,
                                           path=path,
-                                          format='csv')
+                                          fmt='csv')
 
         pd.DataFrame(data=self.v, columns=self.col_names, index=self.row_names).to_csv(path)
 

ams/routines/routine.py

@@ -455,7 +455,7 @@ def export_csv(self, path=None):
             return None
 
         path, file_name = get_export_path(self.system, self.class_name,
-                                          path=path, format='csv')
+                                          path=path, fmt='csv')
 
         data_dict = initialize_data_dict(self)
 

ams/utils/paths.py

@@ -257,7 +257,7 @@ def confirm_overwrite(outfile, overwrite=None):
     return True
 
 
-def get_export_path(system, fname, path=None, format='csv'):
+def get_export_path(system, fname, path=None, fmt='csv'):
     """
     Get the absolute export path and the derived file name for
     an AMS system export.
@@ -274,10 +274,10 @@ def get_export_path(system, fname, path=None, format='csv'):
         The desired output path.
         - If it's a directory, the file name will be generated.
         - If it's a full file path (with extension), the filename part will be used
-          as the base, and the `format` argument will determine the final extension.
+          as the base, and the `fmt` argument will determine the final extension.
         - If None, the current working directory will be used, and the filename will
           be generated.
-    format : str, optional
+    fmt : str, optional
         The file format to export, e.g., 'csv', 'json'. Default is 'csv'.
 
     Returns
@@ -295,7 +295,7 @@ def get_export_path(system, fname, path=None, format='csv'):
         base_name_prefix = os.path.splitext(os.path.basename(system.files.fullname))[0]
         base_name_prefix += f'_{fname}'
 
-    target_extension = format.lower()  # Ensure consistent extension casing
+    target_extension = fmt.lower()  # Ensure consistent extension casing
 
     if path:
         abs_path = os.path.abspath(path)  # Resolve to absolute path early

tests/test_paths.py

@@ -39,10 +39,11 @@ def test_no_fullname(self):
         path, file_name = get_export_path(self.ss,
                                           'DCOPF',
                                           path=None,
-                                          format='csv')
+                                          fmt='csv')
 
         dir_path, only_file_name = os.path.split(path)
         self.assertTrue(os.path.exists(dir_path))
+        self.assertIsNotNone(only_file_name)
 
     def test_no_path(self):
         """
@@ -51,10 +52,11 @@ def test_no_path(self):
         path, file_name = get_export_path(self.ss,
                                           'DCOPF',
                                           path=None,
-                                          format='csv')
+                                          fmt='csv')
 
         dir_path, only_file_name = os.path.split(path)
         self.assertTrue(os.path.exists(dir_path))
+        self.assertIsNotNone(only_file_name)
 
     def test_current_path(self):
         """
@@ -63,7 +65,21 @@ def test_current_path(self):
         path, file_name = get_export_path(self.ss,
                                           'DCOPF',
                                           path='.',
-                                          format='csv')
+                                          fmt='csv')
 
         dir_path, only_file_name = os.path.split(path)
         self.assertTrue(os.path.exists(dir_path))
+        self.assertIsNotNone(only_file_name)
+
+    def test_path_with_file_name(self):
+        """
+        Test export path with path and file name specified.
+        """
+        path, file_name = get_export_path(self.ss,
+                                          'DCOPF',
+                                          path='./test_export.csv',
+                                          fmt='csv',)
+
+        dir_path, only_file_name = os.path.split(path)
+        self.assertTrue(os.path.exists(dir_path))
+        self.assertEqual(only_file_name, 'test_export.csv')