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

climate_ref_core/dataset_registry.py

@@ -142,7 +142,7 @@ class DatasetRegistryManager:
             This defaults to the value of `name` if not provided.
         """
         if cache_name is None:
-            cache_name = "ref"
+            cache_name = "climate_ref"
 
         registry = pooch.create(
             path=pooch.os_cache(cache_name),

climate_ref_core/datasets.py

@@ -11,6 +11,16 @@ from typing import Any, Self
 import pandas as pd
 from attrs import field, frozen
 
+Selector = tuple[tuple[str, str], ...]
+"""
+Type describing the key used to identify a group of datasets
+
+This is a tuple of tuples, where each inner tuple contains a metadata and dimension value
+that was used to group the datasets together.
+
+This type must be hashable, as it is used as a key in a dictionary.
+"""
+
 
 class SourceDatasetType(enum.Enum):
     """
@@ -76,6 +86,23 @@ class FacetFilter:
     """
 
 
+def sort_selector(inp: Selector) -> Selector:
+    """
+    Sort the selector by key
+
+    Parameters
+    ----------
+    inp
+        Selector to sort
+
+    Returns
+    -------
+    :
+        Sorted selector
+    """
+    return tuple(sorted(inp, key=lambda x: x[0]))
+
+
 @frozen
 class DatasetCollection:
     """
@@ -83,15 +110,33 @@ class DatasetCollection:
     """
 
     datasets: pd.DataFrame
+    """
+    DataFrame containing the datasets that were selected for the execution.
+
+    The columns in this dataframe depend on the source dataset type, but always include:
+    * path
+    * [slug_column]
+    """
     slug_column: str
     """
     Column in datasets that contains the unique identifier for the dataset
     """
-    selector: tuple[tuple[str, str], ...] = ()
+    selector: Selector = field(converter=sort_selector, factory=tuple)
     """
     Unique key, value pairs that were selected during the initial groupby
     """
 
+    def selector_dict(self) -> dict[str, str]:
+        """
+        Convert the selector to a dictionary
+
+        Returns
+        -------
+        :
+            Dictionary of the selector
+        """
+        return {key: value for key, value in self.selector}
+
     def __getattr__(self, item: str) -> Any:
         return getattr(self.datasets, item)
 
@@ -155,3 +200,19 @@ class ExecutionDatasetCollection:
         hash_sum = sum(hash(item) for item in self._collection.values())
         hash_bytes = hash_sum.to_bytes(16, "little", signed=True)
         return hashlib.sha1(hash_bytes).hexdigest()  # noqa: S324
+
+    @property
+    def selectors(self) -> dict[str, Selector]:
+        """
+        Collection of selectors used to identify the datasets
+
+        These are the key, value pairs that were selected during the initial group-by,
+        for each data requirement.
+        """
+        # The "value" of SourceType is used here so this can be stored in the db
+        s = {}
+        for source_type in SourceDatasetType.ordered():
+            if source_type not in self._collection:
+                continue
+            s[source_type.value] = self._collection[source_type].selector
+        return s

climate_ref_core/diagnostics.py

@@ -14,6 +14,7 @@ from attrs import field, frozen
 
 from climate_ref_core.constraints import GroupConstraint
 from climate_ref_core.datasets import ExecutionDatasetCollection, FacetFilter, SourceDatasetType
+from climate_ref_core.metric_values import SeriesMetricValue
 from climate_ref_core.pycmec.metric import CMECMetric
 from climate_ref_core.pycmec.output import CMECOutput
 
@@ -61,6 +62,11 @@ class ExecutionDefinition:
     for a specific set of datasets fulfilling the requirements.
     """
 
+    diagnostic: Diagnostic
+    """
+    The diagnostic that is being executed
+    """
+
     key: str
     """
     The unique identifier for the datasets in the diagnostic execution group.
@@ -85,6 +91,12 @@ class ExecutionDefinition:
     Root directory for storing the output of the diagnostic execution
     """
 
+    def execution_slug(self) -> str:
+        """
+        Get a slug for the execution
+        """
+        return f"{self.diagnostic.full_slug()}/{self.key}"
+
     def to_output_path(self, filename: pathlib.Path | str | None) -> pathlib.Path:
         """
         Get the absolute path for a file in the output directory
@@ -170,7 +182,11 @@ class ExecutionResult:
     """
     Whether the diagnostic execution ran successfully.
     """
-    # Log info is in the output bundle file already, but is definitely useful
+
+    series: Sequence[SeriesMetricValue] = field(factory=tuple)
+    """
+    A collection of series metric values that were extracted from the execution.
+    """
 
     @staticmethod
     def build_from_output_bundle(
@@ -426,7 +442,7 @@ class AbstractDiagnostic(Protocol):
         """
         Run the diagnostic on the given configuration.
 
-        The implementation of this method method is left to the diagnostic providers.
+        The implementation of this method is left to the diagnostic providers.
 
 
         Parameters

climate_ref_core/exceptions.py

@@ -46,3 +46,10 @@ class ConstraintNotSatisfied(RefException):
 
 class ResultValidationError(RefException):
     """Exception raised when the executions from a diagnostic are invalid"""
+
+
+class ExecutionError(RefException):
+    """Exception raised when an execution fails"""
+
+    def __init__(self, message: str) -> None:
+        super().__init__(message)

climate_ref_core/executor.py

@@ -2,20 +2,54 @@
 Executor interface for running diagnostics
 """
 
+import importlib
+import shutil
 from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 
-from climate_ref_core.diagnostics import Diagnostic, ExecutionDefinition
-from climate_ref_core.providers import DiagnosticProvider
+from loguru import logger
+
+from climate_ref_core.diagnostics import ExecutionDefinition, ExecutionResult
+from climate_ref_core.exceptions import InvalidExecutorException
+from climate_ref_core.logging import redirect_logs
 
 if TYPE_CHECKING:
+    # TODO: break this import cycle and move it into the execution definition
     from climate_ref.models import Execution
 
-EXECUTION_LOG_FILENAME = "out.log"
-"""
-Filename for the execution log.
 
-This file is written via [climate_ref_core.logging.redirect_logs][].
-"""
+def execute_locally(
+    definition: ExecutionDefinition,
+    log_level: str,
+) -> ExecutionResult:
+    """
+    Run a diagnostic execution
+
+    This is the chunk of work that should be executed by an executor.
+
+    Parameters
+    ----------
+    definition
+        A description of the information needed for this execution of the diagnostic
+    log_level
+        The log level to use for the execution
+    """
+    logger.info(f"Executing {definition.execution_slug()!r}")
+
+    try:
+        if definition.output_directory.exists():
+            logger.warning(
+                f"Output directory {definition.output_directory} already exists. "
+                f"Removing the existing directory."
+            )
+            shutil.rmtree(definition.output_directory)
+        definition.output_directory.mkdir(parents=True, exist_ok=True)
+
+        with redirect_logs(definition, log_level):
+            return definition.diagnostic.run(definition=definition)
+    except Exception:
+        # 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)
 
 
 @runtime_checkable
@@ -37,8 +71,6 @@ class Executor(Protocol):
 
     def run(
         self,
-        provider: DiagnosticProvider,
-        diagnostic: Diagnostic,
         definition: ExecutionDefinition,
         execution: "Execution | None" = None,
     ) -> None:
@@ -55,10 +87,6 @@ class Executor(Protocol):
 
         Parameters
         ----------
-        provider
-            Provider of the diagnostic
-        diagnostic
-            Diagnostic to run
         definition
             Definition of the information needed to execute a diagnostic
 
@@ -94,3 +122,46 @@ class Executor(Protocol):
         TimeoutError
             If the timeout is reached
         """
+
+
+def import_executor_cls(fqn: str) -> type[Executor]:
+    """
+    Import an executor using a fully qualified module path
+
+    Parameters
+    ----------
+    fqn
+        Full package and attribute name of the executor to import
+
+        For example: `climate_ref_example.executor` will use the `executor` attribute from the
+        `climate_ref_example` package.
+
+    Raises
+    ------
+    InvalidExecutorException
+        If the executor cannot be imported
+
+        If the executor isn't a valid `DiagnosticProvider`.
+
+    Returns
+    -------
+    :
+        Executor instance
+    """
+    module, attribute_name = fqn.rsplit(".", 1)
+
+    try:
+        imp = importlib.import_module(module)
+        executor: type[Executor] = getattr(imp, attribute_name)
+
+        # We can't really check if the executor is a subclass of Executor here
+        # Protocols can't be used with issubclass if they have non-method members
+        # We have to check this at class instantiation time
+
+        return executor
+    except ModuleNotFoundError:
+        logger.error(f"Package '{fqn}' not found")
+        raise InvalidExecutorException(fqn, f"Module '{module}' not found")
+    except AttributeError:
+        logger.error(f"Provider '{fqn}' not found")
+        raise InvalidExecutorException(fqn, f"Executor '{attribute_name}' not found in {module}")

climate_ref_core/logging.py

@@ -1,7 +1,7 @@
 """
 Logging utilities
 
-The REF uses [loguru](https://loguru.readthedocs.io/en/stable/), a simple logging framework
+The REF uses [loguru](https://loguru.readthedocs.io/en/stable/), a simple logging framework.
 """
 
 import contextlib
@@ -16,7 +16,13 @@ from loguru import logger
 from rich.pretty import pretty_repr
 
 from climate_ref_core.diagnostics import ExecutionDefinition
-from climate_ref_core.executor import EXECUTION_LOG_FILENAME
+
+EXECUTION_LOG_FILENAME = "out.log"
+"""
+Filename for the execution log.
+
+This file is written via [climate_ref_core.logging.redirect_logs][].
+"""
 
 
 class _InterceptHandler(logging.Handler):
@@ -72,7 +78,7 @@ def add_log_handler(**kwargs: Any) -> None:
 
     # Track the current handler via custom attributes on the logger
     # This is a bit of a workaround because of loguru's super slim API that doesn't allow for
-    # modificiation of existing handlers.
+    # modification of existing handlers.
     logger.default_handler_id = handled_id  # type: ignore[attr-defined]
     logger.default_handler_kwargs = kwargs  # type: ignore[attr-defined]
 
@@ -88,7 +94,12 @@ def remove_log_handler() -> None:
     logger should be readded later
     """
     if hasattr(logger, "default_handler_id"):
-        logger.remove(logger.default_handler_id)
+        try:
+            logger.remove(logger.default_handler_id)
+        except ValueError:
+            # This can happen if the handler has already been removed
+            # or if the logger was never configured
+            pass
         del logger.default_handler_id
     else:
         raise AssertionError("No default log handler to remove.")
@@ -143,4 +154,4 @@ def redirect_logs(definition: ExecutionDefinition, log_level: str) -> Generator[
             add_log_handler(**logger.default_handler_kwargs)  # type: ignore[attr-defined]
 
 
-__all__ = ["add_log_handler", "capture_logging", "logger", "redirect_logs"]
+__all__ = ["EXECUTION_LOG_FILENAME", "add_log_handler", "capture_logging", "logger", "redirect_logs"]

climate_ref_core/metric_values/__init__.py

@@ -0,0 +1,16 @@
+"""
+Metric Values
+
+A metric is a single statistical evaluation contained within a diagnostic.
+A diagnostic may consist of more than one metric.
+
+Examples include bias, root mean squared error (RMSE), Earth Mover's Distance,
+phase/timing of the seasonal cycle, amplitude of the seasonal cycle, spatial or temporal correlations,
+interannual variability.
+Not all metrics are useful for all variables or should be used with every observationally constrained dataset.
+Each metric may be converted into a performance score.
+"""
+
+from .typing import ScalarMetricValue, SeriesMetricValue
+
+__all__ = ["ScalarMetricValue", "SeriesMetricValue"]

climate_ref_core/metric_values/typing.py

@@ -0,0 +1,74 @@
+from collections.abc import Sequence
+from typing import Self
+
+from pydantic import BaseModel, model_validator
+
+Value = float | int
+
+
+class SeriesMetricValue(BaseModel):
+    """
+    A 1-d array with an associated index and additional dimensions
+
+    These values are typically sourced from the CMEC metrics bundle
+    """
+
+    dimensions: dict[str, str]
+    """
+    Key, value pairs that identify the dimensions of the metric
+
+    These values are used for a faceted search of the metric values.
+    """
+    values: Sequence[Value]
+    """
+    A 1-d array of values
+    """
+    index: Sequence[str | Value]
+    """
+    A 1-d array of index values
+
+    Values must be strings or numbers and have the same length as values.
+    Non-unique index values are not allowed.
+    """
+
+    index_name: str
+    """
+    The name of the index.
+
+    This is used for presentation purposes and is not used in the controlled vocabulary.
+    """
+
+    attributes: dict[str, str | Value] | None = None
+    """
+    Additional unstructured attributes associated with the metric value
+    """
+
+    @model_validator(mode="after")
+    def validate_index_length(self) -> Self:
+        """Validate that index has the same length as values"""
+        if len(self.index) != len(self.values):
+            raise ValueError(
+                f"Index length ({len(self.index)}) must match values length ({len(self.values)})"
+            )
+        return self
+
+
+class ScalarMetricValue(BaseModel):
+    """
+    A scalar value with an associated dimensions
+    """
+
+    dimensions: dict[str, str]
+    """
+    Key, value pairs that identify the dimensions of the metric
+
+    These values are used for a faceted search of the metric values.
+    """
+    value: Value
+    """
+    A scalar value
+    """
+    attributes: dict[str, str | Value] | None = None
+    """
+    Additional unstructured attributes associated with the metric value
+    """

climate_ref_core/pycmec/cv_cmip7_aft.yaml

@@ -1,31 +1,82 @@
 dimensions:
-- name: model
-  long_name: model_id
-  description: ""
+- name: source_id
+  long_name: Source ID
+  description: "Source ID (e.g., GFDL-CM4)"
   allow_extra_values: true
   required: false
-- name: source_id
-  long_name: source_id
-  description: ""
+- name: reference_source_id
+  long_name: Reference Source ID
+  description: "Source ID of the reference dataset(e.g., HadISST)"
+  allow_extra_values: true
+  required: false
+- name: experiment_id
+  long_name: Experiment ID
+  description: "Experiment ID (e.g., historical, ssp585)"
+  allow_extra_values: true
+  required: false
+- name: variable_id
+  long_name: Variable
+  description: "Variable ID (e.g., tas, pr, etc.)"
+  allow_extra_values: true
+  required: false
+- name: reference_variable_id
+  long_name: Reference Variable
+  description: "Variable ID for the reference dataset (e.g., tas, pr, etc.)"
+  allow_extra_values: true
+  required: false
+- name: member_id
+  long_name: Member ID
+  description: "Unique identifier for each ensemble member, includes the variant label and sub-experiment if present"
   allow_extra_values: true
   required: false
 - name: variant_label
   long_name: Variant Label
-  description: ""
+  description: "Ensemble member (construct from realization, initialization, physics, and forcing indices)"
   allow_extra_values: true
   required: false
 - name: metric
-  long_name: ""
+  long_name: Metric
   description: ""
   required: true
   allow_extra_values: true
 - name: region
-  long_name: ""
-  description: ""
+  long_name: Region
+  description: "Part of the world from which the metric values are calculated. "
+  required: true
+  allow_extra_values: true
+  values:
+    - name: global
+      long_name: Global
+      description: "Global aggregate"
+      units: dimensionless
+- name: season
+  long_name: Season
+  description: "Parts of the year from which the metric values are calculated"
   required: true
   allow_extra_values: true
+  values:
+    - name: ann
+      long_name: Annual
+      description: ""
+      units: dimensionless
+    - name: djf
+      long_name: Dec,Jan,Feb
+      description: "December, January, February"
+      units: dimensionless
+    - name: mam
+      long_name: Mar,Apr,May
+      description: "March, April, May"
+      units: dimensionless
+    - name: jja
+      long_name: Jun,Jul,Aug
+      description: "June, July, August"
+      units: dimensionless
+    - name: son
+      long_name: Sep,Oct,Nov
+      description: "September, October, November"
+      units: dimensionless
 - name: statistic
-  long_name: ""
+  long_name: Statistic
   description: ""
   required: true
   allow_extra_values: true

climate_ref_core/pycmec/metric.py

@@ -13,11 +13,14 @@ Both ways will create the CMECMetric instance (cmec)
 
 import json
 import pathlib
+import warnings
 from collections import Counter
 from collections.abc import Generator
+from copy import deepcopy
 from enum import Enum
 from typing import Any, cast
 
+from loguru import logger
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -33,6 +36,11 @@ from pydantic.json_schema import GenerateJsonSchema, JsonSchemaMode, JsonSchemaV
 from pydantic_core import CoreSchema
 from typing_extensions import Self
 
+from climate_ref_core.env import env
+from climate_ref_core.metric_values import ScalarMetricValue
+
+ALLOW_EXTRA_KEYS = env.bool("ALLOW_EXTRA_KEYS", default=True)
+
 
 class MetricCV(Enum):
     """
@@ -58,9 +66,7 @@ class MetricDimensions(RootModel[Any]):
 
     root: dict[str, Any] = Field(
         default={
-            MetricCV.JSON_STRUCTURE.value: ["model", "metric"],
-            "model": {},
-            "metric": {},
+            MetricCV.JSON_STRUCTURE.value: [],
         }
     )
 
@@ -151,7 +157,7 @@ class MetricResults(RootModel[Any]):
     root: dict[str, dict[Any, Any]]
 
     @classmethod
-    def _check_nested_dict_keys(cls, nested: dict[Any, Any], metdims: dict[Any, Any], level: int = 0) -> None:
+    def _check_nested_dict_keys(cls, nested: dict[Any, Any], metdims: dict[Any, Any], level: int = 0) -> None:  # noqa: PLR0912
         dim_name = metdims[MetricCV.JSON_STRUCTURE.value][level]
 
         dict_keys = set(nested.keys())
@@ -183,7 +189,14 @@ class MetricResults(RootModel[Any]):
         else:
             expected_keys = set(metdims[dim_name].keys())
             if not (dict_keys.issubset(expected_keys)):
-                raise ValueError(f"Unknown dimension values: {dict_keys - expected_keys}")
+                msg = f"Unknown dimension values: {dict_keys - expected_keys} for {dim_name}"
+                logger.error(msg)
+                if not ALLOW_EXTRA_KEYS:  # pragma: no cover
+                    raise ValueError(f"{msg}\nExpected keys: {expected_keys}")
+                else:
+                    warnings.warn(msg)
+                    for key in dict_keys - expected_keys:
+                        nested.pop(key)
 
             tmp = dict(nested)
             if MetricCV.ATTRIBUTES.value in tmp:
@@ -202,7 +215,11 @@ class MetricResults(RootModel[Any]):
             # executions = rlt.root
             results = rlt
             metdims = info.context.root
-            cls._check_nested_dict_keys(results, metdims, level=0)
+            if len(metdims[MetricCV.JSON_STRUCTURE.value]) == 0:
+                if rlt != {}:
+                    raise ValueError("Expected an empty dictionary for the metric bundle")
+            else:
+                cls._check_nested_dict_keys(results, metdims, level=0)
 
         return rlt
 
@@ -211,19 +228,54 @@ class StrNumDict(RootModel[Any]):
     """A class contains string key and numeric value"""
 
     model_config = ConfigDict(strict=True)
-    root: dict[str, float | int | list[str | float | int]]
+    root: dict[str, float | int]
 
 
-class MetricValue(BaseModel):
+def remove_dimensions(raw_metric_bundle: dict[str, Any], dimensions: str | list[str]) -> dict[str, Any]:
     """
-    A flattened representation of a diagnostic value
-
-    This includes the dimensions and the value of the diagnostic
+    Remove the dimensions from the raw metric bundle
+
+    Currently only the first dimension is supported to be removed.
+    Multiple dimensions can be removed at once, but only if they are in order from the first
+    dimension.
+
+    Parameters
+    ----------
+    raw_metric_bundle
+        The raw metric bundle to be modified
+    dimensions
+        The name of the dimensions to be removed
+
+    Returns
+    -------
+        The new, modified metric bundle with the dimension removed
     """
+    if isinstance(dimensions, str):
+        dimensions = [dimensions]
+
+    metric_bundle = deepcopy(raw_metric_bundle)
+
+    for dim in dimensions:
+        # bundle_dims is modified inplace below
+        bundle_dims = metric_bundle[MetricCV.DIMENSIONS.value]
+
+        level_id = bundle_dims[MetricCV.JSON_STRUCTURE.value].index(dim)
+        if level_id != 0:
+            raise NotImplementedError("Only the first dimension can be removed")
+
+        values = list(bundle_dims[dim].keys())
+        if len(values) != 1:
+            raise ValueError(f"Can only remove dimensions with a single value. Found: {values}")
+        value = values[0]
 
-    dimensions: dict[str, str]
-    value: float | str
-    attributes: dict[str, str | float | int] | None = None
+        new_result = metric_bundle[MetricCV.RESULTS.value][value]
+
+        # Update the dimensions and results to remove the dimension
+        bundle_dims.pop(dim)
+        bundle_dims[MetricCV.JSON_STRUCTURE.value].pop(level_id)
+        metric_bundle[MetricCV.RESULTS.value] = new_result
+
+    return metric_bundle
 
 
 class CMECMetric(BaseModel):
@@ -376,6 +428,72 @@ class CMECMetric(BaseModel):
 
         return cls(DIMENSIONS=merged_obj_dims, RESULTS=merged_obj_rlts)
 
+    def remove_dimensions(self, dimensions: str | list[str]) -> "CMECMetric":
+        """
+        Remove the dimensions from the metric bundle
+
+         Currently only the first dimension is supported to be removed.
+        Multiple dimensions can be removed at once, but only if they are in order from the first
+        dimension..
+
+        Parameters
+        ----------
+        dimensions
+            The name of the dimension to be removed
+
+        Returns
+        -------
+        :
+            A new CMECMetric object with the dimensions removed
+        """
+        return CMECMetric(**remove_dimensions(self.model_dump(), dimensions))
+
+    def prepend_dimensions(self, values: dict[str, str]) -> "CMECMetric":
+        """
+        Prepend the existing metric values with additional dimensions
+
+        Parameters
+        ----------
+        values
+            Additional metric dimensions and their values to be added to the metric bundle
+
+        Returns
+        -------
+        :
+            A new CMECMetric object with the additional dimensions prepended to the existing metric bundle
+        """
+        results: dict[str, Any] = {}
+        current = results
+
+        existing_dimensions = self.DIMENSIONS.root[MetricCV.JSON_STRUCTURE.value]
+        for dim in existing_dimensions:
+            if dim in values:
+                raise ValueError(f"Dimension {dim!r} is already defined in the metric bundle")
+
+        dimensions = self.DIMENSIONS.model_copy(deep=True)
+        dimensions.root[MetricCV.JSON_STRUCTURE.value] = [
+            *list(values.keys()),
+            *existing_dimensions,
+        ]
+
+        # Nest each new dimension inside the previous one
+        for key, value in values.items():
+            if not isinstance(value, str):
+                raise TypeError(f"Dimension value {value!r} is not a string")
+
+            current[value] = {}
+            current = current[value]
+            dimensions.root[key] = {value: {}}
+        # Add the existing dimensions as the innermost dimensions
+        current.update(self.RESULTS)
+
+        MetricResults.model_validate(results, context=dimensions)
+
+        result = self.model_copy()
+        result.DIMENSIONS = dimensions
+        result.RESULTS = results
+        return result
+
     @staticmethod
     def create_template() -> dict[str, Any]:
         """
@@ -391,7 +509,7 @@ class CMECMetric(BaseModel):
             MetricCV.NOTES.value: None,
         }
 
-    def iter_results(self) -> Generator[MetricValue]:
+    def iter_results(self) -> Generator[ScalarMetricValue]:
         """
         Iterate over the executions in the diagnostic bundle
 
@@ -404,20 +522,24 @@ class CMECMetric(BaseModel):
         """
         dimensions = cast(list[str], self.DIMENSIONS[MetricCV.JSON_STRUCTURE.value])
 
+        if len(dimensions) == 0:
+            # There is no data to iterate over
+            return
+
         yield from _walk_results(dimensions, self.RESULTS, {})
 
 
 def _walk_results(
     dimensions: list[str], results: dict[str, Any], metadata: dict[str, str]
-) -> Generator[MetricValue]:
-    assert len(dimensions), "Not enough dimensions"  # noqa: S101
+) -> Generator[ScalarMetricValue]:
+    assert len(dimensions), "Not enough dimensions"
     dimension = dimensions[0]
     for key, value in results.items():
         if key == MetricCV.ATTRIBUTES.value:
             continue
         metadata[dimension] = key
-        if isinstance(value, str | float | int):
-            yield MetricValue(
+        if isinstance(value, float | int):
+            yield ScalarMetricValue(
                 dimensions=metadata, value=value, attributes=results.get(MetricCV.ATTRIBUTES.value)
             )
         else:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-core
-Version: 0.5.0
+Version: 0.5.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: Apache-2.0

climate_ref_core-0.5.2.dist-info/RECORD

@@ -0,0 +1,24 @@
+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/datasets.py,sha256=bX86XPD1Z5zl3E4_56zUU9cjwNOdurU-HiYx7h1PmN4,6191
+climate_ref_core/diagnostics.py,sha256=yGqZgavupeA3cQYegO54NpbX4OuO80aR37LBRHQwfNk,17995
+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/logging.py,sha256=EBe5WAk1dtosr8MLkG-i7iDNZTI9ufxI4xsvbq3Gdt8,5260
+climate_ref_core/providers.py,sha256=by_ZtoLQgg9A60CbFor2-i5EixtZTZ0z8jQqOGRfvA8,12461
+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=xio_4jl6mM_WMrwyxo70d0G5dUeIal4IW7eV-EMW4mU,5093
+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.0.dist-info/RECORD

@@ -1,22 +0,0 @@
-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=pUdfGkNfQEpgx4RYn5F_O0LQJp7R-lEWQY9bYFtenOo,5095
-climate_ref_core/datasets.py,sha256=CEyu3RM8dhtFEuC88nfQ61YfcuJbzflSso3aBHamVv4,4526
-climate_ref_core/diagnostics.py,sha256=q7sR_0RTYuNvdNjvOD8T5zhOuF6LQkDq2JWUUKvgshE,17614
-climate_ref_core/env.py,sha256=Ph2dejVxTELfP3bL0xES086WLGvV5H6KvsOwCkL6m-k,753
-climate_ref_core/exceptions.py,sha256=yFs7jWmnFlCYYLm5rWsqqa-JTQ44afqCR0uqqiq6ViM,1267
-climate_ref_core/executor.py,sha256=V4su108oR6FFHQM4aFlBvXAUYFoHMaEBSnqguhsVKhU,2780
-climate_ref_core/logging.py,sha256=WCAwbN6gGH-oNTFVYuDlitUf_eg3AU498dWHhXcMq1Q,4966
-climate_ref_core/providers.py,sha256=by_ZtoLQgg9A60CbFor2-i5EixtZTZ0z8jQqOGRfvA8,12461
-climate_ref_core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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=xio_4jl6mM_WMrwyxo70d0G5dUeIal4IW7eV-EMW4mU,5093
-climate_ref_core/pycmec/cv_cmip7_aft.yaml,sha256=Q_BYDlBclUpfm1XciwKZlRcR1E8YnuY7J4CUrpmXi7I,919
-climate_ref_core/pycmec/metric.py,sha256=sFzlUjXyMnINYXlS_46DgKqbiELIR_GSHm-qz7Jbwvk,13855
-climate_ref_core/pycmec/output.py,sha256=4-RQ439sfgNLeQZVDPB1pewF_kTwX7nCK0Z4U6bvbd0,5709
-climate_ref_core-0.5.0.dist-info/METADATA,sha256=fkVVeeEDT2y623QMbtQorg1GAZjXfYyyKotz0uHGGkk,2700
-climate_ref_core-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-climate_ref_core-0.5.0.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-climate_ref_core-0.5.0.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
-climate_ref_core-0.5.0.dist-info/RECORD,,