Merge pull request #120 from sudlab/ns-rse/119-update-config

isoslam/utils.py

@@ -1,10 +1,26 @@
 """Utilities and helper functionsfor IsoSLAM."""
 
 from argparse import Namespace
+from pathlib import Path
 
 from loguru import logger
 
-from isoslam import io
+
+def convert_path(path: str | Path) -> Path:
+    """
+    Ensure path is Path object.
+
+    Parameters
+    ----------
+    path : str | Path
+        Path to be converted.
+
+    Returns
+    -------
+    Path
+        Pathlib object of path.
+    """
+    return Path().cwd() if path == "./" else Path(path).expanduser()
 
 
 def update_config(config: dict, args: dict | Namespace) -> dict:  # type: ignore[type-arg]
@@ -35,7 +51,7 @@ def update_config(config: dict, args: dict | Namespace) -> dict:  # type: ignore
                 config[arg_key] = arg_value
                 logger.debug(f"Updated config config[{arg_key}] : {original_value} > {arg_value} ")
     if "base_dir" in config.keys():
-        config["base_dir"] = io._str_to_path(config["base_dir"])  # pylint: disable=protected-access
+        config["base_dir"] = convert_path(config["base_dir"])  # pylint: disable=protected-access
     if "output_dir" in config.keys():
-        config["output_dir"] = io._str_to_path(config["output_dir"])  # pylint: disable=protected-access
+        config["output_dir"] = convert_path(config["output_dir"])  # pylint: disable=protected-access
     return config

tests/test_utils.py

@@ -30,11 +30,11 @@
         ),
     ],
 )
-def test_update_config(
-    sample_config: dict, new_values: dict, expected_config: dict, caplog: pytest.LogCaptureFixture
-) -> None:
+def test_update_config(sample_config: dict, new_values: dict, expected_config: dict) -> None:
     """Test updating configuration."""
     updated_config = utils.update_config(sample_config, new_values)
 
     assert isinstance(updated_config, dict)
     assert updated_config == expected_config
+    assert isinstance(updated_config["base_dir"], Path)
+    assert isinstance(updated_config["output_dir"], Path)