climate-ref 0.6.5__py3-none-any.whl → 0.7.0__py3-none-any.whl

climate_ref/cli/providers.py

@@ -7,14 +7,12 @@ from typing import Annotated
 import pandas as pd
 import typer
 from loguru import logger
-from rich.console import Console
 
 from climate_ref.cli._utils import pretty_print_df
 from climate_ref.provider_registry import ProviderRegistry
 from climate_ref_core.providers import CondaDiagnosticProvider, DiagnosticProvider
 
 app = typer.Typer(help=__doc__)
-console = Console()
 
 
 @app.command(name="list")
@@ -24,6 +22,7 @@ def list_(ctx: typer.Context) -> None:
     """
     config = ctx.obj.config
     db = ctx.obj.database
+    console = ctx.obj.console
     provider_registry = ProviderRegistry.build_from_config(config, db)
 
     def get_env(provider: DiagnosticProvider) -> str:

climate_ref/config.py

@@ -364,10 +364,10 @@ class Config:
     - `complete`: Use the complete parser, which parses the dataset based on all available metadata.
     """
 
-    paths: PathConfig = Factory(PathConfig)  # noqa
-    db: DbConfig = Factory(DbConfig)  # noqa
-    executor: ExecutorConfig = Factory(ExecutorConfig)  # noqa
-    diagnostic_providers: list[DiagnosticProviderConfig] = Factory(default_providers)  # noqa
+    paths: PathConfig = Factory(PathConfig)
+    db: DbConfig = Factory(DbConfig)
+    executor: ExecutorConfig = Factory(ExecutorConfig)
+    diagnostic_providers: list[DiagnosticProviderConfig] = Factory(default_providers)  # noqa: RUF009, RUF100
     _raw: TOMLDocument | None = field(init=False, default=None, repr=False)
     _config_file: Path | None = field(init=False, default=None, repr=False)
 

climate_ref/database.py

@@ -8,6 +8,7 @@ The `Database` class is the main entry point for interacting with the database.
 It provides a session object that can be used to interact with the database and run queries.
 """
 
+import enum
 import importlib.resources
 import shutil
 from datetime import datetime
@@ -23,6 +24,7 @@ from loguru import logger
 from sqlalchemy.orm import Session
 
 from climate_ref.models import MetricValue, Table
+from climate_ref.models.execution import ExecutionOutput
 from climate_ref_core.pycmec.controlled_vocabulary import CV
 
 if TYPE_CHECKING:
@@ -135,6 +137,16 @@ def validate_database_url(database_url: str) -> str:
     return database_url
 
 
+class ModelState(enum.Enum):
+    """
+    State of a model instance
+    """
+
+    CREATED = "created"
+    UPDATED = "updated"
+    DELETED = "deleted"
+
+
 class Database:
     """
     Manage the database connection and migrations
@@ -234,11 +246,57 @@ class Database:
         # This will add new columns to the db if the CVs have changed
         MetricValue.register_cv_dimensions(cv)
 
+        # Register the CV dimensions with the ExecutionOutput model
+        # This enables dimension-based filtering of outputs
+        ExecutionOutput.register_cv_dimensions(cv)
+
         return db
 
+    def update_or_create(
+        self, model: type[Table], defaults: dict[str, Any] | None = None, **kwargs: Any
+    ) -> tuple[Table, ModelState | None]:
+        """
+        Update an existing instance or create a new one
+
+        This doesn't commit the transaction,
+        so you will need to call `session.commit()` after this method
+        or use a transaction context manager.
+
+        Parameters
+        ----------
+        model
+            The model to update or create
+        defaults
+            Default values to use when creating a new instance, or values to update on existing instance
+        kwargs
+            The filter parameters to use when querying for an instance
+
+        Returns
+        -------
+        :
+            A tuple containing the instance and a state enum indicating if the instance was created or updated
+        """
+        instance = self.session.query(model).filter_by(**kwargs).first()
+        state: ModelState | None = None
+        if instance:
+            # Update existing instance with defaults
+            if defaults:
+                for key, value in defaults.items():
+                    if getattr(instance, key) != value:
+                        logger.debug(f"Updating {model.__name__} {key} to {value}")
+                        setattr(instance, key, value)
+                        state = ModelState.UPDATED
+            return instance, state
+        else:
+            # Create new instance
+            params = {**kwargs, **(defaults or {})}
+            instance = model(**params)
+            self.session.add(instance)
+            return instance, ModelState.CREATED
+
     def get_or_create(
         self, model: type[Table], defaults: dict[str, Any] | None = None, **kwargs: Any
-    ) -> tuple[Table, bool]:
+    ) -> tuple[Table, ModelState | None]:
         """
         Get or create an instance of a model
 
@@ -258,13 +316,13 @@ class Database:
         Returns
         -------
         :
-            A tuple containing the instance and a boolean indicating if the instance was created
+            A tuple containing the instance and enum indicating if the instance was created
         """
         instance = self.session.query(model).filter_by(**kwargs).first()
         if instance:
-            return instance, False
+            return instance, None
         else:
             params = {**kwargs, **(defaults or {})}
             instance = model(**params)
             self.session.add(instance)
-            return instance, True
+            return instance, ModelState.CREATED

climate_ref/dataset_registry/obs4ref_reference.txt

@@ -5,15 +5,6 @@ obs4REF/ColumbiaU/WECANN-1-0/mon/hfls/gn/20250516/hfls_mon_WECANN-1-0_REF_gn_200
 obs4REF/ColumbiaU/WECANN-1-0/mon/hfss/gn/20250516/hfss_mon_WECANN-1-0_REF_gn_200701-201512.nc md5:b7a911e0fc164d07d3ab42a86d09b18b
 obs4REF/ECMWF/ERA-20C/mon/psl/gn/v20210727/psl_mon_ERA-20C_PCMDI_gn_190001-201012.nc md5:c100cf25d5681c375cd6c1ee60b678ba
 obs4REF/ECMWF/ERA-20C/mon/ts/gn/v20210727/ts_mon_ERA-20C_PCMDI_gn_190001-201012.nc md5:9ed8dfbb805ed4caa282ed70f873a3a0
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_200701-200712.nc md5:695633a2b401cfb66c8addbf58073dbc
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_200801-200812.nc md5:404f1e1f111859be06c00bcb8d740ff2
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_200901-200912.nc md5:a1bb8584d60cdd71154c01a692fa1fb4
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_201001-201012.nc md5:b78016a3c61d99dc0fd29563aa344ca1
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_201101-201112.nc md5:d64c231a7f798a255997ffe196613ea1
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_201201-201212.nc md5:7d90ce60b872dc4f044b9b0101114983
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_201301-201312.nc md5:2fc032707cb8a31ac60fa4abe9efe183
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_201401-201412.nc md5:6022d17e11df7818f5b0429d6e401d17
-obs4REF/ECMWF/ERA-5/mon/ta/gn/v20250220/ta_mon_ERA-5_PCMDI_gn_201501-201512.nc md5:c68fdabf6eeb4813befceace089c9494
 obs4REF/ECMWF/ERA-INT/mon/hfls/gn/v20210727/hfls_mon_ERA-INT_PCMDI_gn_197901-201903.nc md5:1ae4587143f05ee81432b3d9960aab63
 obs4REF/ECMWF/ERA-INT/mon/hfss/gn/v20210727/hfss_mon_ERA-INT_PCMDI_gn_197901-201903.nc md5:261f02b8cbce18486548882a11f9aa34
 obs4REF/ECMWF/ERA-INT/mon/hur/gn/v20210727/hur_mon_ERA-INT_PCMDI_gn_198901-201001.nc md5:56fcd2df8ed2879f18b5e8c78134a148