🐛 Fix: literal cannot use unset const (yanyongyu#117)

jmehnle · Jul 19, 2024 · 7e66386 · 7e66386
1 parent 67a54c7
commit 7e66386
Show file tree

Hide file tree

Showing 1,280 changed files with 21,501 additions and 21,089 deletions.
diff --git a/codegen/templates/rest/_param.py.jinja b/codegen/templates/rest/_param.py.jinja
@@ -46,7 +46,7 @@ headers: Optional[Dict[str, str]] = None,
 {{ header_params(endpoint) }}
 {{ cookie_params(endpoint) }}
 *,
-data: Literal[UNSET] = UNSET,
+data: UnsetType = UNSET,
 headers: Optional[Dict[str, str]] = None,
 {{ body_params(model, endpoint.param_names) }}
 {% endmacro %}

diff --git a/codegen/templates/rest/client.py.jinja b/codegen/templates/rest/client.py.jinja
@@ -14,7 +14,7 @@ from typing import TYPE_CHECKING, Dict, Literal, Optional, overload
 
 from pydantic import BaseModel, Field
 
-from githubkit.typing import Missing
+from githubkit.typing import Missing, UnsetType
 from githubkit.utils import exclude_unset, UNSET
 from githubkit.compat import model_dump, type_validate_python
 

diff --git a/githubkit/core.py b/githubkit/core.py
@@ -10,7 +10,6 @@
     Type,
     Union,
     Generic,
-    Literal,
     TypeVar,
     Optional,
     Generator,
@@ -28,23 +27,24 @@
 from .compat import to_jsonable_python
 from .config import Config, get_config
 from .auth import BaseAuthStrategy, TokenAuthStrategy, UnauthAuthStrategy
+from .exception import (
+    RequestError,
+    RequestFailed,
+    RequestTimeout,
+    GitHubException,
+    PrimaryRateLimitExceeded,
+    SecondaryRateLimitExceeded,
+)
 from .typing import (
     URLTypes,
+    UnsetType,
     CookieTypes,
     HeaderTypes,
     ContentTypes,
     RequestFiles,
     QueryParamTypes,
     RetryDecisionFunc,
 )
-from .exception import (
-    RequestError,
-    RequestFailed,
-    RequestTimeout,
-    GitHubException,
-    PrimaryRateLimitExceeded,
-    SecondaryRateLimitExceeded,
-)
 
 T = TypeVar("T")
 A = TypeVar("A", bound="BaseAuthStrategy")
@@ -332,14 +332,14 @@ def _check(
     def _check(
         self,
         response: httpx.Response,
-        response_model: Literal[UNSET] = UNSET,
+        response_model: UnsetType = UNSET,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Response[Any]: ...
 
     def _check(
         self,
         response: httpx.Response,
-        response_model: Union[Type[T], Literal[UNSET]] = UNSET,
+        response_model: Union[Type[T], UnsetType] = UNSET,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Union[Response[T], Response[Any]]:
         if response.is_error:
@@ -446,7 +446,7 @@ def request(
         json: Optional[Any] = None,
         headers: Optional[HeaderTypes] = None,
         cookies: Optional[CookieTypes] = None,
-        response_model: Literal[UNSET] = UNSET,
+        response_model: UnsetType = UNSET,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Response[Any]: ...
 
@@ -462,7 +462,7 @@ def request(
         json: Optional[Any] = None,
         headers: Optional[HeaderTypes] = None,
         cookies: Optional[CookieTypes] = None,
-        response_model: Union[Type[T], Literal[UNSET]] = UNSET,
+        response_model: Union[Type[T], UnsetType] = UNSET,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Union[Response[T], Response[Any]]:
         retry_count: int = 0
@@ -523,7 +523,7 @@ async def arequest(
         json: Optional[Any] = None,
         headers: Optional[HeaderTypes] = None,
         cookies: Optional[CookieTypes] = None,
-        response_model: Literal[UNSET] = UNSET,
+        response_model: UnsetType = UNSET,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Response[Any]: ...
 
@@ -539,7 +539,7 @@ async def arequest(
         json: Optional[Any] = None,
         headers: Optional[HeaderTypes] = None,
         cookies: Optional[CookieTypes] = None,
-        response_model: Union[Type[T], Literal[UNSET]] = UNSET,
+        response_model: Union[Type[T], UnsetType] = UNSET,
         error_models: Optional[Dict[str, type]] = None,
     ) -> Union[Response[T], Response[Any]]:
         retry_count: int = 0

diff --git a/githubkit/rest/__init__.py b/githubkit/rest/__init__.py
@@ -4586,6 +4586,9 @@
     from githubkit.versions.v2022_11_28.models import (
         OrgsOrgActionsRunnersRunnerIdLabelsGetResponse200 as OrgsOrgActionsRunnersRunnerIdLabelsGetResponse200,
     )
+    from githubkit.versions.v2022_11_28.models import (
+        OrgsOrgCodeSecurityConfigurationsDetachDeleteBody as OrgsOrgCodeSecurityConfigurationsDetachDeleteBody,
+    )
     from githubkit.versions.v2022_11_28.models import (
         OrgsOrgCopilotBillingSelectedTeamsPostResponse201 as OrgsOrgCopilotBillingSelectedTeamsPostResponse201,
     )
@@ -12218,6 +12221,7 @@
             "OrgsOrgAttestationsSubjectDigestGetResponse200PropAttestationsItemsPropBundlePropVerificationMaterial",
             "OrgsOrgAttestationsSubjectDigestGetResponse200PropAttestationsItemsPropBundlePropDsseEnvelope",
             "OrgsOrgCodeSecurityConfigurationsPostBody",
+            "OrgsOrgCodeSecurityConfigurationsDetachDeleteBody",
             "OrgsOrgCodeSecurityConfigurationsConfigurationIdPatchBody",
             "OrgsOrgCodeSecurityConfigurationsConfigurationIdAttachPostBody",
             "OrgsOrgCodeSecurityConfigurationsConfigurationIdDefaultsPutBody",

diff --git a/githubkit/typing.py b/githubkit/typing.py
@@ -17,7 +17,7 @@
 import httpx
 from pydantic import Field
 
-from .utils import UNSET
+from .utils import Unset
 from .compat import PYDANTIC_V2
 from .exception import GitHubException
 
@@ -76,9 +76,11 @@ def _validate_unique_list(value: List[H]) -> List[H]:
 else:  # pragma: pydantic-v1
     UniqueList: TypeAlias = Annotated[List[H], Field(unique_items=True)]  # type: ignore
 
+UnsetType: TypeAlias = Literal[Unset._UNSET]
+
 # if the property is not required, we allow it to have the value null.
 # See https://github.com/yanyongyu/githubkit/issues/47
-Missing: TypeAlias = Union[Literal[UNSET], T, None]
+Missing: TypeAlias = Union[UnsetType, T, None]
 
 
 class RetryOption(NamedTuple):