climate-ref-core 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

climate_ref_core/constraints.py

@@ -200,17 +200,27 @@ class AddSupplementaryDataset:
         for facet, values in supplementary_facets.items():
             mask = supplementary_group[facet].isin(values)
             supplementary_group = supplementary_group[mask]
-
-        if not supplementary_group.empty and self.optional_matching_facets:
-            facets = list(self.matching_facets + self.optional_matching_facets)
+        if not supplementary_group.empty:
+            matching_facets = list(self.matching_facets)
+            facets = matching_facets + list(self.optional_matching_facets)
             datasets = group[facets].drop_duplicates()
             indices = set()
             for i in range(len(datasets)):
-                scores = (supplementary_group[facets] == datasets.iloc[i]).sum(axis=1)
-                matches = supplementary_group[scores == scores.max()]
-                # Select the latest version if there are multiple matches
-                matches = matches[matches["version"] == matches["version"].max()]
-                indices.add(matches.index[0])
+                dataset = datasets.iloc[i]
+                # Restrict the supplementary datasets to those that match the main dataset.
+                supplementaries = supplementary_group[
+                    (supplementary_group[matching_facets] == dataset[matching_facets]).all(1)
+                ]
+                if not supplementaries.empty:
+                    # Select the best matching supplementary dataset based on the optional matching facets.
+                    scores = (supplementaries[facets] == dataset).sum(axis=1)
+                    matches = supplementaries[scores == scores.max()]
+                    if "version" in facets:
+                        # Select the latest version if there are multiple matches
+                        matches = matches[matches["version"] == matches["version"].max()]
+                    # Select one match per dataset
+                    indices.add(matches.index[0])
+
             supplementary_group = supplementary_group.loc[list(indices)].drop_duplicates()
 
         return pd.concat([group, supplementary_group])

climate_ref_core/providers.py

@@ -136,7 +136,7 @@ def import_provider(fqn: str) -> DiagnosticProvider:
     fqn
         Full package and attribute name of the provider to import
 
-        For example: `climate_ref_example.provider` will use the `provider` attribute from the
+        For example: `climate_ref_example:provider` will use the `provider` attribute from the
         `climate_ref_example` package.
 
         If only a package name is provided, the default attribute name is `provider`.
@@ -153,24 +153,22 @@ def import_provider(fqn: str) -> DiagnosticProvider:
     :
         DiagnosticProvider instance
     """
-    if "." in fqn:
-        module, name = fqn.rsplit(".", 1)
-    else:
-        module = fqn
-        name = "provider"
+    if ":" not in fqn:
+        fqn = f"{fqn}:provider"
+
+    entrypoint = importlib.metadata.EntryPoint(name="provider", value=fqn, group="climate-ref.providers")
 
     try:
-        imp = importlib.import_module(module)
-        provider = getattr(imp, name)
+        provider = entrypoint.load()
         if not isinstance(provider, DiagnosticProvider):
             raise InvalidProviderException(fqn, f"Expected DiagnosticProvider, got {type(provider)}")
         return provider
     except ModuleNotFoundError:
         logger.error(f"Module '{fqn}' not found")
-        raise InvalidProviderException(fqn, f"Module '{module}' not found")
+        raise InvalidProviderException(fqn, "Module not found")
     except AttributeError:
         logger.error(f"Provider '{fqn}' not found")
-        raise InvalidProviderException(fqn, f"Provider '{name}' not found in {module}")
+        raise InvalidProviderException(fqn, "Provider not found in module")
 
 
 class CommandLineDiagnosticProvider(DiagnosticProvider):

{climate_ref_core-0.6.3.dist-info → climate_ref_core-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-core
-Version: 0.6.3
+Version: 0.6.5
 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.3.dist-info → climate_ref_core-0.6.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 climate_ref_core/__init__.py,sha256=MtmPThF2F9_2UODEN6rt1x30LDxrHIZ0wyRN_wsHx5I,127
-climate_ref_core/constraints.py,sha256=QOqMh5jDBxdWTnQw2HNBizJQDF6Uu97rfJp9WudQWHc,11819
+climate_ref_core/constraints.py,sha256=ocduDnuhTbOeX6hstWMFfcHvdguEI-5BE24QRKlbgK0,12399
 climate_ref_core/dataset_registry.py,sha256=sQp2VT9xSVAaWsf0tF4E_VQxuEsvIxU2MZm5uNX1ynw,7172
 climate_ref_core/datasets.py,sha256=TK50WQwTfbase26s8wPEGEN1BwcedrOd8nk6IlEf3Ww,6124
 climate_ref_core/diagnostics.py,sha256=5KCtHuhToSpATqjW4HBi56PsOxT5WX4VkqoZPUvYR60,18769
@@ -7,7 +7,7 @@ climate_ref_core/env.py,sha256=Ph2dejVxTELfP3bL0xES086WLGvV5H6KvsOwCkL6m-k,753
 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=Gq2RWBp_GJZG8tUMoRMVL-UJ_ugTYtvWHEqwMK9JHt8,12773
+climate_ref_core/providers.py,sha256=HZTpz1VFa9yZLPr1Cwofag2TCuwn6P4VPOrBaXbhn0A,12746
 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
@@ -17,8 +17,8 @@ climate_ref_core/pycmec/controlled_vocabulary.py,sha256=_GZ2Y6KAYF12I3IS27g8YdFB
 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.3.dist-info/METADATA,sha256=e7WO6GoHzqhWcieMV3t0TlIXJkJVnVI9EfLtM9wr_9k,2930
-climate_ref_core-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-climate_ref_core-0.6.3.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-climate_ref_core-0.6.3.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
-climate_ref_core-0.6.3.dist-info/RECORD,,
+climate_ref_core-0.6.5.dist-info/METADATA,sha256=cZdSd_IyqVtP1L8EJAtvTKNpqjruVVf2yx5fjL3puSs,2930
+climate_ref_core-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+climate_ref_core-0.6.5.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+climate_ref_core-0.6.5.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
+climate_ref_core-0.6.5.dist-info/RECORD,,