From a4f286be2a4b4497baceadbbfb047efcf6c56622 Mon Sep 17 00:00:00 2001 From: Jon Hagg Date: Wed, 5 May 2021 13:44:59 -0700 Subject: [PATCH] chore: cleanup print statements and reuse join method --- powersimdata/scenario/delete.py | 15 ++++++++------- powersimdata/scenario/execute.py | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/powersimdata/scenario/delete.py b/powersimdata/scenario/delete.py index f7ffe3098..43a7103c7 100644 --- a/powersimdata/scenario/delete.py +++ b/powersimdata/scenario/delete.py @@ -1,5 +1,3 @@ -import os - from powersimdata.data_access.data_access import LocalDataAccess from powersimdata.scenario.state import State from powersimdata.utility import server_setup @@ -40,22 +38,25 @@ def delete_scenario(self, confirm=True): self._scenario_list_manager.delete_entry(scenario_id) self._execute_list_manager.delete_entry(scenario_id) - print("--> Deleting scenario input data on server") + print("--> Deleting scenario input data") target = self._data_access.match_scenario_files(scenario_id, "input") self._data_access.remove(target, recursive=False, confirm=confirm) - print("--> Deleting scenario output data on server") + print("--> Deleting scenario output data") target = self._data_access.match_scenario_files(scenario_id, "output") self._data_access.remove(target, recursive=False, confirm=confirm) # Delete temporary folder enclosing simulation inputs - print("--> Deleting temporary folder on server") + print("--> Deleting temporary folder") tmp_dir = self._data_access.match_scenario_files(scenario_id, "tmp") self._data_access.remove(tmp_dir, recursive=True, confirm=confirm) print("--> Deleting input and output data on local machine") - target = os.path.join(server_setup.LOCAL_DIR, "data", "**", f"{scenario_id}_*") - LocalDataAccess().remove(target, recursive=False, confirm=confirm) + local_data_acces = LocalDataAccess() + target = local_data_acces.join( + server_setup.LOCAL_DIR, "data", "**", f"{scenario_id}_*" + ) + local_data_acces.remove(target, recursive=False, confirm=confirm) # Delete attributes self._clean() diff --git a/powersimdata/scenario/execute.py b/powersimdata/scenario/execute.py index 2a69175bd..9a92e30bc 100644 --- a/powersimdata/scenario/execute.py +++ b/powersimdata/scenario/execute.py @@ -340,7 +340,8 @@ def __init__(self, data_access, scenario_info, grid, ct): def create_folder(self): """Creates folder on server that will enclose simulation inputs.""" - print("--> Creating temporary folder on server for simulation inputs") + description = self._data_access.description + print(f"--> Creating temporary folder on {description} for simulation inputs") self._data_access.makedir(self.TMP_DIR) def prepare_mpc_file(self):