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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-core
-Version: 0.6.0
+Version: 0.6.1
 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

{climate_ref_core-0.6.0 → climate_ref_core-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-core"
-version = "0.6.0"
+version = "0.6.1"
 description = "Core library for the CMIP Rapid Evaluation Framework"
 readme = "README.md"
 authors = [

{climate_ref_core-0.6.0 → climate_ref_core-0.6.1}/src/climate_ref_core/exceptions.py

@@ -53,3 +53,11 @@ 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.result = result

{climate_ref_core-0.6.0 → climate_ref_core-0.6.1}/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