climate-ref-core 0.6.0__tar.gz → 0.6.2__tar.gz

{climate_ref_core-0.6.0 → climate_ref_core-0.6.2}/PKG-INFO

@@ -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 → climate_ref_core-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-core"
-version = "0.6.0"
+version = "0.6.2"
 description = "Core library for the CMIP Rapid Evaluation Framework"
 readme = "README.md"
 authors = [
@@ -36,8 +36,8 @@ dependencies = [
     "rich",
     "loguru>=0.7.0",
     "pooch>=1.8.0,<2",
-    "ruamel.yaml>=0.18",
     "environs>=11",
+    "pyyaml>=6.0.2",
     # Not used directly, but required to support some installations
     "setuptools>=75.8.0",
 

{climate_ref_core-0.6.0 → climate_ref_core-0.6.2}/src/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-0.6.0 → climate_ref_core-0.6.2}/src/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-0.6.0 → climate_ref_core-0.6.2}/src/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-0.6.0 → climate_ref_core-0.6.2}/src/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 → climate_ref_core-0.6.2}/tests/unit/test_providers.py

@@ -256,9 +256,12 @@ class TestCondaMetricsProvider:
 
         assert f"Environment at {env_path} already exists, skipping." in caplog.text
 
-    def test_run(self, mocker, tmp_path, provider):
+    @pytest.mark.parametrize("env_exists", [True, False])
+    def test_run(self, mocker, tmp_path, provider, env_exists):
         conda_exe = tmp_path / "conda" / "micromamba"
         env_path = provider.prefix / "mock-env"
+        if env_exists:
+            env_path.mkdir(parents=True)
 
         mocker.patch.object(
             CondaDiagnosticProvider,
@@ -284,18 +287,25 @@ class TestCondaMetricsProvider:
             create_autospec=True,
         )
 
-        provider.run(["mock-command"])
-
-        run.assert_called_with(
-            [
-                f"{conda_exe}",
-                "run",
-                "--prefix",
-                f"{env_path}",
-                "mock-command",
-            ],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            text=True,
-        )
+        if not env_exists:
+            with pytest.raises(
+                RuntimeError,
+                match=(f"Conda environment for provider `{provider.slug}` not available at {env_path}."),
+            ):
+                provider.run(["mock-command"])
+        else:
+            provider.run(["mock-command"])
+
+            run.assert_called_with(
+                [
+                    f"{conda_exe}",
+                    "run",
+                    "--prefix",
+                    f"{env_path}",
+                    "mock-command",
+                ],
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                text=True,
+            )