GitHubKit 0.11.0a3__py3-none-any.whl → 0.11.1__py3-none-any.whl

githubkit/compat.py

@@ -31,6 +31,7 @@ if TYPE_CHECKING:
 
 if PYDANTIC_V2:  # pragma: pydantic-v2
     from pydantic_core import CoreSchema, core_schema
+    from pydantic_core import to_jsonable_python as to_jsonable_python
     from pydantic import (
         BaseModel,
         ConfigDict,
@@ -81,6 +82,7 @@ if PYDANTIC_V2:  # pragma: pydantic-v2
         return class_
 
 else:  # pragma: pydantic-v1
+    from pydantic.json import pydantic_encoder
     from pydantic import Extra, BaseModel, parse_obj_as, parse_raw_as, root_validator
 
     class GitHubModel(BaseModel):
@@ -97,6 +99,18 @@ else:  # pragma: pydantic-v1
     def type_validate_json(type_: Type[T], data: Any) -> T:
         return parse_raw_as(type_, data)
 
+    def to_jsonable_python(obj: Any) -> Any:
+        if isinstance(obj, dict):
+            return {k: to_jsonable_python(v) for k, v in obj.items()}
+
+        if isinstance(obj, (list, tuple)):
+            return [to_jsonable_python(item) for item in obj]
+
+        if obj is None or isinstance(obj, (int, float, str, bool)):
+            return obj
+
+        return pydantic_encoder(obj)
+
     def model_dump(model: BaseModel, by_alias: bool = True) -> Dict[str, Any]:
         return model.dict(by_alias=by_alias)
 

githubkit/config.py

@@ -4,6 +4,9 @@ from typing import Any, Dict, List, Union, Optional
 
 import httpx
 
+from .retry import RETRY_DEFAULT
+from .typing import RetryDecisionFunc
+
 
 @dataclass(frozen=True)
 class Config:
@@ -13,6 +16,7 @@ class Config:
     follow_redirects: bool
     timeout: httpx.Timeout
     http_cache: bool
+    auto_retry: Optional[RetryDecisionFunc]
 
     def dict(self) -> Dict[str, Any]:
         return asdict(self)
@@ -59,6 +63,17 @@ def build_timeout(
     return timeout if isinstance(timeout, httpx.Timeout) else httpx.Timeout(timeout)
 
 
+def build_auto_retry(
+    auto_retry: Union[bool, RetryDecisionFunc] = True
+) -> Optional[RetryDecisionFunc]:
+    if auto_retry is True:
+        return RETRY_DEFAULT
+    elif auto_retry:
+        return auto_retry
+    else:
+        return None
+
+
 def get_config(
     base_url: Optional[Union[str, httpx.URL]] = None,
     accept_format: Optional[str] = None,
@@ -67,6 +82,7 @@ def get_config(
     follow_redirects: bool = True,
     timeout: Optional[Union[float, httpx.Timeout]] = None,
     http_cache: bool = True,
+    auto_retry: Union[bool, RetryDecisionFunc] = True,
 ) -> Config:
     return Config(
         build_base_url(base_url),
@@ -75,4 +91,5 @@ def get_config(
         follow_redirects,
         build_timeout(timeout),
         http_cache,
+        build_auto_retry(auto_retry),
     )

githubkit/core.py

@@ -1,3 +1,4 @@
+import time
 from types import TracebackType
 from contextvars import ContextVar
 from datetime import datetime, timezone, timedelta
@@ -17,11 +18,12 @@ from typing import (
     overload,
 )
 
+import anyio
 import httpx
 import hishel
 
 from .response import Response
-from .utils import obj_to_jsonable
+from .compat import to_jsonable_python
 from .config import Config, get_config
 from .auth import BaseAuthStrategy, TokenAuthStrategy, UnauthAuthStrategy
 from .typing import (
@@ -31,11 +33,13 @@ from .typing import (
     ContentTypes,
     RequestFiles,
     QueryParamTypes,
+    RetryDecisionFunc,
 )
 from .exception import (
     RequestError,
     RequestFailed,
     RequestTimeout,
+    GitHubException,
     PrimaryRateLimitExceeded,
     SecondaryRateLimitExceeded,
 )
@@ -88,6 +92,7 @@ class GitHubCore(Generic[A]):
         follow_redirects: bool = True,
         timeout: Optional[Union[float, httpx.Timeout]] = None,
         http_cache: bool = True,
+        auto_retry: Union[bool, RetryDecisionFunc] = True,
     ):
         ...
 
@@ -104,6 +109,7 @@ class GitHubCore(Generic[A]):
         follow_redirects: bool = True,
         timeout: Optional[Union[float, httpx.Timeout]] = None,
         http_cache: bool = True,
+        auto_retry: Union[bool, RetryDecisionFunc] = True,
     ):
         ...
 
@@ -120,6 +126,7 @@ class GitHubCore(Generic[A]):
         follow_redirects: bool = True,
         timeout: Optional[Union[float, httpx.Timeout]] = None,
         http_cache: bool = True,
+        auto_retry: Union[bool, RetryDecisionFunc] = True,
     ):
         ...
 
@@ -135,6 +142,7 @@ class GitHubCore(Generic[A]):
         follow_redirects: bool = True,
         timeout: Optional[Union[float, httpx.Timeout]] = None,
         http_cache: bool = True,
+        auto_retry: Union[bool, RetryDecisionFunc] = True,
     ):
         auth = auth or UnauthAuthStrategy()  # type: ignore
         self.auth: A = (  # type: ignore
@@ -149,6 +157,7 @@ class GitHubCore(Generic[A]):
             follow_redirects,
             timeout,
             http_cache,
+            auto_retry,
         )
 
         self.__sync_client: ContextVar[Optional[httpx.Client]] = ContextVar(
@@ -272,7 +281,7 @@ class GitHubCore(Generic[A]):
                     content=content,
                     data=data,
                     files=files,
-                    json=obj_to_jsonable(json),
+                    json=to_jsonable_python(json),
                     headers=headers,
                     cookies=cookies,
                 )
@@ -304,7 +313,7 @@ class GitHubCore(Generic[A]):
                     content=content,
                     data=data,
                     files=files,
-                    json=obj_to_jsonable(json),
+                    json=to_jsonable_python(json),
                     headers=headers,
                     cookies=cookies,
                 )
@@ -407,18 +416,32 @@ class GitHubCore(Generic[A]):
         response_model: Type[T] = Any,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Response[T]:
-        raw_resp = self._request(
-            method,
-            url,
-            params=params,
-            content=content,
-            data=data,
-            files=files,
-            json=json,
-            headers=headers,
-            cookies=cookies,
-        )
-        return self._check(raw_resp, response_model, error_models)
+        retry_count: int = 0
+        while True:
+            try:
+                raw_resp = self._request(
+                    method,
+                    url,
+                    params=params,
+                    content=content,
+                    data=data,
+                    files=files,
+                    json=json,
+                    headers=headers,
+                    cookies=cookies,
+                )
+                return self._check(raw_resp, response_model, error_models)
+            except GitHubException as e:
+                if self.config.auto_retry is None:
+                    raise
+                else:
+                    do_retry, retry_after = self.config.auto_retry(e, retry_count)
+
+                if not do_retry:
+                    raise
+
+                time.sleep(retry_after.total_seconds() if retry_after else 60)
+                retry_count += 1
 
     # async request and check
     async def arequest(
@@ -436,15 +459,29 @@ class GitHubCore(Generic[A]):
         response_model: Type[T] = Any,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Response[T]:
-        raw_resp = await self._arequest(
-            method,
-            url,
-            params=params,
-            content=content,
-            data=data,
-            files=files,
-            json=json,
-            headers=headers,
-            cookies=cookies,
-        )
-        return self._check(raw_resp, response_model, error_models)
+        retry_count: int = 0
+        while True:
+            try:
+                raw_resp = await self._arequest(
+                    method,
+                    url,
+                    params=params,
+                    content=content,
+                    data=data,
+                    files=files,
+                    json=json,
+                    headers=headers,
+                    cookies=cookies,
+                )
+                return self._check(raw_resp, response_model, error_models)
+            except GitHubException as e:
+                if self.config.auto_retry is None:
+                    raise
+                else:
+                    do_retry, retry_after = self.config.auto_retry(e, retry_count)
+
+                if not do_retry:
+                    raise
+
+                await anyio.sleep(retry_after.total_seconds() if retry_after else 60)
+                retry_count += 1

githubkit/github.py

@@ -17,6 +17,7 @@ from .core import GitHubCore
 from .response import Response
 from .paginator import Paginator
 from .auth import BaseAuthStrategy
+from .typing import RetryDecisionFunc
 from .versions import RestVersionSwitcher, WebhooksVersionSwitcher
 from .graphql import GraphQLResponse, build_graphql_request, parse_graphql_response
 
@@ -85,6 +86,7 @@ class GitHub(GitHubCore[A]):
             follow_redirects: bool = True,
             timeout: Optional[Union[float, httpx.Timeout]] = None,
             http_cache: bool = True,
+            auto_retry: Union[bool, RetryDecisionFunc] = True,
         ):
             ...
 
@@ -101,6 +103,7 @@ class GitHub(GitHubCore[A]):
             follow_redirects: bool = True,
             timeout: Optional[Union[float, httpx.Timeout]] = None,
             http_cache: bool = True,
+            auto_retry: Union[bool, RetryDecisionFunc] = True,
         ):
             ...
 
@@ -117,6 +120,7 @@ class GitHub(GitHubCore[A]):
             follow_redirects: bool = True,
             timeout: Optional[Union[float, httpx.Timeout]] = None,
             http_cache: bool = True,
+            auto_retry: Union[bool, RetryDecisionFunc] = True,
         ):
             ...
 

githubkit/lazy_module.py

@@ -106,15 +106,13 @@ class LazyModuleFinder(MetaPathFinder):
         path: Optional[Sequence[str]],
         target: Optional[ModuleType] = None,
     ) -> Optional[ModuleSpec]:
-        module_spec = PathFinder.find_spec(fullname, path, target)
-        if not module_spec or not module_spec.origin:
-            return module_spec
+        if any(re.match(pattern, fullname) for pattern in LAZY_MODULES):
+            module_spec = PathFinder.find_spec(fullname, path, target)
+            if not module_spec or not module_spec.origin:
+                return
 
-        if module_spec and any(
-            re.match(pattern, module_spec.name) for pattern in LAZY_MODULES
-        ):
             module_spec.loader = LazyModuleLoader(module_spec.name, module_spec.origin)
-        return module_spec
+            return module_spec
 
 
 def apply():

githubkit/log.py

@@ -0,0 +1,3 @@
+import logging
+
+logger = logging.getLogger("githubkit")

githubkit/rest/__init__.py

@@ -149,7 +149,6 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import ContentTraffic as ContentTraffic
     from githubkit.versions.v2022_11_28.models import FullRepository as FullRepository
     from githubkit.versions.v2022_11_28.models import GlobalAdvisory as GlobalAdvisory
-    from githubkit.versions.v2022_11_28.models import HookPropConfig as HookPropConfig
     from githubkit.versions.v2022_11_28.models import LicenseContent as LicenseContent
     from githubkit.versions.v2022_11_28.models import MergedUpstream as MergedUpstream
     from githubkit.versions.v2022_11_28.models import PackageVersion as PackageVersion
@@ -673,6 +672,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         LabelSearchResultItem as LabelSearchResultItem,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        PagesDeploymentStatus as PagesDeploymentStatus,
+    )
     from githubkit.versions.v2022_11_28.models import (
         PagesHttpsCertificate as PagesHttpsCertificate,
     )
@@ -1207,6 +1209,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         OrgRulesetConditionsOneof1 as OrgRulesetConditionsOneof1,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        OrgRulesetConditionsOneof2 as OrgRulesetConditionsOneof2,
+    )
     from githubkit.versions.v2022_11_28.models import (
         OrganizationSimpleWebhooks as OrganizationSimpleWebhooks,
     )
@@ -2368,6 +2373,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         CodeScanningOrganizationAlertItems as CodeScanningOrganizationAlertItems,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        FullRepositoryPropCustomProperties as FullRepositoryPropCustomProperties,
+    )
     from githubkit.versions.v2022_11_28.models import (
         GistsGistIdGetResponse403PropBlock as GistsGistIdGetResponse403PropBlock,
     )
@@ -2629,6 +2637,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         WebhookRubygemsMetadataPropMetadata as WebhookRubygemsMetadataPropMetadata,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        WebhookSecretScanningAlertValidated as WebhookSecretScanningAlertValidated,
+    )
     from githubkit.versions.v2022_11_28.models import (
         WebhookSponsorshipEditedPropChanges as WebhookSponsorshipEditedPropChanges,
     )
@@ -2821,9 +2832,6 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoHooksPostBodyPropConfig as ReposOwnerRepoHooksPostBodyPropConfig,
     )
-    from githubkit.versions.v2022_11_28.models import (
-        ReposOwnerRepoPagesDeploymentPostBody as ReposOwnerRepoPagesDeploymentPostBody,
-    )
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoPagesPostBodyPropSource as ReposOwnerRepoPagesPostBodyPropSource,
     )
@@ -2932,6 +2940,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoCodespacesGetResponse200 as ReposOwnerRepoCodespacesGetResponse200,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        ReposOwnerRepoPagesDeploymentsPostBody as ReposOwnerRepoPagesDeploymentsPostBody,
+    )
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoPullsPullNumberPatchBody as ReposOwnerRepoPullsPullNumberPatchBody,
     )
@@ -3076,6 +3087,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoGitTagsPostBodyPropTagger as ReposOwnerRepoGitTagsPostBodyPropTagger,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        ReposOwnerRepoPropertiesValuesPatchBody as ReposOwnerRepoPropertiesValuesPatchBody,
+    )
     from githubkit.versions.v2022_11_28.models import (
         RepositoryRulePullRequestPropParameters as RepositoryRulePullRequestPropParameters,
     )
@@ -3949,9 +3963,6 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoActionsWorkflowsGetResponse200 as ReposOwnerRepoActionsWorkflowsGetResponse200,
     )
-    from githubkit.versions.v2022_11_28.models import (
-        ReposOwnerRepoHooksHookIdPatchBodyPropConfig as ReposOwnerRepoHooksHookIdPatchBodyPropConfig,
-    )
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoImportAuthorsAuthorIdPatchBody as ReposOwnerRepoImportAuthorsAuthorIdPatchBody,
     )
@@ -4825,6 +4836,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         RepositoryRuleCommitterEmailPatternPropParameters as RepositoryRuleCommitterEmailPatternPropParameters,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        RepositoryRulesetConditionsRepositoryPropertySpec as RepositoryRulesetConditionsRepositoryPropertySpec,
+    )
     from githubkit.versions.v2022_11_28.models import (
         RepositoryWebhooksPropTemplateRepositoryPropOwner as RepositoryWebhooksPropTemplateRepositoryPropOwner,
     )
@@ -5239,6 +5253,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         ReposOwnerRepoPullsPullNumberReviewsReviewIdPutBody as ReposOwnerRepoPullsPullNumberReviewsReviewIdPutBody,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        RepositoryRulesetConditionsRepositoryPropertyTarget as RepositoryRulesetConditionsRepositoryPropertyTarget,
+    )
     from githubkit.versions.v2022_11_28.models import (
         SecurityAndAnalysisPropSecretScanningPushProtection as SecurityAndAnalysisPropSecretScanningPushProtection,
     )
@@ -8956,6 +8973,9 @@ if TYPE_CHECKING:
     from githubkit.versions.v2022_11_28.models import (
         RepositoriesRepositoryIdEnvironmentsEnvironmentNameVariablesNamePatchBody as RepositoriesRepositoryIdEnvironmentsEnvironmentNameVariablesNamePatchBody,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        RepositoryRulesetConditionsRepositoryPropertyTargetPropRepositoryProperty as RepositoryRulesetConditionsRepositoryPropertyTargetPropRepositoryProperty,
+    )
     from githubkit.versions.v2022_11_28.models import (
         WebhookCodeScanningAlertCreatedPropAlertPropMostRecentInstancePropMessage as WebhookCodeScanningAlertCreatedPropAlertPropMostRecentInstancePropMessage,
     )
@@ -10706,6 +10726,7 @@ else:
             "CodeOfConductSimple",
             "FullRepository",
             "FullRepositoryPropPermissions",
+            "FullRepositoryPropCustomProperties",
             "RepositoryRulesetBypassActor",
             "RepositoryRulesetConditions",
             "RepositoryRulesetConditionsPropRefName",
@@ -10713,8 +10734,12 @@ else:
             "RepositoryRulesetConditionsRepositoryNameTargetPropRepositoryName",
             "RepositoryRulesetConditionsRepositoryIdTarget",
             "RepositoryRulesetConditionsRepositoryIdTargetPropRepositoryId",
+            "RepositoryRulesetConditionsRepositoryPropertyTarget",
+            "RepositoryRulesetConditionsRepositoryPropertyTargetPropRepositoryProperty",
+            "RepositoryRulesetConditionsRepositoryPropertySpec",
             "OrgRulesetConditionsOneof0",
             "OrgRulesetConditionsOneof1",
+            "OrgRulesetConditionsOneof2",
             "RepositoryRuleCreation",
             "RepositoryRuleDeletion",
             "RepositoryRuleRequiredSignatures",
@@ -10990,7 +11015,6 @@ else:
             "GitTreePropTreeItems",
             "HookResponse",
             "Hook",
-            "HookPropConfig",
             "Import",
             "ImportPropProjectChoicesItems",
             "PorterAuthor",
@@ -11061,6 +11085,7 @@ else:
             "PageBuildPropError",
             "PageBuildStatus",
             "PageDeployment",
+            "PagesDeploymentStatus",
             "PagesHealthCheck",
             "PagesHealthCheckPropDomain",
             "PagesHealthCheckPropAltDomain",
@@ -13490,6 +13515,7 @@ else:
             "WebhookSecretScanningAlertReopened",
             "WebhookSecretScanningAlertResolved",
             "WebhookSecretScanningAlertRevoked",
+            "WebhookSecretScanningAlertValidated",
             "WebhookSecurityAdvisoryPublished",
             "WebhookSecurityAdvisoryPublishedPropSecurityAdvisory",
             "WebhookSecurityAdvisoryPublishedPropSecurityAdvisoryPropCvss",
@@ -14018,7 +14044,6 @@ else:
             "ReposOwnerRepoHooksPostBody",
             "ReposOwnerRepoHooksPostBodyPropConfig",
             "ReposOwnerRepoHooksHookIdPatchBody",
-            "ReposOwnerRepoHooksHookIdPatchBodyPropConfig",
             "ReposOwnerRepoHooksHookIdConfigPatchBody",
             "ReposOwnerRepoImportPutBody",
             "ReposOwnerRepoImportPatchBody",
@@ -14063,8 +14088,9 @@ else:
             "ReposOwnerRepoPagesPostBodyPropSource",
             "ReposOwnerRepoPagesPostBodyAnyof0",
             "ReposOwnerRepoPagesPostBodyAnyof1",
-            "ReposOwnerRepoPagesDeploymentPostBody",
+            "ReposOwnerRepoPagesDeploymentsPostBody",
             "ReposOwnerRepoProjectsPostBody",
+            "ReposOwnerRepoPropertiesValuesPatchBody",
             "ReposOwnerRepoPullsPostBody",
             "ReposOwnerRepoPullsCommentsCommentIdPatchBody",
             "ReposOwnerRepoPullsCommentsCommentIdReactionsPostBody",

githubkit/retry.py

@@ -0,0 +1,74 @@
+from datetime import timedelta
+
+from .log import logger
+from .typing import RetryOption as RetryOption
+from .typing import RetryDecisionFunc as RetryDecisionFunc
+from .exception import RequestFailed, GitHubException, RateLimitExceeded
+
+
+class RetryRateLimit:
+    __slots__ = ("max_retry",)
+
+    def __init__(self, max_retry: int = 1) -> None:
+        self.max_retry = max_retry
+
+    def __call__(self, exc: GitHubException, retry_count: int) -> RetryOption:
+        # retry once for rate limit exceeded
+        # https://github.com/octokit/octokit.js/blob/450c662e4f29b63a6dbe7592ba5ef53d5fa01d88/src/octokit.ts#L34-L65
+        if retry_count < self.max_retry and isinstance(exc, RateLimitExceeded):
+            logger.warning(
+                f"{exc.__class__.__name__} for request "
+                f"{exc.request.method} {exc.request.url}",
+                exc_info=exc,
+            )
+            return RetryOption(True, exc.retry_after)
+
+        return RetryOption(False)
+
+
+RETRY_RATE_LIMIT = RetryRateLimit()
+
+
+class RetryServerError:
+    __slots__ = ("max_retry",)
+
+    def __init__(self, max_retry: int = 3) -> None:
+        self.max_retry = max_retry
+
+    def __call__(self, exc: GitHubException, retry_count: int) -> RetryOption:
+        # retry three times for server error
+        # https://github.com/octokit/plugin-retry.js/blob/3b9897a58d8b2c37cfba6a8df78e4619d346098a/src/error-request.ts#L11-L14
+        if (
+            retry_count < self.max_retry
+            and isinstance(exc, RequestFailed)
+            and exc.response.status_code >= 500
+        ):
+            logger.warning(
+                f"Server error encountered for request "
+                f"{exc.request.method} {exc.request.url}",
+                exc_info=exc,
+            )
+            return RetryOption(True, timedelta(seconds=(retry_count + 1) ** 2))
+
+        return RetryOption(False)
+
+
+RETRY_SERVER_ERROR = RetryServerError()
+
+
+class RetryChainDecision:
+    __slots__ = ("decision_funcs",)
+
+    def __init__(self, *decision_funcs: RetryDecisionFunc) -> None:
+        self.decision_funcs = decision_funcs
+
+    def __call__(self, exc: GitHubException, retry_count: int) -> RetryOption:
+        for decision_func in self.decision_funcs:
+            retry_option = decision_func(exc, retry_count)
+            if retry_option.do_retry:
+                return retry_option
+
+        return RetryOption(False)
+
+
+RETRY_DEFAULT = RetryChainDecision(RETRY_RATE_LIMIT, RETRY_SERVER_ERROR)

githubkit/typing.py

@@ -1,11 +1,25 @@
+from datetime import timedelta
 from typing_extensions import Annotated, TypeAlias
-from typing import IO, Dict, List, Tuple, Union, Literal, TypeVar, Hashable, Optional
+from typing import (
+    IO,
+    Dict,
+    List,
+    Tuple,
+    Union,
+    Literal,
+    TypeVar,
+    Callable,
+    Hashable,
+    Optional,
+    NamedTuple,
+)
 
 import httpx
 from pydantic import Field
 
 from .utils import UNSET
 from .compat import PYDANTIC_V2
+from .exception import GitHubException
 
 T = TypeVar("T")
 H = TypeVar("H", bound=Hashable)
@@ -64,4 +78,12 @@ else:  # pragma: pydantic-v1
 
 # if the property is not required, we allow it to have the value null.
 # See https://github.com/yanyongyu/githubkit/issues/47
-Missing: TypeAlias = Annotated[Union[Literal[UNSET], T, None], Field(default=UNSET)]
+Missing: TypeAlias = Union[Literal[UNSET], T, None]
+
+
+class RetryOption(NamedTuple):
+    do_retry: bool
+    retry_after: Optional[timedelta] = None
+
+
+RetryDecisionFunc: TypeAlias = Callable[[GitHubException, int], RetryOption]

githubkit/utils.py

@@ -3,7 +3,6 @@ from enum import Enum
 from typing import Any, Dict, Type, Generic, Literal, TypeVar, final
 
 from pydantic import BaseModel
-from pydantic_core import to_jsonable_python
 
 from .compat import PYDANTIC_V2, custom_validation, type_validate_python
 
@@ -69,20 +68,6 @@ def is_async(obj: Any) -> bool:
     return inspect.iscoroutinefunction(func_)
 
 
-# FIXME: remove pydantic-core dependency
-def obj_to_jsonable(obj: Any) -> Any:
-    if isinstance(obj, dict):
-        return {k: obj_to_jsonable(v) for k, v in obj.items()}
-
-    if isinstance(obj, (list, tuple)):
-        return [obj_to_jsonable(item) for item in obj]
-
-    if obj is None or isinstance(obj, (int, float, str, bool)):
-        return obj
-
-    return to_jsonable_python(obj)
-
-
 class TaggedUnion(Generic[T]):
     __slots__ = ("type_", "discriminator", "tag")