Turn off mypy for complex tests; simplify.

Mypy is fragile. It was generating a false positive error,
saying it couldn't find ConfigDictExt. Appeasing it in these tests
also makes the code less readable. Solution: turn off mypy in some
tests and aim for better readability.

Author: hathawsh

tests/util/test_optional_and_computed.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import Optional
 
 import pytest
@@ -12,7 +14,7 @@
     Response,
     Schema,
 )
-from openapi_pydantic.compat import PYDANTIC_V2, JsonSchemaMode
+from openapi_pydantic.compat import PYDANTIC_V2
 from openapi_pydantic.util import PydanticSchema, construct_open_api_with_schema_class
 
 
@@ -57,7 +59,7 @@ def test_optional_and_computed_fields() -> None:
 def construct_sample_api() -> OpenAPI:
     from typing import TYPE_CHECKING, Callable
 
-    from pydantic import BaseModel, ConfigDict
+    from pydantic import BaseModel
 
     if TYPE_CHECKING:
 
@@ -67,23 +69,20 @@ def computed_field(x: Callable) -> Callable:
     else:
         from pydantic import computed_field
 
-    class ConfigDictExt(ConfigDict, total=False):
-        json_schema_mode: JsonSchemaMode
-
     class SampleModel(BaseModel):
         req: bool
         opt: Optional[bool] = None
 
-        @computed_field  # type: ignore
+        @computed_field
         @property
         def comp(self) -> bool:
             return True
 
     class SampleRequest(SampleModel):
-        model_config = ConfigDictExt(json_schema_mode="validation")
+        model_config = {"json_schema_mode": "validation"}
 
     class SampleResponse(SampleModel):
-        model_config = ConfigDictExt(json_schema_mode="serialization")
+        model_config = {"json_schema_mode": "serialization"}
 
     return OpenAPI(
         info=Info(

tests/v3_0_3/test_optional_and_computed.py

@@ -1,8 +1,10 @@
+# mypy: ignore-errors
+
 from typing import Optional
 
 import pytest
 
-from openapi_pydantic.compat import PYDANTIC_V2, JsonSchemaMode
+from openapi_pydantic.compat import PYDANTIC_V2
 from openapi_pydantic.v3.v3_0_3 import (
     Info,
     MediaType,
@@ -60,7 +62,7 @@ def test_optional_and_computed_fields() -> None:
 def construct_sample_api() -> OpenAPI:
     from typing import TYPE_CHECKING, Callable
 
-    from pydantic import BaseModel, ConfigDict
+    from pydantic import BaseModel
 
     if TYPE_CHECKING:
 
@@ -70,9 +72,6 @@ def computed_field(x: Callable) -> Callable:
     else:
         from pydantic import computed_field
 
-    class ConfigDictExt(ConfigDict, total=False):
-        json_schema_mode: JsonSchemaMode
-
     class SampleModel(BaseModel):
         req: bool
         opt: Optional[bool] = None
@@ -83,10 +82,10 @@ def comp(self) -> bool:
             return True
 
     class SampleRequest(SampleModel):
-        model_config = ConfigDictExt(json_schema_mode="validation")
+        model_config = {"json_schema_mode": "validation"}
 
     class SampleResponse(SampleModel):
-        model_config = ConfigDictExt(json_schema_mode="serialization")
+        model_config = {"json_schema_mode": "serialization"}
 
     return OpenAPI(
         info=Info(