Improve typing: add RemotesCollection to Repository

The following command
    mypy test
reports
    Found 284 errors in 9 files (checked 50 source files)
after this change.

Author: BenediktSeidl

pygit2/_pygit2.pyi

@@ -1,4 +1,4 @@
-from typing import Iterator, Literal, Optional, overload, Type
+from typing import Iterator, Literal, Optional, overload, Type, TypedDict
 from io import IOBase
 from . import Index
 from .enums import (
@@ -19,8 +19,10 @@ from .enums import (
     ResetMode,
     SortMode,
 )
+from collections.abc import Generator
 
 from .repository import BaseRepository
+from .remotes import Remote
 
 GIT_OBJ_BLOB = Literal[3]
 GIT_OBJ_COMMIT = Literal[1]
@@ -346,6 +348,48 @@ class References:
     def objects(self) -> list[Reference]: ...
     def compress(self) -> None: ...
 
+_Proxy = None | Literal[True] | str
+
+class _StrArray:
+    # incomplete
+    count: int
+
+class ProxyOpts:
+    # incomplete
+    type: object
+    url: str
+
+class PushOptions:
+    version: int
+    pb_parallelism: int
+    callbacks: object  # TODO
+    proxy_opts: ProxyOpts
+    follow_redirects: object  # TODO
+    custom_headers: _StrArray
+    remote_push_options: _StrArray
+
+class _LsRemotesDict(TypedDict):
+    local: bool
+    loid: Oid | None
+    name: str | None
+    symref_target: str | None
+    oid: Oid
+
+class RemoteCollection:
+    def __init__(self, repo: BaseRepository) -> None: ...
+    def __len__(self) -> int: ...
+    def __iter__(self): ...
+    def __getitem__(self, name: str | int) -> Remote: ...
+    def names(self) -> Generator[str, None, None]: ...
+    def create(self, name: str, url: str, fetch: str | None = None) -> Remote: ...
+    def create_anonymous(self, url: str) -> Remote: ...
+    def rename(self, name: str, new_name: str) -> list[str]: ...
+    def delete(self, name: str) -> None: ...
+    def set_url(self, name: str, url: str) -> None: ...
+    def set_push_url(self, name: str, url: str) -> None: ...
+    def add_fetch(self, name: str, refspec: str) -> None: ...
+    def add_push(self, name: str, refspec: str) -> None: ...
+
 class Repository:
     _pointer: bytes
     default_signature: Signature
@@ -360,6 +404,7 @@ class Repository:
     refdb: Refdb
     workdir: str
     references: References
+    remotes: RemoteCollection
     def __init__(self, *args, **kwargs) -> None: ...
     def TreeBuilder(self, src: Tree | _OidArg = ...) -> TreeBuilder: ...
     def _disown(self, *args, **kwargs) -> None: ...

pygit2/callbacks.py

@@ -65,24 +65,29 @@
 # Standard Library
 from contextlib import contextmanager
 from functools import wraps
-from typing import Optional, Union
+from typing import Optional, Union, TYPE_CHECKING, Callable, Generator
 
 # pygit2
 from ._pygit2 import Oid, DiffFile
 from .enums import CheckoutNotify, CheckoutStrategy, CredentialType, StashApplyProgress
 from .errors import check_error, Passthrough
 from .ffi import ffi, C
 from .utils import maybe_string, to_bytes, ptr_to_bytes, StrArray
+from .credentials import Username, UserPass, Keypair
 
+_Credentials = Username | UserPass | Keypair
 
+if TYPE_CHECKING:
+    from .remotes import TransferProgress
+    from ._pygit2 import ProxyOpts, PushOptions
 #
 # The payload is the way to pass information from the pygit2 API, through
 # libgit2, to the Python callbacks. And back.
 #
 
 
 class Payload:
-    def __init__(self, **kw: object):
+    def __init__(self, **kw: object) -> None:
         for key, value in kw.items():
             setattr(self, key, value)
         self._stored_exception = None
@@ -113,12 +118,18 @@ class RemoteCallbacks(Payload):
     RemoteCallbacks(certificate=certificate).
     """
 
-    def __init__(self, credentials=None, certificate_check=None):
+    push_options: 'PushOptions'
+
+    def __init__(
+        self,
+        credentials: _Credentials | None = None,
+        certificate_check: Callable[[None, bool, bytes], bool] | None = None,
+    ) -> None:
         super().__init__()
         if credentials is not None:
-            self.credentials = credentials
+            self.credentials = credentials  # type: ignore[method-assign, assignment]
         if certificate_check is not None:
-            self.certificate_check = certificate_check
+            self.certificate_check = certificate_check  # type: ignore[method-assign, assignment]
 
     def sideband_progress(self, string: str) -> None:
         """
@@ -136,7 +147,7 @@ def credentials(
         url: str,
         username_from_url: Union[str, None],
         allowed_types: CredentialType,
-    ):
+    ) -> _Credentials:
         """
         Credentials callback.  If the remote server requires authentication,
         this function will be called and its return value used for
@@ -159,7 +170,7 @@ def credentials(
         """
         raise Passthrough
 
-    def certificate_check(self, certificate: None, valid: bool, host: str) -> bool:
+    def certificate_check(self, certificate: None, valid: bool, host: bytes) -> bool:
         """
         Certificate callback. Override with your own function to determine
         whether to accept the server's certificate.
@@ -181,7 +192,7 @@ def certificate_check(self, certificate: None, valid: bool, host: str) -> bool:
 
         raise Passthrough
 
-    def transfer_progress(self, stats):
+    def transfer_progress(self, stats: 'TransferProgress') -> None:
         """
         During the download of new data, this will be regularly called with
         the indexer's progress.
@@ -196,7 +207,7 @@ def transfer_progress(self, stats):
 
     def push_transfer_progress(
         self, objects_pushed: int, total_objects: int, bytes_pushed: int
-    ):
+    ) -> None:
         """
         During the upload portion of a push, this will be regularly called
         with progress information.
@@ -207,7 +218,7 @@ def push_transfer_progress(
         Override with your own function to report push transfer progress.
         """
 
-    def update_tips(self, refname, old, new):
+    def update_tips(self, refname: str, old: Oid, new: Oid) -> None:
         """
         Update tips callback. Override with your own function to report
         reference updates.
@@ -224,7 +235,7 @@ def update_tips(self, refname, old, new):
             The reference's new value.
         """
 
-    def push_update_reference(self, refname, message):
+    def push_update_reference(self, refname: str, message: str) -> None:
         """
         Push update reference callback. Override with your own function to
         report the remote's acceptance or rejection of reference updates.
@@ -244,7 +255,7 @@ class CheckoutCallbacks(Payload):
     in your class, which you can then pass to checkout operations.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
 
     def checkout_notify_flags(self) -> CheckoutNotify:
@@ -275,7 +286,7 @@ def checkout_notify(
         baseline: Optional[DiffFile],
         target: Optional[DiffFile],
         workdir: Optional[DiffFile],
-    ):
+    ) -> None:
         """
         Checkout will invoke an optional notification callback for
         certain cases - you pick which ones via `checkout_notify_flags`.
@@ -290,7 +301,9 @@ def checkout_notify(
         """
         pass
 
-    def checkout_progress(self, path: str, completed_steps: int, total_steps: int):
+    def checkout_progress(
+        self, path: str, completed_steps: int, total_steps: int
+    ) -> None:
         """
         Optional callback to notify the consumer of checkout progress.
         """
@@ -304,7 +317,7 @@ class StashApplyCallbacks(CheckoutCallbacks):
     in your class, which you can then pass to stash apply or pop operations.
     """
 
-    def stash_apply_progress(self, progress: StashApplyProgress):
+    def stash_apply_progress(self, progress: StashApplyProgress) -> None:
         """
         Stash application progress notification function.
 
@@ -373,9 +386,9 @@ def git_fetch_options(payload, opts=None):
 @contextmanager
 def git_proxy_options(
     payload: object,
-    opts: object | None = None,
+    opts: Optional['ProxyOpts'] = None,
     proxy: None | bool | str = None,
-):
+) -> Generator['ProxyOpts', None, None]:
     if opts is None:
         opts = ffi.new('git_proxy_options *')
         C.git_proxy_options_init(opts, C.GIT_PROXY_OPTIONS_VERSION)
@@ -386,8 +399,8 @@ def git_proxy_options(
     elif type(proxy) is str:
         opts.type = C.GIT_PROXY_SPECIFIED
         # Keep url in memory, otherwise memory is freed and bad things happen
-        payload.__proxy_url = ffi.new('char[]', to_bytes(proxy))
-        opts.url = payload.__proxy_url
+        payload.__proxy_url = ffi.new('char[]', to_bytes(proxy))  # type: ignore[attr-defined, no-untyped-call]
+        opts.url = payload.__proxy_url  # type: ignore[attr-defined]
     else:
         raise TypeError('Proxy must be None, True, or a string')
     yield opts

pygit2/credentials.py

@@ -49,7 +49,7 @@ def credential_type(self) -> CredentialType:
         return CredentialType.USERNAME
 
     @property
-    def credential_tuple(self):
+    def credential_tuple(self) -> tuple[str]:
         return (self._username,)
 
     def __call__(
@@ -74,7 +74,7 @@ def credential_type(self) -> CredentialType:
         return CredentialType.USERPASS_PLAINTEXT
 
     @property
-    def credential_tuple(self):
+    def credential_tuple(self) -> tuple[str, str]:
         return (self._username, self._password)
 
     def __call__(
@@ -107,7 +107,11 @@ class Keypair:
     """
 
     def __init__(
-        self, username: str, pubkey: str | Path, privkey: str | Path, passphrase: str
+        self,
+        username: str,
+        pubkey: str | Path | None,
+        privkey: str | Path | None,
+        passphrase: str | None,
     ):
         self._username = username
         self._pubkey = pubkey
@@ -119,7 +123,9 @@ def credential_type(self) -> CredentialType:
         return CredentialType.SSH_KEY
 
     @property
-    def credential_tuple(self):
+    def credential_tuple(
+        self,
+    ) -> tuple[str, str | Path | None, str | Path | None, str | None]:
         return (self._username, self._pubkey, self._privkey, self._passphrase)
 
     def __call__(

pygit2/remotes.py

@@ -24,7 +24,7 @@
 # Boston, MA 02110-1301, USA.
 
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 # Import from pygit2
 from ._pygit2 import Oid
@@ -49,7 +49,15 @@
 class TransferProgress:
     """Progress downloading and indexing data during a fetch."""
 
-    def __init__(self, tp):
+    total_objects: int
+    indexed_objects: int
+    received_objects: int
+    local_objects: int
+    total_deltas: int
+    indexed_deltas: int
+    received_bytes: int
+
+    def __init__(self, tp: Any) -> None:
         self.total_objects = tp.total_objects
         """Total number of objects to download"""