Pass test

Author: znichollscr

src/input4mips_validation/cvs/drs.py

@@ -38,9 +38,9 @@
 from pathlib import Path
 
 import cftime
+import iris
 import numpy as np
 import pandas as pd
-import xarray as xr
 from attrs import frozen
 from typing_extensions import TypeAlias
 
@@ -51,6 +51,11 @@
     infer_time_start_time_end_for_filename,
 )
 from input4mips_validation.serialisation import converter_json
+from input4mips_validation.xarray_helpers.iris import ds_from_iris_cubes
+from input4mips_validation.xarray_helpers.variables import (
+    XRVariableHelper,
+    XRVariableProcessorLike,
+)
 
 DATA_REFERENCE_SYNTAX_FILENAME: str = "input4MIPs_DRS.json"
 """Default name of the file in which the data reference syntax is saved"""
@@ -539,6 +544,7 @@ def validate_file_written_according_to_drs(
         file: Path,
         frequency_metadata_keys: FrequencyMetadataKeys = FrequencyMetadataKeys(),
         time_dimension: str = "time",
+        xr_variable_processor: XRVariableProcessorLike = XRVariableHelper(),
     ) -> None:
         """
         Validate that a file is correctly written in the DRS
@@ -554,6 +560,9 @@ def validate_file_written_according_to_drs(
         time_dimension
             The time dimension of the data
 
+        xr_variable_processor
+            Helper to use for processing the variables in xarray objects.
+
         Raises
         ------
         ValueError
@@ -570,7 +579,12 @@ def validate_file_written_according_to_drs(
             file.name
         )
 
-        ds = xr.open_dataset(file, use_cftime=True)
+        ds = ds_from_iris_cubes(
+            iris.load(file),
+            xr_variable_processor=xr_variable_processor,
+            raw_file=file,
+            time_dimension=time_dimension,
+        )
         comparison_metadata = {
             k: apply_known_replacements(v)
             for k, v in ds.attrs.items()

src/input4mips_validation/validation/database.py

@@ -183,6 +183,7 @@ def get_validate_database_file_entry_result(  # noqa: PLR0913
         Path(entry.filepath),
         frequency_metadata_keys=frequency_metadata_keys,
         time_dimension=time_dimension,
+        xr_variable_processor=xr_variable_processor,
     )
 
     # TODO: all references to external variables (like cell areas) can be resolved

src/input4mips_validation/validation/tree.py

@@ -480,6 +480,7 @@ def get_validate_tree_result(  # noqa: PLR0913
                 file,
                 frequency_metadata_keys=frequency_metadata_keys,
                 time_dimension=time_dimension,
+                xr_variable_processor=xr_variable_processor,
             )
 
         # TODO: check cross references in files to external variables