chore: Type checking and formatting

Author: dbanty

openapi_python_client/schema/openapi_schema_pydantic/reference.py

@@ -1,7 +1,8 @@
-from typing import Annotated, Any, Literal, TypeVar
+from typing import Annotated, Any, Literal, TypeVar, Union
 
 from pydantic import BaseModel, ConfigDict, Discriminator, Field, Tag
 from pydantic_core import ArgsKwargs
+from typing_extensions import TypeAlias
 
 
 class Reference(BaseModel):
@@ -29,18 +30,17 @@ class Reference(BaseModel):
     )
 
 
-T = TypeVar('T')
+T = TypeVar("T")
 
 
-def _reference_discriminator(obj: Any) -> Literal['ref', 'other']:
+def _reference_discriminator(obj: Any) -> Literal["ref", "other"]:
     if isinstance(obj, dict):
-        return 'ref' if '$ref' in obj else 'other'
+        return "ref" if "$ref" in obj else "other"
     if isinstance(obj, ArgsKwargs):
-        return 'ref' if 'ref' in obj.kwargs else 'other'
-    return 'ref' if isinstance(obj, Reference) else 'other'
+        return "ref" if obj.kwargs and "ref" in obj.kwargs else "other"
+    return "ref" if isinstance(obj, Reference) else "other"
 
 
-ReferenceOr = Annotated[
-    Annotated[Reference, Tag('ref')] |
-    Annotated[T, Tag('other')],
-    Discriminator(_reference_discriminator)]
+ReferenceOr: TypeAlias = Annotated[
+    Union[Annotated[Reference, Tag("ref")], Annotated[T, Tag("other")]], Discriminator(_reference_discriminator)
+]

openapi_python_client/schema/openapi_schema_pydantic/responses.py

@@ -1,4 +1,3 @@
-
 from .reference import ReferenceOr
 from .response import Response
 

openapi_python_client/schema/openapi_schema_pydantic/schema.py

@@ -43,7 +43,7 @@ class Schema(BaseModel):
     anyOf: list[ReferenceOr["Schema"]] = Field(default_factory=list)
     schema_not: Optional[ReferenceOr["Schema"]] = Field(default=None, alias="not")
     items: Optional[ReferenceOr["Schema"]] = None
-    prefixItems: Optional[list[ReferenceOr["Schema"]]] = Field(default_factory=list)
+    prefixItems: list[ReferenceOr["Schema"]] = Field(default_factory=list)
     properties: Optional[dict[str, ReferenceOr["Schema"]]] = None
     additionalProperties: Optional[Union[bool, ReferenceOr["Schema"]]] = None
     description: Optional[str] = None

tests/test_schema/test_noisy_refs.py

@@ -11,7 +11,6 @@
 # References:
 #   [1] https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#reference-object
 #   [2] https://docs.pydantic.dev/latest/concepts/unions/#smart-mode
-import json
 from typing import Annotated, TypeVar, Union, get_args, get_origin
 
 import pytest
@@ -56,18 +55,21 @@ def deannotate_type(t):
 # The following types occur in various models, so we want to make sure they
 # parse properly.  They are verified to /fail/ to parse as of commit 3bd12f86.
 
-@pytest.mark.parametrize(("ref_or_type", "get_example_fn"), [
-    (ReferenceOr[Callback], lambda t: {"test1": get_example(PathItem),
-                                       "test2": get_example(PathItem)}),
-    (ReferenceOr[Example], get_example),
-    (ReferenceOr[Header], get_example),
-    (ReferenceOr[Link], get_example),
-    (ReferenceOr[Parameter], get_example),
-    (ReferenceOr[RequestBody], get_example),
-    (ReferenceOr[Response], get_example),
-    (ReferenceOr[Schema], get_example),
-    (ReferenceOr[SecurityScheme], get_example),
-])
+
+@pytest.mark.parametrize(
+    ("ref_or_type", "get_example_fn"),
+    [
+        (ReferenceOr[Callback], lambda t: {"test1": get_example(PathItem), "test2": get_example(PathItem)}),
+        (ReferenceOr[Example], get_example),
+        (ReferenceOr[Header], get_example),
+        (ReferenceOr[Link], get_example),
+        (ReferenceOr[Parameter], get_example),
+        (ReferenceOr[RequestBody], get_example),
+        (ReferenceOr[Response], get_example),
+        (ReferenceOr[Schema], get_example),
+        (ReferenceOr[SecurityScheme], get_example),
+    ],
+)
 def test_type(ref_or_type, get_example_fn):
     base_type = None
     for maybe_annotated_type in get_args(deannotate_type(ref_or_type)):