🦩🫧 Fixes FunctionResolver type annotations (#1540)

cthoyt · danodonovan · web-flow · commit 11069e66d26e · 2025-04-22T18:11:19.000+02:00
Closes #1539 --------- Co-authored-by: Dan O'Donovan <156329+danodonovan@users.noreply.github.com>
diff --git a/pyproject.toml b/pyproject.toml
@@ -74,7 +74,7 @@ dependencies = [
     "more_itertools",
     "pystow>=0.4.3",
     "docdata>=0.0.5",
-    "class_resolver>=0.5.4",
+    "class_resolver>=0.6.0",
     "pyyaml",
     "torch_max_mem>=0.1.4",
     "torch-ppr>=0.0.7",
diff --git a/src/pykeen/nn/init.py b/src/pykeen/nn/init.py
@@ -494,7 +494,7 @@ def __init__(
 #: - :func:`pykeen.nn.init.xavier_normal_norm_`
 #:
 #: as well as initializers from :mod:`torch.nn.init`.
-initializer_resolver: FunctionResolver[Initializer] = FunctionResolver(
+initializer_resolver: FunctionResolver[[FloatTensor], FloatTensor] = FunctionResolver(
     [
         getattr(torch.nn.init, func)
         for func in dir(torch.nn.init)
diff --git a/src/pykeen/nn/representation.py b/src/pykeen/nn/representation.py
@@ -99,7 +99,7 @@
 #: - :func:`complex_normalize`
 #: - :func:`torch.clamp`
 #: - :func:`clamp_norm`
-constrainer_resolver = FunctionResolver(
+constrainer_resolver: FunctionResolver[[FloatTensor], FloatTensor] = FunctionResolver(
     [functional.normalize, complex_normalize, torch.clamp, clamp_norm],
     location="pykeen.nn.representation.constrainer_resolver",
 )
@@ -108,7 +108,7 @@
 #:
 #: - :func:`torch.nn.functional.normalize`
 #: - :func:`torch.nn.functional.softmax`
-normalizer_resolver = FunctionResolver(
+normalizer_resolver: FunctionResolver[[FloatTensor], FloatTensor] = FunctionResolver(
     [functional.normalize, functional.softmax],
     location="pykeen.nn.representation.normalizer_resolver",
 )
diff --git a/src/pykeen/triples/utils.py b/src/pykeen/triples/utils.py
@@ -26,12 +26,12 @@
 Importer = Callable[[str], LabeledTriples]
 
 #: Functions for specifying exotic resources with a given prefix
-PREFIX_IMPORTER_RESOLVER: FunctionResolver[Importer] = FunctionResolver.from_entrypoint(
+PREFIX_IMPORTER_RESOLVER: FunctionResolver[[str], LabeledTriples] = FunctionResolver.from_entrypoint(
     "pykeen.triples.prefix_importer"
 )
 
 #: Functions for specifying exotic resources based on their file extension
-EXTENSION_IMPORTER_RESOLVER: FunctionResolver[Importer] = FunctionResolver.from_entrypoint(
+EXTENSION_IMPORTER_RESOLVER: FunctionResolver[[str], LabeledTriples] = FunctionResolver.from_entrypoint(
     "pykeen.triples.extension_importer"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ def __init__(`
`494`	`494`	#: - :func:`pykeen.nn.init.xavier_normal_norm_`
`495`	`495`	`#:`
`496`	`496`	#: as well as initializers from :mod:`torch.nn.init`.
`497`		`-initializer_resolver: FunctionResolver[Initializer] = FunctionResolver(`
	`497`	`+initializer_resolver: FunctionResolver[[FloatTensor], FloatTensor] = FunctionResolver(`
`498`	`498`	`[`
`499`	`499`	`getattr(torch.nn.init, func)`
`500`	`500`	`for func in dir(torch.nn.init)`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@`
`26`	`26`	`Importer = Callable[[str], LabeledTriples]`
`27`	`27`
`28`	`28`	`#: Functions for specifying exotic resources with a given prefix`
`29`		`-PREFIX_IMPORTER_RESOLVER: FunctionResolver[Importer] = FunctionResolver.from_entrypoint(`
	`29`	`+PREFIX_IMPORTER_RESOLVER: FunctionResolver[[str], LabeledTriples] = FunctionResolver.from_entrypoint(`
`30`	`30`	`"pykeen.triples.prefix_importer"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`#: Functions for specifying exotic resources based on their file extension`
`34`		`-EXTENSION_IMPORTER_RESOLVER: FunctionResolver[Importer] = FunctionResolver.from_entrypoint(`
	`34`	`+EXTENSION_IMPORTER_RESOLVER: FunctionResolver[[str], LabeledTriples] = FunctionResolver.from_entrypoint(`
`35`	`35`	`"pykeen.triples.extension_importer"`
`36`	`36`	`)`
`37`	`37`