Merge pull request #161 from bird-house/add-cf-and-data-options

Add CFcompliance and data_validation to the process options

finch/processes/utils.py

@@ -45,7 +45,7 @@
 RequestInputs = Dict[str, Deque[PywpsInput]]
 
 # These are parameters that set options. They are not `compute` arguments.
-INDICATOR_OPTIONS = ['check_missing', 'missing_options']
+INDICATOR_OPTIONS = ['check_missing', 'missing_options', "cf_compliance", "data_validation"]
 
 
 def log_file_path(process: Process) -> Path:

finch/processes/wps_bccaqv2_heatwave.py

@@ -44,8 +44,13 @@ def __init__(self):
         inputs = [
             i
             for i in self.indices_process.inputs
-            if i.identifier not in ["tasmin", "tasmax"]
+            if i.identifier not in ["tasmin", "tasmax", "data_validation"]
         ]
+
+        # For BCCAQv2, relaxe data validation strictness.
+        data_valid = wpsio.data_validation.clone()
+        data_valid.data = 'warn'
+
         inputs += [
             wpsio.lon,
             wpsio.lat,
@@ -63,6 +68,7 @@ def __init__(self):
                 data_type="integer",
                 min_occurs=0,
             ),
+            data_valid,
             wpsio.output_format_netcdf_csv,
         ]
 

finch/processes/wps_xclim_indices.py

@@ -56,7 +56,13 @@ def __init__(self):
             wpsio.output_metalink,
         ]
 
-        common = [wpsio.check_missing, wpsio.missing_options, wpsio.variable_any]
+        common = [
+            wpsio.check_missing,
+            wpsio.missing_options,
+            wpsio.cf_compliance,
+            wpsio.data_validation,
+            wpsio.variable_any
+        ]
 
         super().__init__(
             self._handler,

finch/processes/wpsio.py

@@ -6,7 +6,15 @@
 
 from pywps import FORMATS, ComplexInput, ComplexOutput, LiteralInput
 from pywps.inout.literaltypes import AnyValue
-from xclim.core.options import CHECK_MISSING, MISSING_METHODS, MISSING_OPTIONS, OPTIONS
+from xclim.core.options import (
+    CHECK_MISSING,
+    CF_COMPLIANCE,
+    DATA_VALIDATION,
+    _LOUDNESS_OPTIONS,
+    MISSING_METHODS,
+    MISSING_OPTIONS,
+    OPTIONS
+)
 
 from .constants import ALL_24_MODELS, ALLOWED_MODEL_NAMES
 from .utils import PywpsInput, PywpsOutput
@@ -186,6 +194,27 @@ def copy_io(
     abstract="JSON representation of dictionary of missing method parameters.",
     default=json.dumps(OPTIONS[MISSING_OPTIONS][OPTIONS[CHECK_MISSING]]),
     supported_formats=[FORMATS.JSON],
+    min_occurs=0,
+)
+
+
+cf_compliance = LiteralInput(
+    "cf_compliance",
+    "Strictness level for CF-compliance input checks.",
+    abstract="Whether to log, warn or raise when inputs have non-CF-compliant attributes.",
+    data_type="string",
+    default=OPTIONS[CF_COMPLIANCE],
+    allowed_values=['log', 'warn', 'raise'],
+)
+
+
+data_validation = LiteralInput(
+    "data_validation",
+    "Strictness level for data validation input checks.",
+    abstract="Whether to log, warn or raise when inputs fail data validation checks.",
+    data_type="string",
+    default=OPTIONS[DATA_VALIDATION],
+    allowed_values=['log', 'warn', 'raise'],
 )
 
 

tests/test_wps_xclim_indices.py

@@ -36,6 +36,8 @@ def test_indicators_processes_discovery(indicator):
     parameters = set([k for k in sig.parameters.keys() if k != "phase"])
     parameters.add("check_missing")
     parameters.add("missing_options")
+    parameters.add("cf_compliance")
+    parameters.add("data_validation")
     parameters.add("variable")
     if "indexer" in parameters:
         parameters.remove("indexer")