climate-ref-core 0.6.3__tar.gz → 0.6.4__tar.gz

{climate_ref_core-0.6.3 → climate_ref_core-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-core
-Version: 0.6.3
+Version: 0.6.4
 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 → climate_ref_core-0.6.4}/pyproject.toml

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

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

@@ -52,7 +52,7 @@ class TestMetricsProvider:
         assert isinstance(result, Diagnostic)
 
 
-@pytest.mark.parametrize("fqn", ["climate_ref_esmvaltool.provider", "climate_ref_esmvaltool"])
+@pytest.mark.parametrize("fqn", ["climate_ref_esmvaltool:provider", "climate_ref_esmvaltool"])
 def test_import_provider(fqn):
     provider = import_provider(fqn)
 
@@ -63,21 +63,21 @@ def test_import_provider(fqn):
 
 def test_import_provider_missing():
     fqn = "climate_ref"
-    match = f"Invalid provider: '{fqn}'\n Provider 'provider' not found in climate_ref"
+    match = f"Invalid provider: '{fqn}.provider'\n Provider not found in module"
     with pytest.raises(InvalidProviderException, match=match):
         import_provider(fqn)
 
-    fqn = "climate_ref.datasets.WrongProvider"
-    match = f"Invalid provider: '{fqn}'\n Provider 'WrongProvider' not found in climate_ref.datasets"
+    fqn = "climate_ref.datasets:WrongProvider"
+    match = f"Invalid provider: '{fqn}'\n Provider not found in module"
     with pytest.raises(InvalidProviderException, match=match):
         import_provider(fqn)
 
-    fqn = "missing.local.WrongProvider"
-    match = f"Invalid provider: '{fqn}'\n Module 'missing.local' not found"
+    fqn = "missing.local:WrongProvider"
+    match = f"Invalid provider: '{fqn}'\n Module not found"
     with pytest.raises(InvalidProviderException, match=match):
         import_provider(fqn)
 
-    fqn = "climate_ref.__version__"
+    fqn = "climate_ref:__version__"
     match = f"Invalid provider: '{fqn}'\n Expected DiagnosticProvider, got <class 'str'>"
     with pytest.raises(InvalidProviderException, match=match):
         import_provider(fqn)