Fix general observations fmuobs for dictionaries

src/subscript/bjobsusers/bjobsusers.py

@@ -65,9 +65,9 @@ def get_jobs(status: str, bjobs_function: Callable) -> pd.DataFrame:
     data = [
         [
             uname,
-            1
-            if rex.match(hname) is None
-            else int(rex.match(hname).group(1)),  # type: ignore
+            (
+                1 if rex.match(hname) is None else int(rex.match(hname).group(1))
+            ),  # type: ignore
         ]
         for (uname, hname) in slines
     ]

src/subscript/casegen_upcars/model.py

@@ -470,9 +470,9 @@ def _build_grid(self):
         if self._a * self._b * self._c == 0.0:
             self.dict_info["ModelDescription"] = f"Slab with tilting angle {self._tilt}"
         else:
-            self.dict_info[
-                "ModelDescription"
-            ] = "Dome structure with radius (x, y, z) : {:.2f}m, {:.2f}m, {:.2f}m"
+            self.dict_info["ModelDescription"] = (
+                "Dome structure with radius (x, y, z) : {:.2f}m, {:.2f}m, {:.2f}m"
+            )
 
         x_mid = self._centroid_x * self._lx
         y_mid = self._centroid_y * self._ly
@@ -494,13 +494,13 @@ def _build_grid(self):
         cell_dz = np.empty((self._total_nx, self._total_ny, self._total_nz))
 
         for idx in self._fracture_i:
-            cell_dx[
-                idx : idx + self._fracture_cell_count, :, :
-            ] = self._fracture_thickness
+            cell_dx[idx : idx + self._fracture_cell_count, :, :] = (
+                self._fracture_thickness
+            )
         for idx in self._fracture_j:
-            cell_dy[
-                :, idx : idx + self._fracture_cell_count, :
-            ] = self._fracture_thickness
+            cell_dy[:, idx : idx + self._fracture_cell_count, :] = (
+                self._fracture_thickness
+            )
         for idx in range(self._nz):
             cell_dz[:, :, idx] = self._layer_dz[idx]
         self._cell_volume = cell_dx * cell_dy * cell_dz
@@ -779,9 +779,9 @@ def export_grdecl(self, filename):
         )
 
         for idx in range(1, self._total_nz):
-            zcorn[
-                n_surface_points * 2 * idx : n_surface_points * (2 * idx + 1)
-            ] = zcorn[n_surface_points * (2 * idx - 1) : n_surface_points * (2 * idx)]
+            zcorn[n_surface_points * 2 * idx : n_surface_points * (2 * idx + 1)] = (
+                zcorn[n_surface_points * (2 * idx - 1) : n_surface_points * (2 * idx)]
+            )
             zcorn[
                 n_surface_points * (2 * idx + 1) : 2 * n_surface_points * (idx + 1)
             ] = (

src/subscript/casegen_upcars/udf.py

@@ -1,4 +1,5 @@
 """ Supporting functions/class for casegen_upcars """
+
 import numpy as np
 from scipy.stats import uniform
 

src/subscript/check_swatinit/check_swatinit.py

@@ -1,4 +1,5 @@
 """SWATINIT qc tool"""
+
 import argparse
 import sys
 from typing import Any, Dict, List
@@ -356,9 +357,9 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
     # Below a nonzero capillary entry pressure but above the contact,
     # SWAT and SWATINIT should be 1.
     if "PPCW" in qc_frame:
-        qc_col[
-            np.isclose(qc_frame["SWAT"], 1) & np.isclose(qc_frame["PPCW"], 0)
-        ] = __PC_SCALED__
+        qc_col[np.isclose(qc_frame["SWAT"], 1) & np.isclose(qc_frame["PPCW"], 0)] = (
+            __PC_SCALED__
+        )
 
     # PC is scaled (including "scaling" using PC_SCALING=1), but
     # SWAT!=SWATINIT, this must be due to EQUIL item 9 being nonzero.

src/subscript/csv_stack/csv_stack.py

@@ -1,5 +1,6 @@
 """Tool to stack/pivot CSV files, exposed as command line client,
 ERT workflow and ERT forward model"""
+
 import argparse
 import logging
 import re

src/subscript/fmu_copy_revision/fmu_copy_revision.py

@@ -3,6 +3,7 @@
 Purpose is fast and secure copy for fmu revisions using rsync as engine,
 with xargs to speed up multithreading.
 """
+
 import argparse
 import getpass
 import shutil

src/subscript/fmuobs/fmuobs.py

@@ -1,11 +1,12 @@
 """fmuobs is a converter tool for observation files used in assisted
 history matching"""
+
 import argparse
 import logging
 import os
 import signal
 import sys
-from pathlib import Path
+from pathlib import Path, PosixPath
 from typing import Optional, Tuple, Union
 
 import pandas as pd
@@ -362,8 +363,8 @@ def fmuobs(
                 f"Unsupported ERROR_MODE : {', '.join(error_mode)}. "
                 "Please verify the output file"
             )
-
-    dump_results(dframe, csv, yml, resinsight, ertobs)
+    logger.debug("After all the hard work, what is returned is this %s", dframe)
+    dump_results(dframe, csv, yml, resinsight, ertobs, PosixPath(inputfile).parent)
 
 
 def dump_results(
@@ -372,6 +373,7 @@ def dump_results(
     yamlfile: Optional[str] = None,
     resinsightfile: Optional[str] = None,
     ertfile: Optional[str] = None,
+    parent_dir: PosixPath = PosixPath("."),
 ) -> None:
     """Dump dataframe with ERT observations to CSV and/or YML
     format to disk. Writes to stdout if filenames are "-". Skips
@@ -397,7 +399,7 @@ def dump_results(
             dframe.to_csv(sys.stdout, index=False)
 
     if yamlfile:
-        obs_dict_for_yaml = df2obsdict(dframe)
+        obs_dict_for_yaml = df2obsdict(dframe, parent_dir)
         if not obs_dict_for_yaml and not dframe.empty:
             logger.error("None of your observations are supported in YAML")
         yaml_str = yaml.safe_dump(obs_dict_for_yaml)