climate-ref-pmp 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

climate_ref_pmp/diagnostics/variability_modes.py

@@ -1,4 +1,6 @@
 from collections.abc import Iterable
+from pathlib import Path
+from typing import Any, Union
 
 from loguru import logger
 
@@ -171,6 +173,8 @@ class ExtratropicalModesOfVariability(CommandLineDiagnostic):
             logger.warning(f"A single cmec output file not found: {results_files}")
             return ExecutionResult.build_from_failure(definition)
 
+        clean_up_json(results_files[0])
+
         # Find the other outputs
         png_files = [definition.as_relative_path(f) for f in definition.output_directory.glob("*.png")]
         data_files = [definition.as_relative_path(f) for f in definition.output_directory.glob("*.nc")]
@@ -200,3 +204,63 @@ class ExtratropicalModesOfVariability(CommandLineDiagnostic):
             cmec_output_bundle=cmec_output_bundle,
             cmec_metric_bundle=cmec_metric_bundle,
         )
+
+
+def clean_up_json(json_file: Union[str, Path]) -> None:
+    """
+    Clean up the JSON file by removing unnecessary fields.
+
+    Parameters
+    ----------
+    json_file : str or Path
+        Path to the JSON file to clean up.
+    """
+    import json
+
+    with open(str(json_file)) as f:
+        data = json.load(f)
+
+    # Remove null values from the JSON data
+    data = remove_null_values(data)
+
+    with open(str(json_file), "w") as f:
+        json.dump(data, f, indent=4)
+
+    # Log the cleanup action
+    logger.debug(f"Cleaned up JSON file: {json_file}")
+    logger.info("JSON file cleaned up successfully.")
+
+
+def remove_null_values(data: Union[dict[Any, Any], list[Any], Any]) -> Union[dict[Any, Any], list[Any], Any]:
+    """
+    Recursively removes keys with null (None) values from a dictionary or list.
+
+    Parameters
+    ----------
+    data : dict, list, or Any
+        The JSON-like data structure to process. It can be a dictionary, a list,
+        or any other type of data.
+
+    Returns
+    -------
+    dict, list, or Any
+        A new data structure with null values removed. If the input is a dictionary,
+        keys with `None` values are removed. If the input is a list, items are
+        recursively processed to remove `None` values. For other types, the input
+        is returned unchanged.
+
+    Examples
+    --------
+    >>> data = {
+    ...     "key1": None,
+    ...     "key2": {"subkey1": 123, "subkey2": None},
+    ...     "key3": [None, 456, {"subkey3": None}],
+    ... }
+    >>> remove_null_values(data)
+    {'key2': {'subkey1': 123}, 'key3': [456, {}]}
+    """
+    if isinstance(data, dict):
+        return {key: remove_null_values(value) for key, value in data.items() if value is not None}
+    if isinstance(data, list):
+        return [remove_null_values(item) for item in data if item is not None]
+    return data

{climate_ref_pmp-0.6.0.dist-info → climate_ref_pmp-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-pmp
-Version: 0.6.0
+Version: 0.6.2
 Summary: PMP diagnostic provider for the Rapid Evaluation Framework
 Author-email: Jiwoo Lee <jwlee@llnl.gov>, Jared Lewis <jared.lewis@climate-resource.com>
 License-Expression: Apache-2.0

{climate_ref_pmp-0.6.0.dist-info → climate_ref_pmp-0.6.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ climate_ref_pmp/dataset_registry/pmp_climatology.txt,sha256=lruldzyr8fS79Tdg5RsI
 climate_ref_pmp/diagnostics/__init__.py,sha256=KmfWl_L0aeZE4KC_MhEQU-5n87BmZI40w5uvji8EZ-I,314
 climate_ref_pmp/diagnostics/annual_cycle.py,sha256=HVOg4lHJMsvS0gm6rW86FJOAiW8gZt-5UDzEC_6dbH4,11533
 climate_ref_pmp/diagnostics/enso.py,sha256=vk7w4waMFFfPtuq9BbCxwzGESCUXl_y-wXm38FdyBwM,9695
-climate_ref_pmp/diagnostics/variability_modes.py,sha256=IuedSZo8MB2Iqg3v3ZMj96eN-iZJ5YwrpwABmlRvjUc,7573
+climate_ref_pmp/diagnostics/variability_modes.py,sha256=tI6xcSZ57657ecHBOKcRUW_QLYwT3c2DqVeCesx5PI8,9521
 climate_ref_pmp/drivers/enso_driver.py,sha256=i5Wli5GktaH5jtTRMOmtR9ha9_xbJojoc8VoGK7Iueo,16910
 climate_ref_pmp/params/pmp_param_MoV-psl.py,sha256=cpQyro0UdVWxe7jREidEQdirjksIXc7lm3CIfefcz5I,2268
 climate_ref_pmp/params/pmp_param_MoV-ts.py,sha256=yfKs8qgsoaCmdRwDJWSZ3sy0GM_WsQrOde9d__iOo7I,2547
@@ -13,8 +13,8 @@ climate_ref_pmp/params/pmp_param_annualcycle_1-clims.py,sha256=P7DkL5wdtK9huQ9um
 climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py,sha256=JH9flUE9Ti-2bhCpDkDtmup1aD_7brHPqNSbc2-loF8,1655
 climate_ref_pmp/requirements/conda-lock.yml,sha256=MtIkAaUNMF3ADJvscGCk9GghyfseveFuNla9Zu4euDc,330345
 climate_ref_pmp/requirements/environment.yml,sha256=BNpqu73k6tlRBr92eYw_NfPls5jcAnJDkynvaYz074I,133
-climate_ref_pmp-0.6.0.dist-info/METADATA,sha256=JSY7uO7Fv4CBOnx_u0BDVR_MGOuJ4FqHLbcMILG574s,2733
-climate_ref_pmp-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-climate_ref_pmp-0.6.0.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-climate_ref_pmp-0.6.0.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
-climate_ref_pmp-0.6.0.dist-info/RECORD,,
+climate_ref_pmp-0.6.2.dist-info/METADATA,sha256=LVWuXJMKSZy6GZb2a357dKIYMz_L42UgtaoRUECJEGw,2733
+climate_ref_pmp-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+climate_ref_pmp-0.6.2.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+climate_ref_pmp-0.6.2.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
+climate_ref_pmp-0.6.2.dist-info/RECORD,,