floodmodeller-api 0.5.0.post1__py3-none-any.whl → 0.5.2__py3-none-any.whl

floodmodeller_api/ief.py

@@ -1,6 +1,6 @@
 """
 Flood Modeller Python API
-Copyright (C) 2024 Jacobs U.K. Limited
+Copyright (C) 2025 Jacobs U.K. Limited
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -17,7 +17,7 @@ address: Jacobs UK Limited, Flood Modeller, Cottons Centre, Cottons Lane, London
 from __future__ import annotations
 
 import csv
-import os
+import logging
 import subprocess
 import time
 from io import StringIO
@@ -33,19 +33,28 @@ from .diff import check_item_with_dataframe_equal
 from .ief_flags import flags
 from .logs import LF1, create_lf
 from .to_from_json import Jsonable
-from .util import handle_exception
-from .zzn import ZZN
+from .util import handle_exception, is_windows
+from .zz import ZZN
 
 
-def try_numeric(value: str) -> str | int | float:
+def try_converting(value: str) -> str | int | float:
     """Attempt to parse value as float or int if valid, else return the original string"""
     try:
         return int(value)
     except ValueError:
-        try:
-            return float(value)
-        except ValueError:
-            return value
+        pass
+
+    try:
+        return float(value)
+    except ValueError:
+        pass
+
+    if not is_windows() and "\\" in value:
+        # backslashes aren't valid in paths
+        logging.info("Changing '\\' in '%s' to '/' to be valid in Linux.", value)
+        return value.replace("\\", "/")
+
+    return value
 
 
 class IEF(FMFile):
@@ -75,14 +84,14 @@ class IEF(FMFile):
         if ief_filepath is not None:
             FMFile.__init__(self, ief_filepath)
             self._read()
-            self._log_path = self._get_result_filepath("lf1")
+            self._log_path = self._filepath.with_suffix(".lf1")
         else:
             self._create_from_blank()
 
     def _read(self):
         # Read IEF data
-        with open(self._filepath) as ief_file:
-            raw_data = [line.rstrip("\n") for line in ief_file.readlines()]
+        with open(self._filepath, encoding=self.ENCODING) as ief_file:
+            raw_data = [line.rstrip("\n") for line in ief_file]
         # Clean data and add as class properties
         # Create a list to store the properties which are to be saved in IEF, so as to ignore any temp properties.
         prev_comment = None
@@ -117,7 +126,7 @@ class IEF(FMFile):
                     self._ief_properties.append(prop)
                 else:
                     # Sets the property and value as class properties so they can be edited.
-                    setattr(self, prop, try_numeric(value))
+                    setattr(self, prop, try_converting(value))
                     self._ief_properties.append(prop)
                 prev_comment = None
             else:
@@ -170,7 +179,7 @@ class IEF(FMFile):
                 # Add multiple EventData if present
                 for idx, key in enumerate(event_data):
                     if idx == event_index:
-                        ief_string += f";{key}\nEventData{eq}{str(event_data[key])}\n"
+                        ief_string += f";{key}\nEventData{eq}{event_data[key]!s}\n"
                         break
                 event_index += 1
 
@@ -181,7 +190,7 @@ class IEF(FMFile):
 
             else:
                 # writes property and value to ief string
-                ief_string += f"{prop}{eq}{str(getattr(self, prop))}\n"
+                ief_string += f"{prop}{eq}{getattr(self, prop)!s}\n"
 
         return ief_string
 
@@ -209,7 +218,7 @@ class IEF(FMFile):
             if "=" in line:
                 prop, value = line.split("=")
                 # Sets the property and value as class properties so they can be edited.
-                setattr(self, prop, try_numeric(value))
+                setattr(self, prop, try_converting(value))
                 self._ief_properties.append(prop)
             else:
                 # This should add the [] bound headers
@@ -227,8 +236,9 @@ class IEF(FMFile):
             ):
                 # Check if valid flag
                 if prop.upper() not in flags:
-                    print(
-                        f"Warning: '{prop}' is not a valid IEF flag, it will be ommited from the IEF\n",
+                    logging.warning(
+                        "'%s' is not a valid IEF flag, it will be ommited from the IEF\n",
+                        prop,
                     )
                     continue
 
@@ -279,10 +289,11 @@ class IEF(FMFile):
     def _update_eventdata_info(self):  # noqa: C901
         if not isinstance(self.eventdata, dict):
             # If attribute not a dict, adds the value as a single entry in list
-            raise AttributeError(
+            msg = (
                 "The 'EventData' attribute should be a dictionary with keys defining the event"
-                " names and values referencing the IED files",
+                " names and values referencing the IED files"
             )
+            raise AttributeError(msg)
 
         # Number of 'EventData' flags in ief
         event_properties = self._ief_properties.count("EventData")
@@ -328,11 +339,12 @@ class IEF(FMFile):
         try:
             self.NoOfFlowTimeSeries = sum([ftp.count_series() for ftp in self.flowtimeprofiles])
         except FileNotFoundError as err:
-            raise UserWarning(
+            msg = (
                 "Failed to read csv referenced in flowtimeprofile, file either does not exist or is"
                 "unable to be found due to relative path from IEF file. NoOfFlowTimeSeries has not"
-                "been updated.",
-            ) from err
+                "been updated."
+            )
+            raise UserWarning(msg) from err
 
         end_index = None
         start_index = (
@@ -434,6 +446,7 @@ class IEF(FMFile):
             filepath (string): Full filepath to new location for ief file (including '.ief' extension)
         """
         self._save(filepath)
+        self._log_path = self._filepath.with_suffix(".lf1")
 
     @handle_exception(when="simulate")
     def simulate(  # noqa: C901, PLR0912, PLR0913
@@ -471,9 +484,8 @@ class IEF(FMFile):
         self._range_function = range_function
         self._range_settings = range_settings if range_settings else {}
         if self._filepath is None:
-            raise UserWarning(
-                "IEF must be saved to a specific filepath before simulate() can be called.",
-            )
+            msg = "IEF must be saved to a specific filepath before simulate() can be called."
+            raise UserWarning(msg)
         if precision.upper() == "DEFAULT":
             precision = "SINGLE"  # Defaults to single...
             for attr in dir(self):
@@ -489,9 +501,8 @@ class IEF(FMFile):
         else:
             _enginespath = enginespath
             if not Path(_enginespath).exists():
-                raise Exception(
-                    f"Flood Modeller non-default engine path not found! {str(_enginespath)}",
-                )
+                msg = f"Flood Modeller non-default engine path not found! {_enginespath!s}"
+                raise Exception(msg)
 
         if precision.upper() == "SINGLE":
             isis32_fp = str(Path(_enginespath, "ISISf32.exe"))
@@ -499,14 +510,15 @@ class IEF(FMFile):
             isis32_fp = str(Path(_enginespath, "ISISf32_DoubleP.exe"))
 
         if not Path(isis32_fp).exists():
-            raise Exception(f"Flood Modeller engine not found! Expected location: {isis32_fp}")
+            msg = f"Flood Modeller engine not found! Expected location: {isis32_fp}"
+            raise Exception(msg)
 
-        run_command = f'"{isis32_fp}" -sd "{self._filepath}"'
+        run_command = f'"{isis32_fp}" -sd "{self._filepath.resolve()}"'
 
         if method.upper() == "WAIT":
-            print("Executing simulation...")
+            logging.info("Executing simulation...")
             # execute simulation
-            process = Popen(run_command, cwd=os.path.dirname(self._filepath))
+            process = Popen(run_command, cwd=Path(self._filepath).parent)
 
             # progress bar based on log files
             steady = self.RunType == "Steady"
@@ -521,12 +533,12 @@ class IEF(FMFile):
 
             if result == 1 and raise_on_failure:
                 raise RuntimeError(summary)
-            print(summary)
+            logging.info(summary)
 
         elif method.upper() == "RETURN_PROCESS":
-            print("Executing simulation...")
+            logging.info("Executing simulation...")
             # execute simulation
-            return Popen(run_command, cwd=os.path.dirname(self._filepath))
+            return Popen(run_command, cwd=Path(self._filepath).parent)
 
         return None
 
@@ -553,7 +565,8 @@ class IEF(FMFile):
         result_path = self._get_result_filepath(suffix="zzn")
 
         if not result_path.exists():
-            raise FileNotFoundError("Simulation results file (zzn) not found")
+            msg = "Simulation results file (zzn) not found"
+            raise FileNotFoundError(msg)
 
         return ZZN(result_path)
 
@@ -565,7 +578,8 @@ class IEF(FMFile):
         """
 
         if not self._log_path.exists():
-            raise FileNotFoundError("Log file (LF1) not found")
+            msg = "Log file (LF1) not found"
+            raise FileNotFoundError(msg)
 
         steady = self.RunType == "Steady"
         return LF1(self._log_path, steady)
@@ -616,7 +630,8 @@ class IEF(FMFile):
             exy_path = self._filepath.with_suffix(".exy")
 
         if not exy_path.exists():
-            raise FileNotFoundError("Simulation results error log (.exy) not found")
+            msg = "Simulation results error log (.exy) not found"
+            raise FileNotFoundError(msg)
 
         exy_data = pd.read_csv(exy_path, names=["node", "timestep", "severity", "code", "summary"])
         exy_data["type"] = exy_data["code"].apply(
@@ -678,9 +693,8 @@ class FlowTimeProfile(Jsonable):
             self.profile = kwargs.get("profile", "")
             self.comment = kwargs.get("comment", "")
         else:
-            raise ValueError(
-                "You must provide either a single raw string argument or keyword arguments.",
-            )
+            msg = "You must provide either a single raw string argument or keyword arguments."
+            raise ValueError(msg)
 
         base_path = Path(kwargs.get("ief_filepath", ""))
         self._csvfile = (base_path / self.csv_filepath.strip('"')).resolve()

floodmodeller_api/ief_flags.py

@@ -1,6 +1,6 @@
 """
 Flood Modeller Python API
-Copyright (C) 2024 Jacobs U.K. Limited
+Copyright (C) 2025 Jacobs U.K. Limited
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

floodmodeller_api/inp.py

@@ -1,6 +1,6 @@
 """
 Flood Modeller Python API
-Copyright (C) 2024 Jacobs U.K. Limited
+Copyright (C) 2025 Jacobs U.K. Limited
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -20,7 +20,7 @@ from pathlib import Path
 
 from . import units
 from ._base import FMFile
-from .units.helpers import _to_str, join_n_char_ljust
+from .units._helpers import join_n_char_ljust, to_str
 from .urban1d import subsections
 from .urban1d.general_parameters import DEFAULT_OPTIONS
 from .util import handle_exception
@@ -59,8 +59,8 @@ class INP(FMFile):
 
     def _read(self):
         # Read INP file
-        with open(self._filepath) as inp_file:
-            self._raw_data = [line.rstrip("\n") for line in inp_file.readlines()]
+        with open(self._filepath, encoding=self.ENCODING) as inp_file:
+            self._raw_data = [line.rstrip("\n") for line in inp_file]
 
         # Generate INP file structure
         self._update_inp_struct()
@@ -129,9 +129,8 @@ class INP(FMFile):
         return "\n".join(self._raw_data) + "\n"
 
     def _create_from_blank(self):
-        raise NotImplementedError(
-            "Creating new 1D urban models (INP files) is not yet supported by floodmodeller_api, only existing models can be read",
-        )
+        msg = "Creating new 1D urban models (INP files) is not yet supported by floodmodeller_api, only existing models can be read"
+        raise NotImplementedError(msg)
 
     def _get_section_definitions(self):
         """Internal method used to get section definitions for each supported unit type and general parameters."""
@@ -159,7 +158,7 @@ class INP(FMFile):
                                 data = units.helpers.split_n_char(line, 21)
 
                                 # Set type to Float or Stirng, as appropirate.
-                                self.options[data[0].lower()] = _to_str(
+                                self.options[data[0].lower()] = to_str(
                                     data[1],
                                     None,
                                     check_float=True,
@@ -198,8 +197,6 @@ class INP(FMFile):
         in_block = False
         unit_block = {}
         for idx, line in enumerate(self._raw_data):
-            # TODO: Add functionality to compare first four characters only (alphanumeric) - need to consider names shorter than 4 characters, and those with _ within name
-
             # Check if subsection is known
             if line.upper() in subsections.ALL_SUBSECTIONS:
                 if in_block is True:

floodmodeller_api/logs/lf.py

@@ -1,6 +1,6 @@
 """
 Flood Modeller Python API
-Copyright (C) 2024 Jacobs U.K. Limited
+Copyright (C) 2025 Jacobs U.K. Limited
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -17,6 +17,7 @@ address: Jacobs UK Limited, Flood Modeller, Cottons Centre, Cottons Lane, London
 from __future__ import annotations
 
 import datetime as dt
+import logging
 import time
 from typing import TYPE_CHECKING
 
@@ -55,7 +56,7 @@ class LF(FMFile):
     def __init__(
         self,
         lf_filepath: str | Path | None,
-        data_to_extract: dict,
+        data_to_extract: dict[str, dict],
         steady: bool = False,
     ):
         FMFile.__init__(self, lf_filepath)
@@ -70,7 +71,7 @@ class LF(FMFile):
     def _read(self, force_reread: bool = False, suppress_final_step: bool = False):
         # Read LF file
         with open(self._filepath) as lf_file:
-            self._raw_data = [line.rstrip("\n") for line in lf_file.readlines()]
+            self._raw_data = [line.rstrip("\n") for line in lf_file]
 
         # Force rereading from start of file
         if force_reread is True:
@@ -140,17 +141,12 @@ class LF(FMFile):
     def _get_index(self):
         """Finds key and dataframe for variable that is the index"""
 
-        for key in self._data_to_extract:
-            try:
-                self._data_to_extract[key]["is_index"]
-                index_key = key
-                index_df = self._extracted_data[key].data.get_value()
-                return index_key, index_df
-
-            except KeyError:
-                pass
+        for k, v in self._data_to_extract.items():
+            if "is_index" in v:
+                return k, self._extracted_data[k].data.get_value()
 
-        raise Exception("No index variable found")
+        msg = "No index variable found"
+        raise Exception(msg)
 
     def _set_attributes(self):
         """Makes each Parser value an attribute; "last" values in dictionary"""
@@ -180,7 +176,7 @@ class LF(FMFile):
 
         delattr(self, "info")
 
-    def to_dataframe(self, *, include_tuflow: bool = False) -> pd.DataFrame:
+    def to_dataframe(self, variable: str = "all", *, include_tuflow: bool = False) -> pd.DataFrame:
         """Collects parameter values that change throughout simulation into a dataframe
 
         Args:
@@ -190,20 +186,23 @@ class LF(FMFile):
             pd.DataFrame: DataFrame of log file parameters indexed by simulation time (unsteady) or network iterations (steady)
         """
 
-        # TODO: make more like ZZN.to_dataframe
-
-        data_type_all = {
+        lf_df_data = {
             k: getattr(self, k)
             for k, v in self._data_to_extract.items()
-            if v["data_type"] == "all" and (include_tuflow or "tuflow" not in k)
+            if v["data_type"] == "all"  # with entries every iteration
+            and (include_tuflow or "tuflow" not in k)  # tuflow-related only if requested
+            and (variable in ("all", k, *v.get("subheaders", [])))  # if it or all are requested
         }
 
-        df = pd.concat(data_type_all, axis=1)
-        df.columns = df.columns.droplevel()
-
-        df.sort_index(inplace=True)
+        if lf_df_data == {}:
+            msg = f"No data extracted for variable '{variable}'"
+            raise ValueError(msg)
 
-        return df
+        lf_df = pd.concat(lf_df_data, axis=1)
+        lf_df.columns = lf_df.columns.droplevel()
+        if variable != "all":
+            lf_df = lf_df[variable]  # otherwise subheaders result in extra columns
+        return lf_df.sort_index()
 
     def _sync_cols(self):
         """Ensures Parser values (of type "all") have an entry each iteration"""
@@ -224,7 +223,7 @@ class LF(FMFile):
     def _print_no_lines(self):
         """Prints number of lines that have been read so far"""
 
-        print("Last line read: " + str(self._no_lines))
+        logging.info("Last line read: %s", self._no_lines)
 
     def report_progress(self) -> float:
         """Returns progress for unsteady simulations
@@ -323,7 +322,7 @@ def create_lf(filepath: Path, suffix: str) -> LF1 | LF2 | None:
     """Checks for a new log file, waiting for its creation if necessary"""
 
     def _no_log_file(reason: str) -> None:
-        print(f"No progress bar as {reason}. Simulation will continue as usual.")
+        logging.warning("No progress bar as %s. Simulation will continue as usual.", reason)
 
     # ensure progress bar is supported
     if suffix not in {"lf1", "lf2"}:
@@ -356,7 +355,7 @@ def create_lf(filepath: Path, suffix: str) -> LF1 | LF2 | None:
         last_modified = dt.datetime.fromtimestamp(last_modified_timestamp)
         time_diff_sec = (dt.datetime.now() - last_modified).total_seconds()
 
-        # it's old if it's over OLD_FILE seconds old (TODO: is this robust?)
+        # it's old if it's over OLD_FILE seconds old
         old_log_file = time_diff_sec > OLD_FILE
 
         # timeout

floodmodeller_api/logs/lf_helpers.py

@@ -1,6 +1,6 @@
 """
 Flood Modeller Python API
-Copyright (C) 2024 Jacobs U.K. Limited
+Copyright (C) 2025 Jacobs U.K. Limited
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -64,42 +64,40 @@ class AllData(Data):
         index_key: str | None = None,
         index_df: pd.Series | None = None,
     ) -> pd.DataFrame:
-        df = pd.DataFrame(self._value)
+        value_df = pd.DataFrame(self._value)
 
         # do nothing to empty dataframes
-        if df.empty:
-            return df
+        if value_df.empty:
+            return value_df
 
         # overall header
         if self._subheaders is None:
-            df.rename(columns={df.columns[0]: self.header}, inplace=True)
+            value_df = value_df.rename(columns={value_df.columns[0]: self.header})
 
         elif index_key is not None:
             # subheaders
-            df = df.set_axis(self._subheaders, axis=1)
+            value_df = value_df.set_axis(self._subheaders, axis=1)
 
             # remove duplicate of index
             # sometimes it includes extra values
             # it also has different precision
             index_duplicate = index_key + "_duplicate"
-            if index_duplicate in df.columns:
+            if index_duplicate in value_df.columns:
                 try:
-                    index_df = df[index_duplicate].dt.round("1s")
-                    df.drop(index_duplicate, axis=1, inplace=True)
+                    index_df = value_df[index_duplicate].dt.round("1s")
+                    value_df = value_df.drop(index_duplicate, axis=1)
                 except AttributeError:
-                    df = df.drop(columns=index_duplicate)
+                    value_df = value_df.drop(columns=index_duplicate)
 
         # there is no index because *this* is the index
         if index_key is None:
-            return df
+            return value_df
 
         # made lf index the dataframe index
-        df[index_key] = index_df
-        df.dropna(inplace=True)
-        df.drop_duplicates(subset=index_key, keep="last", inplace=True)
-        df.set_index(index_key, inplace=True)
-
-        return df
+        value_df[index_key] = index_df
+        value_df = value_df.dropna()
+        value_df = value_df.drop_duplicates(subset=index_key, keep="last")
+        return value_df.set_index(index_key)
 
 
 def data_factory(data_type: str, header: str, subheaders: list | None = None):
@@ -107,7 +105,8 @@ def data_factory(data_type: str, header: str, subheaders: list | None = None):
         return LastData(header, subheaders)
     if data_type == "all":
         return AllData(header, subheaders)
-    raise ValueError(f'Unexpected data "{data_type}"')
+    msg = f'Unexpected data "{data_type}"'
+    raise ValueError(msg)
 
 
 class State(ABC):
@@ -140,7 +139,8 @@ class SteadyState(State):
         pass
 
     def report_progress(self):
-        raise NotImplementedError("No progress reporting for steady simulations")
+        msg = "No progress reporting for steady simulations"
+        raise NotImplementedError(msg)
 
 
 def state_factory(steady: bool, extracted_data: Data) -> State:
@@ -264,7 +264,7 @@ class TimeDeltaSParser(Parser):
     def _process_line(self, raw: str) -> dt.timedelta:
         """Converts string S (with decimal place and "s") to timedelta"""
 
-        s = raw.split("s")[0]  # TODO: not necessary for simulation time
+        s = raw.split("s")[0]  # not necessary for simulation time
         return dt.timedelta(seconds=float(s))
 
 

floodmodeller_api/logs/lf_params.py

@@ -1,6 +1,6 @@
 """
 Flood Modeller Python API
-Copyright (C) 2024 Jacobs U.K. Limited
+Copyright (C) 2025 Jacobs U.K. Limited
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -390,10 +390,6 @@ lf1_steady_data_to_extract = {
     },
 }
 
-# TODO for LF2:
-# - "start" only works for v6
-# - what if there are multiple domains?
-
 lf2_data_to_extract = {
     # start
     "version": {

floodmodeller_api/mapping.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from . import DAT, IED, IEF, INP, LF1, LF2, XML2D, ZZN
@@ -14,12 +16,15 @@ from .units import (
     HTBDY,
     IIC,
     INTERPOLATE,
+    JUNCTION,
+    LATERAL,
     ORIFICE,
     OUTFALL,
     QHBDY,
     QTBDY,
     REFHBDY,
     REPLICATE,
+    RESERVOIR,
     RIVER,
     RNWEIR,
     SLUICE,
@@ -30,7 +35,8 @@ from .units import (
 )
 from .urban1d.conduits import CONDUIT as CONDUIT_URBAN
 from .urban1d.conduits import CONDUITS as CONDUITS_URBAN
-from .urban1d.junctions import JUNCTION, JUNCTIONS
+from .urban1d.junctions import JUNCTION as JUNCTION_URBAN
+from .urban1d.junctions import JUNCTIONS
 from .urban1d.losses import LOSS, LOSSES
 from .urban1d.outfalls import OUTFALL as OUTFALL_URBAN
 from .urban1d.outfalls import OUTFALLS as OUTFALLS_URBAN
@@ -49,7 +55,7 @@ api_class_mapping: dict[str, Any] = {
     "floodmodeller_api.zzn.ZZN": ZZN,
     "floodmodeller_api.backup.File": File,
     "floodmodeller_api.urban1d.junctions.JUNCTIONS": JUNCTIONS,
-    "floodmodeller_api.urban1d.junctions.JUNCTION": JUNCTION,
+    "floodmodeller_api.urban1d.junctions.JUNCTION": JUNCTION_URBAN,
     "floodmodeller_api.urban1d.outfalls.OUTFALLS": OUTFALLS_URBAN,
     "floodmodeller_api.urban1d.outfalls.OUTFALL": OUTFALL_URBAN,
     "floodmodeller_api.urban1d.raingauges.RAINGAUGES": RAINGAUGES,
@@ -66,6 +72,9 @@ api_class_mapping: dict[str, Any] = {
     "floodmodeller_api.units.boundaries.REFHBDY": REFHBDY,
     "floodmodeller_api.units.comment.COMMENT": COMMENT,
     "floodmodeller_api.units.conduits.CONDUIT": CONDUIT,
+    "floodmodeller_api.units.connectors.JUNCTION": JUNCTION,
+    "floodmodeller_api.units.connectors.LATERAL": LATERAL,
+    "floodmodeller_api.units.controls.RESERVOIR": RESERVOIR,
     "floodmodeller_api.units.iic.IIC": IIC,
     "floodmodeller_api.units.losses.BLOCKAGE": BLOCKAGE,
     "floodmodeller_api.units.losses.CULVERT": CULVERT,

floodmodeller_api/test/__init__.py

@@ -1,4 +1,4 @@
-import os
 import sys
+from pathlib import Path
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+sys.path.insert(0, str(Path(__file__).parent.parent))

floodmodeller_api/test/conftest.py

@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 from unittest.mock import patch
 
@@ -6,8 +5,8 @@ import pytest
 
 
 @pytest.fixture(scope="session")
-def test_workspace():
-    return Path(os.path.dirname(__file__), "test_data")
+def test_workspace() -> Path:
+    return Path(__file__).parent / "test_data"
 
 
 @pytest.fixture()

floodmodeller_api/test/test_backup.py

@@ -6,13 +6,13 @@ import pytest
 from floodmodeller_api.backup import BackupControl, File
 
 
-@pytest.fixture
+@pytest.fixture()
 def backup_control():
     # Use a different directory for testing
     return BackupControl()
 
 
-@pytest.fixture
+@pytest.fixture()
 def file(test_workspace):
     test_file = Path(test_workspace, "EX1.DAT")
     file = File(test_file)