fix: corrected relative paths to create reproducibility configuration file.

tests: modified tests to handle newly implemented docker volumes set up.

Author: pabloitu

floatcsep/experiment.py

@@ -613,7 +613,7 @@ def as_dict(self, extra: Sequence = (), extended=False) -> dict:
             "name": self.name,
             "config_file": self.config_file,
             "path": self.registry.workdir.as_posix(),
-            "run_dir": self.registry.rel(self.registry.run_dir).as_posix(),
+            "run_dir": Path(self.registry.workdir, self.registry.run_dir.name),
             "time_config": {
                 i: j
                 for i, j in self.time_config.items()

tests/unit/test_commands.py

@@ -109,7 +109,7 @@ def test_reproduce(self, mock_reproducibility_report, mock_exp_comparison, mock_
         mock_reproduced_exp.run.assert_called_once()
 
         mock_experiment.from_yml.assert_any_call(
-            mock_reproduced_exp.original_config, rundir=mock_reproduced_exp.original_run_dir
+            mock_reproduced_exp.original_config, run_dir=mock_reproduced_exp.original_run_dir
         )
         mock_original_exp.stage_models.assert_called_once()
         mock_original_exp.set_tasks.assert_called_once()

tests/unit/test_environments.py

@@ -2,6 +2,7 @@
 import venv
 import unittest
 import subprocess
+from pathlib import Path
 from unittest.mock import patch, MagicMock, call, mock_open
 import shutil
 import hashlib
@@ -474,8 +475,8 @@ def test_run_command_success(self):
 
         uid, gid = os.getuid(), os.getgid()
         expected_volumes = {
-            os.path.join(self.model_dir, "input"): {"bind": "/app/input", "mode": "rw"},
-            os.path.join(self.model_dir, "forecasts"): {"bind": "/app/forecasts", "mode": "rw"},
+            Path(self.model_dir, "input"): {"bind": "/app/input", "mode": "rw"},
+            Path(self.model_dir, "forecasts"): {"bind": "/app/forecasts", "mode": "rw"},
         }
         self.mock_client.containers.run.assert_called_once_with(
             self.manager.image_tag,

tests/unit/test_model.py

@@ -31,7 +31,6 @@ def assertEqualModel(model_a, model_b):
             if isinstance(getattr(model_a, i), ModelRegistry):
                 continue
             if not (getattr(model_a, i) == getattr(model_b, i)):
-                print(getattr(model_a, i), getattr(model_b, i))
                 raise AssertionError("Models are not equal")
 
 
@@ -98,7 +97,6 @@ def test_from_dict(self):
         self.assertEqual(".csv", model_a.registry.fmt)
         self.assertEqual(Path(self._dir), model_a.registry.dir)
 
-        # print(model_a.__dict__, model_b.__dict__)
         self.assertEqualModel(model_a, model_b)
 
         with self.assertRaises(IndexError):
@@ -177,6 +175,8 @@ def setUp(self):
         # Set attributes on the mock objects
         self.mock_registry_instance.workdir = Path("/path/to/workdir")
         self.mock_registry_instance.path = Path("/path/to/model")
+        self.mock_registry_instance.get_input_dir = MagicMock()
+        self.mock_registry_instance.get_input_dir.return_value = "input"
 
         self.mock_registry_instance.get_args_key.return_value = (
             "/path/to/args_file.txt"  # Mocking the return of the registry call
@@ -300,7 +300,7 @@ def test_create_forecast(self, prep_args_mock):
         self.model.create_forecast(tstring, force=True)
 
         self.mock_environment_instance.run_command.assert_called_once_with(
-            f"{self.func} {self.model.registry.get_args_key()}"
+            command=f"{self.func}", input_dir="input"
         )
 
     @patch("pathlib.Path.exists", return_value=True)