feat: change makedir implementation to be os agnostic

powersimdata/data_access/data_access.py

@@ -83,8 +83,7 @@ def makedir(self, relative_path):
 
         :param str relative_path: the path, without filename, relative to root
         """
-        full_path = posixpath.join(self.root, relative_path)
-        return self.execute_command(f"mkdir -p {full_path}")
+        raise NotImplementedError
 
     def execute_command(self, command):
         """Execute a command locally at the data access.
@@ -180,6 +179,14 @@ def move_to(self, file_name, to_dir, change_name_to=None):
         self.copy(src, dest)
         self.remove(src)
 
+    def makedir(self, relative_path):
+        """Create paths relative to the instance root
+
+        :param str relative_path: the path, without filename, relative to root
+        """
+        target = os.path.join(self.root, relative_path)
+        os.makedirs(target, exist_ok=True)
+
     def execute_command(self, command):
         """Execute a command locally at the data access.
 
@@ -395,6 +402,17 @@ def push(self, file_name, checksum, change_name_to=None):
                 print(e)
             raise IOError("Failed to push file - most likely a conflict was detected.")
 
+    def makedir(self, relative_path):
+        """Create paths relative to the instance root
+
+        :param str relative_path: the path, without filename, relative to root
+        :raises IOError: if command generated stderr
+        """
+        full_path = posixpath.join(self.root, relative_path)
+        _, _, stderr = self.execute_command(f"mkdir -p {full_path}")
+        if len(stderr.readlines()) != 0:
+            raise IOError("Failed to create %s on server" % full_path)
+
     def close(self):
         """Close the connection that was opened when the object was created."""
         self.ssh.close()

powersimdata/scenario/execute.py

@@ -334,22 +334,14 @@ def __init__(self, data_access, scenario_info, grid, ct):
         self.server_config = server_setup.PathConfig(server_setup.DATA_ROOT_DIR)
         self.scenario_folder = "scenario_%s" % scenario_info["id"]
 
-        self.TMP_DIR = posixpath.join(
-            self.server_config.execute_dir(), self.scenario_folder
-        )
         self.REL_TMP_DIR = posixpath.join(
             server_setup.EXECUTE_DIR, self.scenario_folder
         )
 
     def create_folder(self):
-        """Creates folder on server that will enclose simulation inputs.
-
-        :raises IOError: if folder cannot be created.
-        """
+        """Creates folder on server that will enclose simulation inputs."""
         print("--> Creating temporary folder on server for simulation inputs")
-        _, _, stderr = self._data_access.makedir(self.TMP_DIR)
-        if len(stderr.readlines()) != 0:
-            raise IOError("Failed to create %s on server" % self.TMP_DIR)
+        self._data_access.makedir(self.REL_TMP_DIR)
 
     def prepare_mpc_file(self):
         """Creates MATPOWER case file."""