climate-ref-core 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

climate_ref_core/dataset_registry.py

@@ -148,7 +148,7 @@ class DatasetRegistryManager:
             path=pooch.os_cache(cache_name),
             base_url=base_url,
             version=version,
-            retry_if_failed=5,
+            retry_if_failed=10,
             env="REF_DATASET_CACHE_DIR",
         )
         registry.load_registry(str(importlib.resources.files(package) / resource))

climate_ref_core/diagnostics.py

@@ -5,7 +5,6 @@ Diagnostic interface
 from __future__ import annotations
 
 import pathlib
-from abc import abstractmethod
 from collections.abc import Iterable, Sequence
 from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 
@@ -438,12 +437,28 @@ class AbstractDiagnostic(Protocol):
     The provider that provides the diagnostic.
     """
 
-    def run(self, definition: ExecutionDefinition) -> ExecutionResult:
+    def execute(self, definition: ExecutionDefinition) -> None:
         """
-        Run the diagnostic on the given configuration.
+        Execute the diagnostic on the given configuration.
 
         The implementation of this method is left to the diagnostic providers.
+        The results should be written to the output directory of the execution definition.
+        These are later used to build the output bundle and the diagnostic bundle.
+
+        This may occur in a separate process (or python environment in the case of a `CommandLineDiagnostic`).
+
+        Parameters
+        ----------
+        definition
+            The configuration to run the diagnostic on.
+        """
+        ...
+
+    def build_execution_result(self, definition: ExecutionDefinition) -> ExecutionResult:
+        """
+        Build the result from running the diagnostic on the given configuration.
 
+        This can be replayed later to build the result from the output execution.
 
         Parameters
         ----------
@@ -455,6 +470,7 @@ class AbstractDiagnostic(Protocol):
         :
             The result of running the diagnostic.
         """
+        ...
 
 
 class Diagnostic(AbstractDiagnostic):
@@ -506,6 +522,24 @@ class Diagnostic(AbstractDiagnostic):
     def provider(self, value: DiagnosticProvider) -> None:
         self._provider = value
 
+    def run(self, definition: ExecutionDefinition) -> ExecutionResult:
+        """
+        Run the diagnostic on the given configuration.
+
+        This executes the diagnostic and builds the result from the output bundle.
+
+        Parameters
+        ----------
+        definition
+            The configuration to run the diagnostic on.
+        """
+        # Execute the diagnostic
+        # This may be run in a separate process (or python environment)
+        self.execute(definition)
+
+        # Build the result from the output bundle
+        return self.build_execution_result(definition)
+
 
 class CommandLineDiagnostic(Diagnostic):
     """
@@ -514,7 +548,6 @@ class CommandLineDiagnostic(Diagnostic):
 
     provider: CommandLineDiagnosticProvider
 
-    @abstractmethod
     def build_cmd(self, definition: ExecutionDefinition) -> Iterable[str]:
         """
         Build the command to run the diagnostic on the given configuration.
@@ -529,24 +562,9 @@ class CommandLineDiagnostic(Diagnostic):
         :
             A command that can be run with :func:`subprocess.run`.
         """
+        return []
 
-    @abstractmethod
-    def build_execution_result(self, definition: ExecutionDefinition) -> ExecutionResult:
-        """
-        Build the result from running the diagnostic on the given configuration.
-
-        Parameters
-        ----------
-        definition
-            The configuration to run the diagnostic on.
-
-        Returns
-        -------
-        :
-            The result of running the diagnostic.
-        """
-
-    def run(self, definition: ExecutionDefinition) -> ExecutionResult:
+    def execute(self, definition: ExecutionDefinition) -> None:
         """
         Run the diagnostic on the given configuration.
 
@@ -562,4 +580,3 @@ class CommandLineDiagnostic(Diagnostic):
         """
         cmd = self.build_cmd(definition)
         self.provider.run(cmd)
-        return self.build_execution_result(definition)

{climate_ref_core-0.5.2.dist-info → climate_ref_core-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-core
-Version: 0.5.2
+Version: 0.5.4
 Summary: Core library for the CMIP Rapid Evaluation Framework
 Author-email: Jared Lewis <jared.lewis@climate-resource.com>, Mika Pflueger <mika.pflueger@climate-resource.com>, Bouwe Andela <b.andela@esciencecenter.nl>, Jiwoo Lee <lee1043@llnl.gov>, Min Xu <xum1@ornl.gov>, Nathan Collier <collierno@ornl.gov>, Dora Hegedus <dora.hegedus@stfc.ac.uk>
 License: Apache-2.0
@@ -18,11 +18,15 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Requires-Dist: attrs>=23.2.0
+Requires-Dist: environs>=11
+Requires-Dist: loguru>=0.7.0
 Requires-Dist: numpy>=1.25.0
 Requires-Dist: pandas>=2.1.0
+Requires-Dist: pooch<2,>=1.8.0
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: requests
 Requires-Dist: rich
+Requires-Dist: ruamel-yaml>=0.18
 Requires-Dist: typing-extensions
 Description-Content-Type: text/markdown
 

{climate_ref_core-0.5.2.dist-info → climate_ref_core-0.5.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 climate_ref_core/__init__.py,sha256=MtmPThF2F9_2UODEN6rt1x30LDxrHIZ0wyRN_wsHx5I,127
 climate_ref_core/constraints.py,sha256=QOqMh5jDBxdWTnQw2HNBizJQDF6Uu97rfJp9WudQWHc,11819
-climate_ref_core/dataset_registry.py,sha256=kVfVxJoOOAdvrBfNZuOvGGi0UWIcl2QpDPmM5ej-7aU,5103
+climate_ref_core/dataset_registry.py,sha256=UU62h2xjt_K0Z8Md1uKsxJEvdsfv_fg6WfYRmtqcZks,5104
 climate_ref_core/datasets.py,sha256=bX86XPD1Z5zl3E4_56zUU9cjwNOdurU-HiYx7h1PmN4,6191
-climate_ref_core/diagnostics.py,sha256=yGqZgavupeA3cQYegO54NpbX4OuO80aR37LBRHQwfNk,17995
+climate_ref_core/diagnostics.py,sha256=5KCtHuhToSpATqjW4HBi56PsOxT5WX4VkqoZPUvYR60,18769
 climate_ref_core/env.py,sha256=Ph2dejVxTELfP3bL0xES086WLGvV5H6KvsOwCkL6m-k,753
 climate_ref_core/exceptions.py,sha256=psdipWURLyMq5hmloGxt-8kyqEe0IsENfraok7KTi8I,1437
 climate_ref_core/executor.py,sha256=NIXIU2rwMnTOR-ztlPlCD-poZO4vxzKQPWYk8veTVkk,5195
@@ -17,8 +17,8 @@ climate_ref_core/pycmec/controlled_vocabulary.py,sha256=xio_4jl6mM_WMrwyxo70d0G5
 climate_ref_core/pycmec/cv_cmip7_aft.yaml,sha256=FflwP71JFdnp-N5_OQ9_g4KE_I16fxn1Zn96yybenW4,2706
 climate_ref_core/pycmec/metric.py,sha256=XXM5DMk0BhpKcPvvCHCcgA6jKoVGMqXcwiG1UerYYps,18181
 climate_ref_core/pycmec/output.py,sha256=4-RQ439sfgNLeQZVDPB1pewF_kTwX7nCK0Z4U6bvbd0,5709
-climate_ref_core-0.5.2.dist-info/METADATA,sha256=n7tyqfzcB2_vOBfLiey8kGXzD3vEZ4PNUS5p11nx64Q,2700
-climate_ref_core-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-climate_ref_core-0.5.2.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-climate_ref_core-0.5.2.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
-climate_ref_core-0.5.2.dist-info/RECORD,,
+climate_ref_core-0.5.4.dist-info/METADATA,sha256=-U-9rs_xmyD3sgOzP7RcOq5c15Bk5dUz7zOMQnLlXLY,2821
+climate_ref_core-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+climate_ref_core-0.5.4.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+climate_ref_core-0.5.4.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
+climate_ref_core-0.5.4.dist-info/RECORD,,