Update githubkit to fix validation error with /gh commit

Author: object-Object

bot/src/ghutils/ui/embeds/commits.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime
 from typing import Any
 
 from discord import Embed
@@ -13,7 +12,6 @@
 from ghutils.utils.github import (
     CommitCheckState,
     RepositoryName,
-    SmartPaginator,
     gh_request,
     shorten_sha,
 )
@@ -48,7 +46,7 @@ async def create_commit_embed(
 
     if (author := commit.commit.author) and author.date:
         try:
-            embed.timestamp = datetime.fromisoformat(author.date)
+            embed.timestamp = author.date
         except ValueError:
             pass
 
@@ -73,13 +71,12 @@ async def _get_commit_check_state(
 
     # checks
     try:
-        async for suite in SmartPaginator(
+        async for suite in github.rest.paginate(
             github.rest.checks.async_list_suites_for_ref,
+            map_func=lambda r: r.parsed_data.check_suites,
             owner=repo.owner,
             repo=repo.repo,
             ref=sha,
-            map_func=lambda resp: resp.parsed_data.check_suites,
-            limit_func=lambda resp: resp.parsed_data.total_count,
         ):
             match suite.status:
                 case "queued":

bot/src/ghutils/utils/discord/references.py

@@ -174,7 +174,7 @@ async def search_for_autocomplete(
     ) -> list[tuple[str | int, str]]:
         results = await gh_request(
             github.rest.search.async_issues_and_pull_requests(
-                f"{search} is:{self.issue_type} repo:{repo}",
+                q=f"{search} is:{self.issue_type} repo:{repo}",
                 per_page=25,
             )
         )
@@ -264,7 +264,7 @@ async def search_for_autocomplete(
     ) -> list[tuple[str | int, str]]:
         if search:
             resp = await github.rest.search.async_commits(
-                f"{search} repo:{repo}",
+                q=f"{search} repo:{repo}",
                 per_page=25,
             )
             results = resp.parsed_data.items

bot/src/ghutils/utils/discord/transformers.py

@@ -66,7 +66,7 @@ async def autocomplete(  # pyright: ignore[reportIncompatibleMethodOverride]
             try:
                 result = await gh_request(
                     github.rest.search.async_repos(
-                        query,
+                        q=query,
                         per_page=25,
                     )
                 )
@@ -122,7 +122,7 @@ async def autocomplete(  # pyright: ignore[reportIncompatibleMethodOverride]
             try:
                 result = await gh_request(
                     github.rest.search.async_users(
-                        value,
+                        q=value,
                         per_page=25,
                     )
                 )

bot/src/ghutils/utils/github.py

@@ -4,18 +4,17 @@
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
-from typing import Any, Awaitable, Callable, List, Literal, Self, cast, overload
+from typing import Any, Awaitable, Literal, Self, overload
 
 from discord import Color
-from githubkit import GitHub, Paginator, Response
+from githubkit import GitHub, Response
 from githubkit.rest import (
     FullRepository,
     Issue,
     IssuePropPullRequest,
     PullRequest,
     ReactionRollup,
     Release,
-    Repository,
 )
 
 
@@ -169,71 +168,13 @@ def from_url(cls, url: str) -> Self:
         return cls(owner=match["owner"], repo=match["repo"])
 
     @classmethod
-    def from_repo(cls, repo: Repository | FullRepository) -> Self:
+    def from_repo(cls, repo: FullRepository) -> Self:
         return cls(owner=repo.owner.login, repo=repo.name)
 
     def __str__(self) -> str:
         return f"{self.owner}/{self.repo}"
 
 
-class SmartPaginator[RT](Paginator[RT]):
-    """Subclass of `Paginator` that allows checking the `total_count` field (or similar)
-    provided in some requests, to avoid making an unnecessary extra request after the
-    final page.
-
-    Only supports async, since this bot only uses async requests.
-    """
-
-    def __init__[**CP, CT](
-        self,
-        request: Callable[CP, Awaitable[Response[CT]]],
-        map_func: Callable[[Response[CT]], list[RT]],
-        limit_func: Callable[[Response[CT]], int],
-        page: int = 1,
-        per_page: int = 100,
-        *args: CP.args,
-        **kwargs: CP.kwargs,
-    ):
-        super().__init__(
-            request=request,
-            map_func=map_func,
-            page=page,
-            per_page=per_page,
-            *args,
-            **kwargs,
-        )
-
-        self.request = request
-        self.map_func = map_func
-        self.limit_func = limit_func
-
-        self._limit: int | None = None
-        self._prev_pages_data_count = 0
-
-    async def _aget_next_page(self) -> List[RT]:
-        if (
-            self._limit is not None
-            and self._prev_pages_data_count + self._index >= self._limit
-        ):
-            return []
-
-        self._prev_pages_data_count += len(self._cached_data)
-        response = cast(
-            Response[Any],
-            await self.request(
-                *self.args,
-                **self.kwargs,
-                page=self._current_page,  # type: ignore
-                per_page=self._per_page,  # type: ignore
-            ),
-        )
-        self._cached_data = self.map_func(response)
-        self._limit = self.limit_func(response)
-        self._index = 0
-        self._current_page += 1
-        return self._cached_data
-
-
 async def gh_request[T](future: Awaitable[Response[T]]) -> T:
     """Helper function to simplify extracting the parsed data from GitHub requests."""
     resp = await future

requirements-dev.lock

@@ -21,6 +21,7 @@ aiosignal==1.3.1
 annotated-types==0.7.0
     # via pydantic
 anyio==4.4.0
+    # via githubkit
     # via httpx
     # via starlette
     # via watchfiles
@@ -93,7 +94,7 @@ fluent-syntax==0.19.0
 frozenlist==1.4.1
     # via aiohttp
     # via aiosignal
-githubkit==0.11.8
+githubkit==0.13.1
     # via ghutils-bot
 greenlet==3.0.3 ; (python_full_version < '3.13' and platform_machine == 'AMD64') or (python_full_version < '3.13' and platform_machine == 'WIN32') or (python_full_version < '3.13' and platform_machine == 'aarch64') or (python_full_version < '3.13' and platform_machine == 'amd64') or (python_full_version < '3.13' and platform_machine == 'ppc64le') or (python_full_version < '3.13' and platform_machine == 'win32') or (python_full_version < '3.13' and platform_machine == 'x86_64')
     # via sqlalchemy

requirements.lock

@@ -21,6 +21,7 @@ aiosignal==1.3.1
 annotated-types==0.7.0
     # via pydantic
 anyio==4.4.0
+    # via githubkit
     # via httpx
     # via starlette
     # via watchfiles
@@ -87,7 +88,7 @@ fluent-syntax==0.19.0
 frozenlist==1.4.1
     # via aiohttp
     # via aiosignal
-githubkit==0.11.8
+githubkit==0.13.1
     # via ghutils-bot
 greenlet==3.0.3 ; (python_full_version < '3.13' and platform_machine == 'AMD64') or (python_full_version < '3.13' and platform_machine == 'WIN32') or (python_full_version < '3.13' and platform_machine == 'aarch64') or (python_full_version < '3.13' and platform_machine == 'amd64') or (python_full_version < '3.13' and platform_machine == 'ppc64le') or (python_full_version < '3.13' and platform_machine == 'win32') or (python_full_version < '3.13' and platform_machine == 'x86_64')
     # via sqlalchemy