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

climate_ref_core/exceptions.py

@@ -53,3 +53,17 @@ class ExecutionError(RefException):
 
     def __init__(self, message: str) -> None:
         super().__init__(message)
+
+
+class DiagnosticError(RefException):
+    """Error from diagnostic computing"""
+
+    def __init__(self, message: str, result: Any):
+        super().__init__(message)
+        self.message = message
+        self.result = result
+
+    # need for serialization of parsl
+    def __reduce__(self) -> tuple[type["DiagnosticError"], tuple[str, Any]]:
+        # Return a tuple: (callable, args_tuple_for_reconstruction)
+        return (self.__class__, (self.message, self.result))

climate_ref_core/executor.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 from loguru import logger
 
 from climate_ref_core.diagnostics import ExecutionDefinition, ExecutionResult
-from climate_ref_core.exceptions import InvalidExecutorException
+from climate_ref_core.exceptions import DiagnosticError, InvalidExecutorException
 from climate_ref_core.logging import redirect_logs
 
 if TYPE_CHECKING:
@@ -20,6 +20,7 @@ if TYPE_CHECKING:
 def execute_locally(
     definition: ExecutionDefinition,
     log_level: str,
+    raise_error: bool = False,
 ) -> ExecutionResult:
     """
     Run a diagnostic execution
@@ -46,10 +47,15 @@ def execute_locally(
 
         with redirect_logs(definition, log_level):
             return definition.diagnostic.run(definition=definition)
-    except Exception:
+    except Exception as e:
         # If the diagnostic fails, we want to log the error and return a failure result
         logger.exception(f"Error running {definition.execution_slug()!r}")
-        return ExecutionResult.build_from_failure(definition)
+        result = ExecutionResult.build_from_failure(definition)
+
+        if raise_error:
+            raise DiagnosticError(str(e), result) from e
+        else:
+            return result
 
 
 @runtime_checkable

climate_ref_core/providers.py

@@ -390,7 +390,13 @@ class CondaDiagnosticProvider(CommandLineDiagnosticProvider):
             If the command fails
 
         """
-        self.create_env()
+        if not self.env_path.exists():
+            msg = (
+                f"Conda environment for provider `{self.slug}` not available at "
+                f"{self.env_path}. Please install it by running the command "
+                f"`ref providers create-env --provider {self.slug}`"
+            )
+            raise RuntimeError(msg)
 
         cmd = [
             f"{self.get_conda_exe(update=False)}",

climate_ref_core/pycmec/controlled_vocabulary.py

@@ -4,14 +4,11 @@ from typing import Any
 from attrs import field, frozen, validators
 from cattrs import Converter, transform_error
 from loguru import logger
-from ruamel.yaml import YAML
+from yaml import safe_load
 
 from climate_ref_core.exceptions import ResultValidationError
 from climate_ref_core.pycmec.metric import CMECMetric
 
-yaml = YAML()
-
-
 RESERVED_DIMENSION_NAMES = {"attributes", "json_structure", "created_at", "updated_at", "value", "id"}
 """
 These names are reserved for internal use and should not be used as dimension names.
@@ -164,9 +161,9 @@ class CV:
 
         """
         convertor = Converter(forbid_extra_keys=True)
-        contents = yaml.load(pathlib.Path(filename))
 
         try:
+            contents = safe_load(pathlib.Path(filename).read_text(encoding="utf-8"))
             return convertor.structure(contents, CV)
         except Exception as exc:
             logger.error(f"Error loading CV from {filename}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-core
-Version: 0.6.0
+Version: 0.6.2
 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-Expression: Apache-2.0
@@ -26,9 +26,9 @@ 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: pyyaml>=6.0.2
 Requires-Dist: requests
 Requires-Dist: rich
-Requires-Dist: ruamel-yaml>=0.18
 Requires-Dist: setuptools>=75.8.0
 Requires-Dist: typing-extensions
 Description-Content-Type: text/markdown

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

@@ -4,21 +4,21 @@ climate_ref_core/dataset_registry.py,sha256=mkes7Pgz_zaS_t_BidiDzSd8dmqAvjx2Mlgo
 climate_ref_core/datasets.py,sha256=TK50WQwTfbase26s8wPEGEN1BwcedrOd8nk6IlEf3Ww,6124
 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
+climate_ref_core/exceptions.py,sha256=7Mkz22P-kbiL-ZevAhlOuQaaeTio6zpwE9YA45OTGvs,1909
+climate_ref_core/executor.py,sha256=QiVOca-d9JxKIktQIinQQYZGr3ecV5mL3nvUwCdMiJQ,5372
 climate_ref_core/logging.py,sha256=cg6CK2DHGjyLaoRJm75p-Ja82hnVhBBQ4riOKk3l9XY,7063
-climate_ref_core/providers.py,sha256=by_ZtoLQgg9A60CbFor2-i5EixtZTZ0z8jQqOGRfvA8,12461
+climate_ref_core/providers.py,sha256=Gq2RWBp_GJZG8tUMoRMVL-UJ_ugTYtvWHEqwMK9JHt8,12773
 climate_ref_core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 climate_ref_core/metric_values/__init__.py,sha256=aHfwRrqzLOmmaBKf1-4q97DnHb8KwmW0Dhwd79ZQiNQ,634
 climate_ref_core/metric_values/typing.py,sha256=2DpzmjqQ7tqOPAyjthZ_O14c0-MhiYt-A_n9p6-bOao,1903
 climate_ref_core/pycmec/README.md,sha256=PzkovlPpsXqFopsYzz5GRvCAipNRGO1Wo-0gc17qr2Y,36
 climate_ref_core/pycmec/__init__.py,sha256=hXvKGEJQWyAp1i-ndr3D4zuYxkRhcR2LfXgFXlhYOk4,28
-climate_ref_core/pycmec/controlled_vocabulary.py,sha256=ThdTBsSmUemyXSQG5RycN31qp93LfqIyPqvI8x5cdLI,5114
+climate_ref_core/pycmec/controlled_vocabulary.py,sha256=_GZ2Y6KAYF12I3IS27g8YdFBAcAONyGAhpucQ4oEcOA,5128
 climate_ref_core/pycmec/cv_cmip7_aft.yaml,sha256=gx5QyW88pZQVUfiYXmsJtJO6AJg6NbIZgdU4vDIa3fE,4390
 climate_ref_core/pycmec/metric.py,sha256=zymXoutnjbdcxvG_fMJugFLLcBrfSPG0XoV-2tA0ujA,18499
 climate_ref_core/pycmec/output.py,sha256=4-RQ439sfgNLeQZVDPB1pewF_kTwX7nCK0Z4U6bvbd0,5709
-climate_ref_core-0.6.0.dist-info/METADATA,sha256=pVHPIwK0q0j1KyG7ui9FeMa2wFLpoC8zWrBKJ58WG5c,2934
-climate_ref_core-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-climate_ref_core-0.6.0.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-climate_ref_core-0.6.0.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
-climate_ref_core-0.6.0.dist-info/RECORD,,
+climate_ref_core-0.6.2.dist-info/METADATA,sha256=TgifPLfIx9XtegPkLFv-aJ1MZuCr6xbMySuMuIaXYBU,2930
+climate_ref_core-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+climate_ref_core-0.6.2.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+climate_ref_core-0.6.2.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
+climate_ref_core-0.6.2.dist-info/RECORD,,