Fix suffix check (#90)

* Use Path.with_suffix() instead of custom function

* Update SMDA testdata uuids to uuid4

* Revert: smda uuid changes

src/fmu/sumo/sim2sumo/common.py

@@ -567,25 +567,3 @@ def give_name(datafile_path: str) -> str:
         base_name = base_name[:-1]
     logger.info("Returning name %s", base_name)
     return base_name
-
-
-def fix_suffix(datafile_path: str, suffix=".DATA"):
-    """Check if suffix is .DATA, if not change to
-
-    Args:
-        datafile_path (PosixPath): path to check
-        suffix (str): desired suffix
-
-    Returns:
-        str: the corrected path
-    """
-    logger = logging.getLogger(__file__ + ".fix_suffix")
-    string_datafile_path = str(datafile_path)
-    assert "." in suffix, f"suffix: needs to start with . (is {suffix})"
-    if "." not in string_datafile_path:
-        string_datafile_path += suffix
-    if not string_datafile_path.endswith(suffix):
-        corrected_path = re.sub(r"\..*", suffix, string_datafile_path)
-        logger.debug("Changing %s to %s", string_datafile_path, corrected_path)
-        datafile_path = corrected_path
-    return datafile_path

src/fmu/sumo/sim2sumo/grid3d.py

@@ -6,6 +6,7 @@
    3. Uploads to Sumo
 """
 import logging
+from pathlib import Path
 import re
 from datetime import datetime
 
@@ -21,7 +22,6 @@
     generate_meta,
     convert_to_bytestring,
     convert_2_sumo_file,
-    fix_suffix,
 )
 
 
@@ -355,9 +355,10 @@ def upload_simulation_run(datafile, config, dispatcher):
         datafile (str): path to datafile
     """
     logger = logging.getLogger(__name__ + ".upload_simulation_run")
-    init_path = fix_suffix(datafile, ".INIT")
-    restart_path = fix_suffix(datafile, ".UNRST")
-    grid_path = fix_suffix(datafile, ".EGRID")
+    datafile_path = Path(datafile)
+    init_path = datafile_path.with_suffix(".INIT")
+    restart_path = datafile_path.with_suffix(".UNRST")
+    grid_path = datafile_path.with_suffix(".EGRID")
     egrid = Grid(grid_path)
     xtgeoegrid = grid_from_file(grid_path)
     # grid_exp_path = export_object(

tests/test_functions.py

@@ -21,7 +21,6 @@
     nodisk_upload,
     Dispatcher,
     find_datefield,
-    find_datafile_paths,
     find_datafiles_no_seedpoint,
     filter_options,
 )
@@ -31,7 +30,7 @@
     convert_to_arrow,
     SUBMODULES,
 )
-from fmu.sumo.sim2sumo.common import fix_suffix, get_case_uuid
+from fmu.sumo.sim2sumo.common import get_case_uuid
 from fmu.sumo.uploader import SumoConnection
 
 REEK_ROOT = Path(__file__).parent / "data/reek"
@@ -183,13 +182,6 @@ def test_find_datefield(datestring):
     print(results)
 
 
-def test_fix_suffix():
-
-    test_path = "simulator.banana"
-    corrected_path = fix_suffix(test_path)
-    assert corrected_path.endswith(".DATA"), f"Didn't correct {corrected_path}"
-
-
 def test_get_case_uuid(case_uuid, scratch_files, monkeypatch):
     real0 = scratch_files[0]