Making a small dent

pykeen · cthoyt · Apr 20, 2025 · Apr 20, 2025 · Apr 20, 2025 · Apr 21, 2025
commit 81dd0d536d0a6d60d62a4f2a3379779a7e18790f
diff --git a/pyproject.toml b/pyproject.toml
@@ -74,7 +74,6 @@ dependencies = [
     "more_itertools",
     "pystow>=0.4.3",
     "docdata>=0.0.5",
-    "class-resolver>=0.6.0",
     "class_resolver>=0.6.0",
     "pyyaml",
     "torch_max_mem>=0.1.4",

diff --git a/src/pykeen/checkpoints/keeper.py b/src/pykeen/checkpoints/keeper.py
@@ -120,5 +120,6 @@ def __call__(self, steps: Sequence[int]) -> Iterator[int]:
 
 #: a resolver for checkpoint keepers
 keeper_resolver: ClassResolver[CheckpointKeeper] = ClassResolver.from_subclasses(
-    CheckpointKeeper, default=CheckpointKeeper
+    CheckpointKeeper,  # type:ignore[type-abstract]
+    default=CheckpointKeeper,
 )
diff --git a/src/pykeen/checkpoints/schedule.py b/src/pykeen/checkpoints/schedule.py
@@ -89,4 +89,7 @@ def __call__(self, step: int) -> bool:
 
 
 #: a resolver for checkpoint schedules
-schedule_resolver = ClassResolver.from_subclasses(base=CheckpointSchedule, default=EveryCheckpointSchedule)
+schedule_resolver = ClassResolver.from_subclasses(
+    base=CheckpointSchedule,  # type:ignore[type-abstract]
+    default=EveryCheckpointSchedule,
+)
diff --git a/src/pykeen/datasets/ea/combination.py b/src/pykeen/datasets/ea/combination.py
@@ -36,6 +36,7 @@
     "CollapseGraphPairCombinator",
     # Data Structures
     "ProcessedTuple",
+    "graph_combinator_resolver",
 ]
 
 logger = logging.getLogger(__name__)
@@ -491,7 +492,8 @@ def process(
         )
 
 
+#: A resolver for graph combinatiors
 graph_combinator_resolver: ClassResolver[GraphPairCombinator] = ClassResolver.from_subclasses(
-    base=GraphPairCombinator,
+    base=GraphPairCombinator,  # type:ignore[type-abstract]
     default=ExtraRelationGraphPairCombinator,
 )
diff --git a/src/pykeen/evaluation/__init__.py b/src/pykeen/evaluation/__init__.py
@@ -30,9 +30,11 @@
 
 #: A resolver for evaluators
 evaluator_resolver: ClassResolver[Evaluator] = ClassResolver.from_subclasses(
-    base=Evaluator,
+    base=Evaluator,  # type:ignore[type-abstract]
     default=RankBasedEvaluator,
 )
 
 #: A resolver for metric results
-metric_resolver: ClassResolver[MetricResults] = ClassResolver.from_subclasses(MetricResults)
+metric_resolver: ClassResolver[MetricResults] = ClassResolver.from_subclasses(
+    MetricResults,  # type:ignore[type-abstract]
+)
diff --git a/src/pykeen/metrics/classification.py b/src/pykeen/metrics/classification.py
@@ -756,7 +756,10 @@ def extract_from_confusion_matrix(self, matrix: numpy.ndarray) -> float:  # noqa
 
 #: A resolver for classification metrics
 classification_metric_resolver: ClassResolver[ClassificationMetric] = ClassResolver.from_subclasses(
-    base=ClassificationMetric,
+    base=ClassificationMetric,  # type:ignore[type-abstract]
     default=AveragePrecisionScore,
-    skip={BinarizedClassificationMetric, ConfusionMatrixClassificationMetric},
+    skip={
+        BinarizedClassificationMetric,  # type:ignore[type-abstract]
+        ConfusionMatrixClassificationMetric,  # type:ignore[type-abstract]
+    },
 )
diff --git a/src/pykeen/metrics/ranking.py b/src/pykeen/metrics/ranking.py
@@ -1667,9 +1667,14 @@ class AdjustedGeometricMeanRankIndex(ReindexedMetric):
 
 
 rank_based_metric_resolver: ClassResolver[RankBasedMetric] = ClassResolver.from_subclasses(
-    base=RankBasedMetric,
+    base=RankBasedMetric,  # type:ignore[type-abstract]
     default=InverseHarmonicMeanRank,  # mrr
-    skip={ExpectationNormalizedMetric, ReindexedMetric, ZMetric, DerivedRankBasedMetric},
+    skip={
+        ExpectationNormalizedMetric,  # type:ignore[type-abstract]
+        ReindexedMetric,  # type:ignore[type-abstract]
+        ZMetric,  # type:ignore[type-abstract]
+        DerivedRankBasedMetric,  # type:ignore[type-abstract]
+    },
 )
 """The rank-based metric resolver allows for the lookup and instantiation of classes
 deriving from :class:`RankBasedMetric` via the :mod:`class_resolver`.

diff --git a/src/pykeen/models/__init__.py b/src/pykeen/models/__init__.py
@@ -155,13 +155,13 @@
     base=Model,  # type:ignore[type-abstract]
     skip={
         # Abstract Models
-        _NewAbstractModel,
+        _NewAbstractModel,  # type:ignore[type-abstract]
         # We might be able to relax this later
         ERModel,
         InductiveERModel,
         LiteralModel,
         # baseline models behave differently
-        EvaluationOnlyModel,
-        *get_subclasses(EvaluationOnlyModel),
+        EvaluationOnlyModel,  # type:ignore[type-abstract]
+        *get_subclasses(EvaluationOnlyModel),  # type:ignore[type-abstract]
     },
 )
diff --git a/src/pykeen/nn/message_passing.py b/src/pykeen/nn/message_passing.py
@@ -507,7 +507,8 @@ def forward(
 
 
 decomposition_resolver: ClassResolver[Decomposition] = ClassResolver.from_subclasses(
-    base=Decomposition, default=BasesDecomposition
+    base=Decomposition,  # type:ignore[type-abstract]
+    default=BasesDecomposition,
 )
 
 

diff --git a/src/pykeen/nn/modules.py b/src/pykeen/nn/modules.py
@@ -3877,9 +3877,9 @@ def forward(self, h: FloatTensor, r: tuple[FloatTensor, FloatTensor, FloatTensor
 
 #: A resolver for stateful interaction functions
 interaction_resolver: ClassResolver[Interaction] = ClassResolver.from_subclasses(
-    Interaction,
+    Interaction,  # type:ignore[type-abstract]
     skip={
-        NormBasedInteraction,
+        NormBasedInteraction,  # type:ignore[type-abstract]
         MonotonicAffineTransformationInteraction,
         ClampedInteraction,
         DirectionAverageInteraction,

diff --git a/src/pykeen/nn/node_piece/tokenization.py b/src/pykeen/nn/node_piece/tokenization.py
@@ -331,6 +331,6 @@ def __call__(
 
 #: A resolver for NodePiece tokenizers
 tokenizer_resolver: ClassResolver[Tokenizer] = ClassResolver.from_subclasses(
-    base=Tokenizer,
+    base=Tokenizer,  # type:ignore[type-abstract]
     default=RelationTokenizer,
 )
diff --git a/src/pykeen/nn/text/encoder.py b/src/pykeen/nn/text/encoder.py
@@ -235,6 +235,6 @@ def forward_normalized(self, texts: Sequence[str]) -> FloatTensor:  # noqa: D102
 #: for :class:`CharacterEmbeddingTextEncoder` or 'transformer' for
 #: :class:`TransformerTextEncoder`.
 text_encoder_resolver: ClassResolver[TextEncoder] = ClassResolver.from_subclasses(
-    base=TextEncoder,
+    base=TextEncoder,  # type:ignore[type-abstract]
     default=CharacterEmbeddingTextEncoder,
 )
diff --git a/src/pykeen/sampling/__init__.py b/src/pykeen/sampling/__init__.py
@@ -130,6 +130,6 @@
 
 #: A resolver for negative samplers
 negative_sampler_resolver: ClassResolver[NegativeSampler] = ClassResolver.from_subclasses(
-    NegativeSampler,
+    NegativeSampler,  # type:ignore[type-abstract]
     default=BasicNegativeSampler,
 )
diff --git a/src/pykeen/stoppers/__init__.py b/src/pykeen/stoppers/__init__.py
@@ -39,6 +39,6 @@
 
 #: A resolver for stoppers
 stopper_resolver: ClassResolver[Stopper] = ClassResolver.from_subclasses(
-    Stopper,
+    Stopper,  # type:ignore[type-abstract]
     default=NopStopper,
 )