Merge pull request #840 from DHI/bug/transform_delete_incomplete_file

Delete incomplete file created by transform

Author: ecomodeller

mikeio/generic.py

@@ -1,41 +1,40 @@
 """Generic functions for working with all types of dfs files."""
 
 from __future__ import annotations
-from dataclasses import dataclass
+
 import math
 import operator
 import os
 import pathlib
+import warnings
+from collections.abc import Iterable, Sequence
 from copy import deepcopy
+from dataclasses import dataclass
 from datetime import datetime, timedelta
 from shutil import copyfile
-from collections.abc import Iterable, Sequence
 from typing import Callable, Mapping, Union
-import warnings
-
 
 import numpy as np
 import pandas as pd
 from mikecore.DfsBuilder import DfsBuilder
 from mikecore.DfsFile import (
     DfsDynamicItemInfo,
-    DfsFile,
-    DfsEqTimeAxis,
-    DfsNonEqTimeAxis,
     DfsEqCalendarAxis,
+    DfsEqTimeAxis,
+    DfsFile,
     DfsNonEqCalendarAxis,
+    DfsNonEqTimeAxis,
     TimeAxisType,
 )
 from mikecore.DfsFileFactory import DfsFileFactory
 from mikecore.eum import eumQuantity
 from tqdm import tqdm, trange
 
+import mikeio
 
 from . import __dfs_version__
 from .dfs._dfs import _get_item_info, _valid_item_numbers
-from .eum import ItemInfo, EUMType, EUMUnit
-import mikeio
-
+from .eum import EUMType, EUMUnit, ItemInfo
 
 TimeAxis = Union[
     DfsEqTimeAxis, DfsNonEqTimeAxis, DfsEqCalendarAxis, DfsNonEqCalendarAxis
@@ -1129,6 +1128,8 @@ def transform(
                 except KeyError as e:
                     missing_key = e.args[0]
                     keys = ", ".join(data.keys())
+                    dfs.Close()
+                    pathlib.Path(outfilename).unlink()
                     raise KeyError(
                         f"Item '{missing_key}' is not available in the file. Available items: {keys}"
                     )

tests/test_generic.py

@@ -1,22 +1,24 @@
 from pathlib import Path
+
 import numpy as np
 import pandas as pd
+import pytest
+from mikecore.DfsFileFactory import DfsFileFactory
+
 import mikeio
 from mikeio import generic
 from mikeio.generic import (
-    scale,
+    DerivedItem,
+    add,
+    avg_time,
+    change_datatype,
     diff,
-    sum,
     extract,
-    avg_time,
     fill_corrupt,
-    add,
-    change_datatype,
+    scale,
+    sum,
     transform,
-    DerivedItem,
 )
-import pytest
-from mikecore.DfsFileFactory import DfsFileFactory
 
 
 def test_add_constant(tmp_path: Path) -> None:
@@ -733,11 +735,14 @@ def test_transform_can_include_existing_items(tmp_path: Path) -> None:
     assert ds["Current Speed"].values == pytest.approx(0.13128172)
 
 
-def test_transform_func_with_missing_item_reports_existing_items() -> None:
+def test_transform_func_with_missing_item_reports_existing_items(
+    tmp_path: Path,
+) -> None:
     infilename = "tests/testdata/oresundHD_run1.dfsu"
-    outfilename = "notgonnahappen.dfsu"
+    outfilename = tmp_path / "notgonnahappen.dfsu"
 
     items = [DerivedItem(name="Not relevant", func=lambda x: x["not in the file"])]
     with pytest.raises(KeyError) as excinfo:
         transform(infilename, outfilename, items)
     assert "U velocity" in str(excinfo.value)
+    assert not outfilename.exists()