update the default save directory to results & logic to increment the suffix

Author: codeloop

ads/opctl/operator/lowcode/forecast/model/base_model.py

@@ -436,14 +436,21 @@ def _save_report(
         if self.spec.output_directory:
             output_dir = self.spec.output_directory.url
         else:
-            output_dir = "tmp_fc_operator_result"
+            output_dir = "results"
+
+            # If the directory exists, find the next unique directory name by appending an incrementing suffix
+            counter = 1
+            unique_output_dir = f"{output_dir}"
+            while os.path.exists(unique_output_dir):
+                unique_output_dir = f"{output_dir}_{counter}"
+                counter += 1
             logger.warn(
                 "Since the output directory was not specified, the output will be saved to {} directory.".format(
-                    output_dir
+                    unique_output_dir
                 )
             )
 
-        if ObjectStorageDetails.is_oci_path(output_dir):
+        if ObjectStorageDetails.is_oci_path(unique_output_dir):
             storage_options = default_signer()
         else:
             storage_options = dict()
@@ -457,7 +464,7 @@ def _save_report(
                 dp.save_report(report_sections, report_local_path)
                 utils.enable_print()
 
-                report_path = os.path.join(output_dir, self.spec.report_filename)
+                report_path = os.path.join(unique_output_dir, self.spec.report_filename)
                 with open(report_local_path) as f1:
                     with fsspec.open(
                             report_path,
@@ -469,7 +476,7 @@ def _save_report(
         # forecast csv report
         utils._write_data(
             data=result_df,
-            filename=os.path.join(output_dir, self.spec.forecast_filename),
+            filename=os.path.join(unique_output_dir, self.spec.forecast_filename),
             format="csv",
             storage_options=storage_options,
         )
@@ -479,7 +486,7 @@ def _save_report(
             if metrics_df is not None:
                 utils._write_data(
                     data=metrics_df.rename_axis("metrics").reset_index(),
-                    filename=os.path.join(output_dir, self.spec.metrics_filename),
+                    filename=os.path.join(unique_output_dir, self.spec.metrics_filename),
                     format="csv",
                     storage_options=storage_options,
                     index=False,
@@ -495,7 +502,7 @@ def _save_report(
                     utils._write_data(
                         data=test_metrics_df.rename_axis("metrics").reset_index(),
                         filename=os.path.join(
-                            output_dir, self.spec.test_metrics_filename
+                            unique_output_dir, self.spec.test_metrics_filename
                         ),
                         format="csv",
                         storage_options=storage_options,
@@ -512,7 +519,7 @@ def _save_report(
                     utils._write_data(
                         data=self.formatted_global_explanation,
                         filename=os.path.join(
-                            output_dir, self.spec.global_explanation_filename
+                            unique_output_dir, self.spec.global_explanation_filename
                         ),
                         format="csv",
                         storage_options=storage_options,
@@ -527,7 +534,7 @@ def _save_report(
                     utils._write_data(
                         data=self.formatted_local_explanation,
                         filename=os.path.join(
-                            output_dir, self.spec.local_explanation_filename
+                            unique_output_dir, self.spec.local_explanation_filename
                         ),
                         format="csv",
                         storage_options=storage_options,
@@ -546,7 +553,7 @@ def _save_report(
             # model params
             utils._write_data(
                 data=pd.DataFrame.from_dict(self.model_parameters),
-                filename=os.path.join(output_dir, "model_params.json"),
+                filename=os.path.join(unique_output_dir, "model_params.json"),
                 format="json",
                 storage_options=storage_options,
                 index=True,
@@ -555,17 +562,17 @@ def _save_report(
 
         # model pickle
         if self.spec.generate_model_pickle:
-            self._save_model(output_dir, storage_options)
+            self._save_model(unique_output_dir, storage_options)
 
         logger.info(
             f"The outputs have been successfully "
-            f"generated and placed into the directory: {output_dir}."
+            f"generated and placed into the directory: {unique_output_dir}."
         )
         if self.errors_dict:
             utils._write_data(
                 data=pd.DataFrame(self.errors_dict.items(), columns=["model", "error"]),
                 filename=os.path.join(
-                    output_dir, self.spec.errors_dict_filename
+                    unique_output_dir, self.spec.errors_dict_filename
                 ),
                 format="csv",
                 storage_options=storage_options,