climate-ref-pmp 0.5.2__tar.gz → 0.5.4__tar.gz

{climate_ref_pmp-0.5.2 → climate_ref_pmp-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-pmp
-Version: 0.5.2
+Version: 0.5.4
 Summary: PMP diagnostic provider for the Rapid Evaluation Framework
 Author-email: Jiwoo Lee <jwlee@llnl.gov>
 License: Apache-2.0

{climate_ref_pmp-0.5.2 → climate_ref_pmp-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-pmp"
-version = "0.5.2"
+version = "0.5.4"
 description = "PMP diagnostic provider for the Rapid Evaluation Framework"
 readme = "README.md"
 authors = [

{climate_ref_pmp-0.5.2 → climate_ref_pmp-0.5.4}/src/climate_ref_pmp/diagnostics/annual_cycle.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-from collections.abc import Iterable
 from typing import Any
 
 from loguru import logger
@@ -82,21 +81,6 @@ class AnnualCycle(CommandLineDiagnostic):
         self.parameter_file_1 = "pmp_param_annualcycle_1-clims.py"
         self.parameter_file_2 = "pmp_param_annualcycle_2-metrics.py"
 
-    def build_cmd(self, definition: ExecutionDefinition) -> Iterable[str]:
-        """
-        Build the command to run the diagnostic
-
-        Parameters
-        ----------
-        definition
-            Definition of the diagnostic execution
-
-        Returns
-        -------
-            Command arguments to execute in the PMP environment
-        """
-        raise NotImplementedError("Function not required")
-
     def build_cmds(self, definition: ExecutionDefinition) -> list[list[str]]:
         """
         Build the command to run the diagnostic
@@ -283,7 +267,7 @@ class AnnualCycle(CommandLineDiagnostic):
             cmec_metric_bundle=cmec_metric_bundle,
         )
 
-    def run(self, definition: ExecutionDefinition) -> ExecutionResult:
+    def execute(self, definition: ExecutionDefinition) -> None:
         """
         Run the diagnostic on the given configuration.
 
@@ -302,8 +286,6 @@ class AnnualCycle(CommandLineDiagnostic):
         runs = [self.provider.run(cmd) for cmd in cmds]
         logger.debug(f"runs: {runs}")
 
-        return self.build_execution_result(definition)
-
 
 def _transform_results(data: dict[str, Any]) -> dict[str, Any]:
     """
@@ -312,7 +294,7 @@ def _transform_results(data: dict[str, Any]) -> dict[str, Any]:
     Parameters
     ----------
     data : dict
-        The original executions dictionary.
+        The original execution dictionary.
 
     Returns
     -------

{climate_ref_pmp-0.5.2 → climate_ref_pmp-0.5.4}/src/climate_ref_pmp/diagnostics/variability_modes.py

@@ -32,6 +32,7 @@ class ExtratropicalModesOfVariability(CommandLineDiagnostic):
     )
 
     def __init__(self, mode_id: str):
+        super().__init__()
         self.mode_id = mode_id.upper()
         self.name = f"Extratropical modes of variability: {mode_id}"
         self.slug = f"extratropical-modes-of-variability-{mode_id.lower()}"

climate_ref_pmp-0.5.4/tests/integration/test_diagnostics.py

@@ -0,0 +1,23 @@
+import pytest
+from climate_ref_pmp import provider as pmp_provider
+
+from climate_ref_core.diagnostics import Diagnostic
+
+diagnostics = [pytest.param(diagnostic, id=diagnostic.slug) for diagnostic in pmp_provider.diagnostics()]
+
+
+@pytest.mark.slow
+@pytest.mark.parametrize("diagnostic", diagnostics)
+def test_diagnostics(diagnostic: Diagnostic, diagnostic_validation):
+    validator = diagnostic_validation(diagnostic)
+
+    definition = validator.get_definition()
+    validator.execute(definition)
+
+
+@pytest.mark.parametrize("diagnostic", diagnostics)
+def test_build_results(diagnostic: Diagnostic, diagnostic_validation):
+    validator = diagnostic_validation(diagnostic)
+
+    definition = validator.get_regression_definition()
+    validator.validate(definition)

{climate_ref_pmp-0.5.2 → climate_ref_pmp-0.5.4}/tests/unit/test_annual_cycle.py

@@ -2,7 +2,6 @@ import datetime
 
 import pandas as pd
 import pytest
-from attr import evolve
 from climate_ref_pmp import AnnualCycle
 from climate_ref_pmp import provider as pmp_provider
 from climate_ref_pmp.pmp_driver import _get_resource
@@ -186,7 +185,7 @@ def test_annual_cycle_diagnostic(
     ]
 
 
-def test_diagnostic_run(mocker, provider):
+def test_diagnostic_execute(mocker, provider):
     diagnostic = AnnualCycle()
     diagnostic.provider = provider
 
@@ -200,36 +199,7 @@ def test_diagnostic_run(mocker, provider):
     diagnostic.build_cmds = mocker.MagicMock(return_value=[["mocked_command"], ["mocked_command_2"]])
     diagnostic.build_execution_result = mocker.MagicMock()
 
-    diagnostic.run("definition")
+    diagnostic.execute("definition")
 
     diagnostic.build_cmds.assert_called_once_with("definition")
     assert diagnostic.provider.run.call_count == 2
-    diagnostic.build_execution_result.assert_called_once_with("definition")
-
-
-def test_build_cmd_raises():
-    diagnostic = AnnualCycle()
-    with pytest.raises(NotImplementedError):
-        diagnostic.build_cmd("definition")
-
-
-def test_diagnostic_build_result(config, provider, execution_regression_dir, data_catalog):
-    diagnostic = AnnualCycle()
-    diagnostic.provider = pmp_provider
-    diagnostic.provider.configure(config)
-
-    key = "cmip6_hist-GHG_r1i1p1f1_ACCESS-ESM1-5_ts__pmp-climatology_ERA-5_ts"
-    output_directory = execution_regression_dir(diagnostic, key)
-
-    execution = next(
-        solve_executions(
-            data_catalog=data_catalog,
-            diagnostic=diagnostic,
-            provider=diagnostic.provider,
-        )
-    )
-    definition = execution.build_execution_definition(output_root=config.paths.scratch)
-    definition = evolve(definition, output_directory=output_directory)
-
-    result = diagnostic.build_execution_result(definition)
-    assert result.successful

{climate_ref_pmp-0.5.2 → climate_ref_pmp-0.5.4}/tests/unit/test_variability_modes.py

@@ -2,8 +2,6 @@ import shutil
 
 import pandas as pd
 import pytest
-from attr import evolve
-from climate_ref_pmp import provider as pmp_provider
 from climate_ref_pmp.diagnostics import ExtratropicalModesOfVariability
 from climate_ref_pmp.pmp_driver import _get_resource
 
@@ -118,31 +116,3 @@ def test_mode_id_invalid():
     with pytest.raises(ValueError) as excinfo:
         ExtratropicalModesOfVariability("INVALID")
     assert "Unknown mode_id 'INVALID'" in str(excinfo.value)
-
-
-@pytest.mark.parametrize(
-    "mode",
-    sorted(
-        set(ExtratropicalModesOfVariability.psl_modes + ExtratropicalModesOfVariability.ts_modes) - {"AMO"}
-    ),
-)
-def test_diagnostic_build_result(mode, config, provider, execution_regression_dir, data_catalog):
-    diagnostic = ExtratropicalModesOfVariability(mode)
-    diagnostic.provider = pmp_provider
-    diagnostic.provider.configure(config)
-
-    execution = next(
-        solve_executions(
-            data_catalog=data_catalog,
-            diagnostic=diagnostic,
-            provider=diagnostic.provider,
-        )
-    )
-    definition = execution.build_execution_definition(output_root=config.paths.scratch)
-    output_directory = execution_regression_dir(diagnostic, definition.key)
-    assert output_directory.exists()
-
-    definition = evolve(definition, output_directory=output_directory)
-
-    result = diagnostic.build_execution_result(definition)
-    assert result.successful

climate_ref_pmp-0.5.2/tests/integration/test_diagnostics.py

@@ -1,12 +0,0 @@
-import pytest
-from climate_ref_pmp import provider as pmp_provider
-
-from climate_ref_core.diagnostics import Diagnostic
-
-diagnostics = [pytest.param(diagnostic, id=diagnostic.slug) for diagnostic in pmp_provider.diagnostics()]
-
-
-@pytest.mark.slow
-@pytest.mark.parametrize("diagnostic", diagnostics)
-def test_diagnostics(diagnostic: Diagnostic, diagnostic_validation):
-    diagnostic_validation(diagnostic)