Enforce stricter type checking

.pre-commit-config.yaml

@@ -1,10 +1,11 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
     rev: v0.1.9
     hooks:
-      # Run the linter.
       - id: ruff
         args: ["--fix"]
-      # Run the formatter.
       - id: ruff-format
+  - repo: https://github.com/RobertCraigie/pyright-python
+    rev: v1.1.350
+    hooks:
+      - id: pyright

findmy/accessory.py

@@ -7,7 +7,9 @@
 
 import logging
 from datetime import datetime, timedelta
-from typing import Generator
+from typing import Generator, overload
+
+from typing_extensions import override
 
 from .keys import KeyGenerator, KeyPair, KeyType
 from .util import crypto
@@ -141,15 +143,26 @@ def _generate_keys(self, start: int, stop: int | None) -> Generator[KeyPair, Non
 
             ind += 1
 
+    @override
     def __iter__(self) -> KeyGenerator:
         self._iter_ind = -1
         return self
 
+    @override
     def __next__(self) -> KeyPair:
         self._iter_ind += 1
 
         return self._get_keypair(self._iter_ind)
 
+    @overload
+    def __getitem__(self, val: int) -> KeyPair:
+        ...
+
+    @overload
+    def __getitem__(self, val: slice) -> Generator[KeyPair, None, None]:
+        ...
+
+    @override
     def __getitem__(self, val: int | slice) -> KeyPair | Generator[KeyPair, None, None]:
         if isinstance(val, int):
             if val < 0:

findmy/keys.py

@@ -9,6 +9,7 @@
 from typing import Generator, Generic, TypeVar, overload
 
 from cryptography.hazmat.primitives.asymmetric import ec
+from typing_extensions import override
 
 from .util import crypto
 
@@ -49,10 +50,12 @@ def hashed_adv_key_b64(self) -> str:
         """Return the hashed advertised (public) key as a base64-encoded string."""
         return base64.b64encode(self.hashed_adv_key_bytes).decode("ascii")
 
+    @override
     def __hash__(self) -> int:
         return crypto.bytes_to_int(self.adv_key_bytes)
 
-    def __eq__(self, other: HasPublicKey) -> bool:
+    @override
+    def __eq__(self, other: object) -> bool:
         if not isinstance(other, HasPublicKey):
             return NotImplemented
 
@@ -107,6 +110,7 @@ def private_key_b64(self) -> str:
         return base64.b64encode(self.private_key_bytes).decode("ascii")
 
     @property
+    @override
     def adv_key_bytes(self) -> bytes:
         """Return the advertised (public) key as bytes."""
         key_bytes = self._priv_key.public_key().public_numbers().x
@@ -116,6 +120,7 @@ def dh_exchange(self, other_pub_key: ec.EllipticCurvePublicKey) -> bytes:
         """Do a Diffie-Hellman key exchange using another EC public key."""
         return self._priv_key.exchange(ec.ECDH(), other_pub_key)
 
+    @override
     def __repr__(self) -> str:
         return f'KeyPair(public_key="{self.adv_key_b64}", type={self.key_type})'
 
@@ -135,11 +140,13 @@ def __next__(self) -> K:
         return NotImplemented
 
     @overload
+    @abstractmethod
     def __getitem__(self, val: int) -> K:
         ...
 
     @overload
-    def __getitem__(self, slc: slice) -> Generator[K, None, None]:
+    @abstractmethod
+    def __getitem__(self, val: slice) -> Generator[K, None, None]:
         ...
 
     @abstractmethod