pheval 0.5.7__tar.gz → 0.5.8__tar.gz

{pheval-0.5.7 → pheval-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pheval
-Version: 0.5.7
+Version: 0.5.8
 Summary: 
 Author: Yasemin Bridges
 Author-email: y.bridges@qmul.ac.uk

{pheval-0.5.7 → pheval-0.5.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pheval"
-version = "0.5.7"
+version = "0.5.8"
 description = ""
 authors = ["Yasemin Bridges <y.bridges@qmul.ac.uk>",
   "Julius Jacobsen <j.jacobsen@qmul.ac.uk>",

{pheval-0.5.7 → pheval-0.5.8}/src/pheval/implementations/__init__.py

@@ -4,6 +4,7 @@ from functools import cache
 
 from class_resolver import ClassResolver
 
+from pheval.implementations.pheval_class_resolver import PhevalClassResolver
 from pheval.runners.runner import PhEvalRunner
 
 
@@ -14,9 +15,11 @@ def get_implementation_resolver() -> ClassResolver[PhEvalRunner]:
     Returns:
         ClassResolver[PhEvalRunner]: _description_
     """
-    implementation_resolver: ClassResolver[PhEvalRunner] = ClassResolver.from_subclasses(
-        PhEvalRunner,
-        suffix="Implementation",
+    implementation_resolver: PhevalClassResolver[PhEvalRunner] = (
+        PhevalClassResolver.from_subclasses(
+            PhEvalRunner,
+            suffix="Implementation",
+        )
     )
 
     # implementation_resolver.synonyms.update(
@@ -34,5 +37,6 @@ def get_implementation_resolver() -> ClassResolver[PhEvalRunner]:
     # See also:
     # https://packaging.python.org/en/latest/specifications/entry-points/
     # https://class-resolver.readthedocs.io/en/latest/api/class_resolver.ClassResolver.html#class_resolver.ClassResolver.register_entrypoint
+
     implementation_resolver.register_entrypoint("pheval.plugins")
     return implementation_resolver

pheval-0.5.8/src/pheval/implementations/pheval_class_resolver.py

@@ -0,0 +1,40 @@
+# Dependencies taken from class_resolver:
+# https://github.com/cthoyt/class-resolver/blob/5e51b41d08381e1754f3445c5ce4fcea4f6612d6/src/class_resolver/base.py#L276
+from importlib.metadata import entry_points
+
+# Dependency from importlib.metadata:
+# https://github.com/cthoyt/class-resolver/blob/5e51b41d08381e1754f3445c5ce4fcea4f6612d6/src/class_resolver/utils.py#L45
+from typing import TypeVar
+
+from class_resolver import ClassResolver
+
+from pheval.utils.logger import get_logger
+
+X = TypeVar("X")
+logger = get_logger()
+
+
+# Create a custom ClassResolver class to modify the _from_entrypoint method.
+class PhevalClassResolver(ClassResolver):
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+    # Modified _from_entrypoint method to raise error instead of warning
+    @staticmethod
+    def _from_entrypoint_custom(group: str) -> set[X]:
+        elements: set[X] = set()
+        for entry in entry_points(group=group):
+            try:
+                element = entry.load()
+                logger.info(f"Loaded {entry.name} correctly")
+            except (ImportError, AttributeError):
+                logger.warn(f"could not load {entry.name}. See error message below.")
+                raise
+            else:
+                elements.add(element)
+        return elements
+
+    def register_entrypoint(self, group: str) -> None:
+        """Register additional entries from an entrypoint."""
+        for element in self._from_entrypoint_custom(group).difference(self.lookup_dict.values()):
+            self.register(element)