Correct issues wrt forcefolder (#217)

src/fmu/dataio/_filedata_provider.py

@@ -57,6 +57,7 @@ def __post_init__(self):
         self.create_folder = self.dataio.createfolder
         self.verify_folder = self.dataio.verifyfolder
         self.forcefolder = self.dataio.forcefolder
+        self.forcefolder_is_absolute = False
         self.subfolder = self.dataio.subfolder
 
         self.fmu_context = self.dataio._usecontext  # may be None!
@@ -73,9 +74,26 @@ def derive_filedata(self):
         # resolve() will fix ".." e.g. change '/some/path/../other' to '/some/other'
         abspath = path.resolve()
 
-        relpath = path.relative_to(self.rootpath)
+        if self.forcefolder_is_absolute:
+            # may become meaningsless as forcefolder can be something else, but will try
+            try:
+                relpath = path.relative_to(self.rootpath)
+            except ValueError as verr:
+                if "does not start with" in str(verr):
+                    relpath = abspath
+                    logger.info(
+                        "Relative path equal to absolute path due to forcefolder "
+                        "with absolute path deviating for rootpath %s",
+                        self.rootpath,
+                    )
+                else:
+                    raise
+        else:
+            relpath = path.relative_to(self.rootpath)
+
         self.relative_path = str(relpath)
         self.absolute_path = str(abspath)
+
         logger.info("Derived filedata")
 
     def _get_filestem(self):
@@ -133,8 +151,13 @@ def _get_path(self):
         dest = outroot / self.efolder  # e.g. "maps"
 
         if self.forcefolder:
-            dest = Path(self.forcefolder)
-            dest = dest.absolute()
+            # absolute if starts with "/", otherwise relative to outroot
+            if str(self.forcefolder).startswith("/"):
+                dest = Path(self.forcefolder)
+                dest = dest.absolute()
+                self.forcefolder_is_absolute = True
+            else:
+                dest = self.rootpath / self.forcefolder
 
         if self.subfolder:
             dest = dest / self.subfolder

tests/test_units/test_dataio.py

@@ -165,3 +165,24 @@ def test_establish_pwd_runpath(tmp_path, globalconfig2):
     assert edata._rootpath == rmspath.parent.parent
 
     ExportData._inside_rms = False  # reset
+
+
+def test_forcefolder(tmp_path, globalconfig2, regsurf):
+    """Testing the forcefolder mechanism."""
+    rmspath = tmp_path / "rms" / "model"
+    rmspath.mkdir(parents=True, exist_ok=True)
+    os.chdir(rmspath)
+
+    ExportData._inside_rms = True
+    edata = ExportData(config=globalconfig2, forcefolder="share/observations/whatever")
+    meta = edata.generate_metadata(regsurf)
+    assert meta["file"]["relative_path"].startswith("share/observations/whatever/")
+    ExportData._inside_rms = False  # reset
+
+    edata = ExportData(config=globalconfig2, forcefolder="/tmp/what")
+    meta = edata.generate_metadata(regsurf, name="x")
+    assert (
+        meta["file"]["relative_path"]
+        == meta["file"]["absolute_path"]
+        == "/tmp/what/x.gri"
+    )