Fix an inheritance error

pyproject.toml

@@ -85,7 +85,7 @@ reportUnknownMemberType = "none"
 reportUnknownVariableType = "none"
 reportUnknownParameterType = "none"
 reportMissingTypeArgument = "none"
-reportUnnecessaryIsInstance = "none"
+reportUnnecessaryIsInstance = "warning"
 reportPrivateImportUsage = "none"
 reportPrivateUsage = "none"
 reportUnnecessaryTypeIgnoreComment = "warning"

ranzen/decorators.py

@@ -62,5 +62,5 @@ def enum_name_str(enum_class: type[E]) -> type[E]:
     def __str__(self: Enum) -> str:
         return self.name.lower()
 
-    enum_class.__str__ = __str__  # type: ignore
+    enum_class.__str__ = __str__
     return enum_class

ranzen/misc.py

@@ -200,23 +200,14 @@ class AddDict(Dict[_KT, _VT], Addable):
     """
 
     @overload
-    def __add__(
-        self: Self,
-        other: int,
-    ) -> Self:
+    def __add__(self, other: int) -> Self:
         ...
 
     @overload
-    def __add__(
-        self: Self,
-        other: dict[_KT, _VT2],
-    ) -> AddDict[_KT, _VT | _VT2]:
+    def __add__(self, other: dict[_KT, _VT2]) -> AddDict[_KT, _VT | _VT2]:
         ...
 
-    def __add__(
-        self: Self,
-        other: int | dict[_KT, _VT2],
-    ) -> Self | AddDict[_KT, _VT | _VT2]:
+    def __add__(self, other: int | dict[_KT, _VT2]) -> Self | AddDict[_KT, _VT | _VT2]:
         # Allow ``other`` to be an integer, but specifying the identity function, for compatibility
         # with th 'no-default' version of``sum``.
         if isinstance(other, int):
@@ -245,20 +236,14 @@ def __add__(
         return copy
 
     @overload
-    def __radd__(
-        self: Self,
-        other: int,
-    ) -> Self:
+    def __radd__(self, other: int) -> Self:
         ...
 
     @overload
-    def __radd__(
-        self: Self,
-        other: dict[_KT, _VT2],
-    ) -> AddDict[_KT, _VT | _VT2]:
+    def __radd__(self, other: dict[_KT, _VT2]) -> AddDict[_KT, _VT | _VT2]:
         ...
 
-    def __radd__(self: Self, other: int | dict[_KT, _VT2]) -> Self | AddDict[_KT, _VT | _VT2]:
+    def __radd__(self, other: int | dict[_KT, _VT2]) -> Self | AddDict[_KT, _VT | _VT2]:
         return self + other
 
 

ranzen/torch/utils.py

@@ -48,6 +48,8 @@ def inf_generator(iterable: Iterable[T]) -> Iterator[T]:
     """Get DataLoaders in a single infinite loop.
 
     for i, (x, y) in enumerate(inf_generator(train_loader))
+
+    :yield: elements from the given iterable
     """
     iterator = iter(iterable)
     # try to take one element to ensure that the iterator is not empty
@@ -84,8 +86,8 @@ def __enter__(self) -> Event:
         Mimics torch.cuda.Event.
         """
         if self._cuda:
-            self._event_start = torch.cuda.Event(enable_timing=True)  # type: ignore
-            self._event_start.record()  # type: ignore
+            self._event_start = torch.cuda.Event(enable_timing=True)  # pyright: ignore
+            self._event_start.record()  # pyright: ignore
         else:
             self._event_start = datetime.now()
         return self

tests/relay_test.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from collections.abc import Sequence
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Optional, Protocol
@@ -12,17 +13,20 @@
 
 class DummyOption(Protocol):
     name: str
-    value: int | str
+
+    @property
+    def value(self) -> int | str:
+        ...
 
 
 @dataclass
-class DummyOptionA(DummyOption):
+class DummyOptionA:
     name: str = "a"
     value: int = 7
 
 
 @dataclass
-class DummyOptionB(DummyOption):
+class DummyOptionB:
     name: str = "b"
     value: str = "5"
 
@@ -61,11 +65,14 @@ def run(self, raw_config: Optional[Dict[str, Any]] = None) -> None:
 def test_relay(tmpdir: Path, clear_cache: bool, instantiate_recursively: bool) -> None:
     args = ["", "attr1=foo", "attr2=bar"]
     with patch("sys.argv", args):
-        ops1 = [
+        ops1: Sequence[type[DummyOption] | Option[DummyOption]] = [
             Option(DummyOptionA, "foo"),
             DummyOptionB,
         ]
-        ops2 = [DummyOptionA, Option(DummyOptionB, "bar")]
+        ops2: Sequence[type[DummyOption] | Option[DummyOption]] = [
+            DummyOptionA,
+            Option(DummyOptionB, "bar"),
+        ]
         options = {"attr1": ops1, "attr2": ops2}
         for _ in range(2):
             DummyRelay.with_hydra(