Skip to content

Commit f263813

Browse files
committed
consolidate helper fn
1 parent e6881c5 commit f263813

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def _save_report(
245245
"""Saves resulting reports to the given folder."""
246246
import datapane as dp
247247

248-
output_dir = find_output_dirname(self.spec.output_directory)
248+
unique_output_dir = find_output_dirname(self.spec.output_directory)
249249

250250
if ObjectStorageDetails.is_oci_path(unique_output_dir):
251251
storage_options = default_signer()
@@ -286,7 +286,9 @@ def _save_report(
286286
if test_metrics is not None and not test_metrics.empty:
287287
write_data(
288288
data=test_metrics.rename_axis("metrics").reset_index(),
289-
filename=os.path.join(output_dir, self.spec.test_metrics_filename),
289+
filename=os.path.join(
290+
unique_output_dir, self.spec.test_metrics_filename
291+
),
290292
format="csv",
291293
storage_options=storage_options,
292294
)

ads/opctl/operator/lowcode/common/utils.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -106,40 +106,6 @@ def write_data(data, filename, format, storage_options, index=False, **kwargs):
106106
)
107107

108108

109-
def get_unique_report_dir(output_dir: str) -> str:
110-
"""
111-
Generate a unique directory path for the report output.
112-
113-
Parameters
114-
------------
115-
output_dir: str
116-
The requested output directory path.
117-
Returns
118-
--------
119-
str: The unique directory path for the report output.
120-
"""
121-
122-
if output_dir:
123-
output_dir = output_dir.url
124-
# set the unique directory path as the requested path by the user
125-
unique_output_dir = output_dir
126-
else:
127-
output_dir = "results"
128-
129-
# If the directory exists, find the next unique directory name by appending an incrementing suffix
130-
counter = 1
131-
unique_output_dir = f"{output_dir}"
132-
while os.path.exists(unique_output_dir):
133-
unique_output_dir = f"{output_dir}_{counter}"
134-
counter += 1
135-
logger.warn(
136-
"Since the output directory was not specified, the output will be saved to {} directory.".format(
137-
unique_output_dir
138-
)
139-
)
140-
return unique_output_dir
141-
142-
143109
def merge_category_columns(data, target_category_columns):
144110
result = data.apply(
145111
lambda x: "__".join([str(x[col]) for col in target_category_columns]), axis=1

0 commit comments

Comments
 (0)