first round of test enhancements

src/lanfactory/utils/__init__.py

@@ -1,3 +1,3 @@
-from .util_funs import try_gen_folder, save_configs
+from .util_funs import save_configs
 
-__all__ = ["try_gen_folder", "save_configs"]
+__all__ = ["save_configs"]

src/lanfactory/utils/util_funs.py

@@ -1,84 +1,14 @@
 """Some utility functions for the lanfactory package."""
 
-import os
 import pickle
-import warnings
 from pathlib import Path
 
 
-# TODO: this is now in ssms. Delete this file and import from ssms instead.
-def try_gen_folder(folder: str | None = None, allow_abs_path_folder_generation: bool = True) -> None:
-    """Function to generate a folder from a string. If the folder already exists, it will not be generated.
-
-    Arguments
-    ---------
-        folder (str):
-            The folder string to generate.
-        allow_abs_path_folder_generation (bool):
-            If True, the folder string is treated as an absolute path.
-            If False, the folder string is treated as a relative path.
-
-    """
-    folder_list = folder.split("/")
-
-    # Check if folder string supplied defines a relative or absolute path
-    if not folder_list[0]:
-        if not allow_abs_path_folder_generation:
-            warnings.warn(
-                "Absolute folder path provided, "
-                "but setting allow_abs_path_folder_generation = False. \n"
-                "No folders will be generated."
-            )
-            return
-        else:
-            rel_folder = True
-            i = 1
-    else:
-        rel_folder = False
-        i = 0
-
-    #
-    while i < len(folder_list):
-        if not folder_list[i]:
-            folder_list.pop(i)
-        else:
-            i += 1
-
-    if rel_folder:
-        folder_list[1] = "/" + folder_list[1]
-        folder_list.pop(0)
-
-    tmp_dir_str = ""
-    i = 0
-
-    while i < len(folder_list):
-        if i == 0:
-            tmp_dir_str += folder_list[i]
-        else:
-            tmp_dir_str += "/" + folder_list[i]
-
-        if not os.path.exists(tmp_dir_str):
-            print("Did not find folder: ", tmp_dir_str)
-            print("Creating it...")
-            try:
-                os.makedirs(tmp_dir_str)
-            except Exception as e:
-                print(e)
-                print("Some problem occured when creating the directory ", tmp_dir_str)
-        else:
-            print("Found folder: ", tmp_dir_str)
-            print("Moving on...")
-        i += 1
-
-    return
-
-
 def save_configs(
     model_id: str | None = None,
     save_folder: str | Path | None = None,
     network_config: dict | None = None,
     train_config: dict | None = None,
-    allow_abs_path_folder_generation: bool = True,
 ) -> None:
     """Function to save the network and training configurations to a folder.
 
@@ -92,27 +22,18 @@ def save_configs(
             The network configuration dictionary.
         train_config (dict):
             The training configuration dictionary.
-        allow_abs_path_folder_generation (bool):
-            If True, the folder string is treated as an absolute path.
-            If False, the folder string is treated as a relative path.
     """
 
-    if isinstance(save_folder, Path):
-        save_folder = str(save_folder)
-
     # Generate save_folder if it doesn't yet exist
-    try_gen_folder(
-        folder=save_folder,
-        allow_abs_path_folder_generation=allow_abs_path_folder_generation,
-    )
+    Path(save_folder).mkdir(parents=True, exist_ok=True)
 
     # Save network config
     pickle.dump(
         network_config,
-        open(save_folder + "/" + model_id + "_network_config.pickle", "wb"),
+        open(Path(save_folder) / f"{model_id}_network_config.pickle", "wb"),
     )
     print("Saved network config")
     # Save train config
-    pickle.dump(train_config, open(save_folder + "/" + model_id + "_train_config.pickle", "wb"))
+    pickle.dump(train_config, open(Path(save_folder) / f"{model_id}_train_config.pickle", "wb"))
     print("Saved train config")
     return