Added initial pydanticV2 support.

Signed-off-by: Pavel Kirilin <win10@list.ru>

Author: s3rius

README.md

@@ -154,7 +154,7 @@ class UserInfo(BaseModel):
 
 @router.post("/users")
 async def new_data(user: UserInfo = Depends(Json())):
-    return web.json_response({"user": user.dict()})
+    return web.json_response({"user": user.model_dump()})
 
 ```
 
@@ -168,7 +168,7 @@ If you want to make this data optional, just mark it as optional.
 async def new_data(user: Optional[UserInfo] = Depends(Json())):
     if user is None:
         return web.json_response({"user": None})
-    return web.json_response({"user": user.dict()})
+    return web.json_response({"user": user.model_dump()})
 
 ```
 
@@ -275,19 +275,18 @@ To make the magic happen, please add `arbitrary_types_allowed` to the config of
 
 
 ```python
-from pydantic import BaseModel
+import pydantic
 from aiohttp_deps import Router, Depends, Form
 from aiohttp import web
 
 router = Router()
 
 
-class MyForm(BaseModel):
+class MyForm(pydantic.BaseModel):
     id: int
     file: web.FileField
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = pydantic.ConfigDict(arbitrary_types_allowed=True)
 
 
 @router.post("/")

aiohttp_deps/swagger.py

@@ -3,8 +3,8 @@
 from logging import getLogger
 from typing import Any, Awaitable, Callable, Dict, Optional, Union
 
+import pydantic
 from aiohttp import web
-from pydantic import schema_of
 from pydantic.utils import deep_update
 from taskiq_dependencies import DependencyGraph
 
@@ -103,8 +103,9 @@ def _add_route_def(  # noqa: C901
                 dependency.signature
                 and dependency.signature.annotation != inspect.Parameter.empty
             ):
-                input_schema = schema_of(
+                input_schema = pydantic.TypeAdapter(
                     dependency.signature.annotation,
+                ).json_schema(
                     ref_template=REF_TEMPLATE,
                 )
                 openapi_schema["components"]["schemas"].update(

aiohttp_deps/utils.py

@@ -68,14 +68,15 @@ def __call__(  # noqa: C901, WPS210
             return value
 
         try:
-            return pydantic.parse_obj_as(definition, value)
+            return pydantic.TypeAdapter(definition).validate_python(value)
         except pydantic.ValidationError as err:
-            errors = err.errors()
+            errors = err.errors(include_url=False)
             for error in errors:
                 error["loc"] = (
                     "header",
                     header_name,
                 ) + error["loc"]
+                error.pop("input", None)  # type: ignore
             raise web.HTTPBadRequest(
                 headers={"Content-Type": "application/json"},
                 text=json.dumps(errors),
@@ -120,11 +121,12 @@ async def __call__(  # noqa: C901
             return body
 
         try:
-            return pydantic.parse_obj_as(definition, body)
+            return pydantic.TypeAdapter(definition).validate_python(body)
         except pydantic.ValidationError as err:
-            errors = err.errors()
+            errors = err.errors(include_url=False)
             for error in errors:
                 error["loc"] = ("body",) + error["loc"]
+                error.pop("input", None)  # type: ignore
             raise web.HTTPBadRequest(
                 headers={"Content-Type": "application/json"},
                 text=json.dumps(errors),
@@ -192,14 +194,15 @@ def __call__(  # noqa: C901, WPS210
             return value
 
         try:
-            return pydantic.parse_obj_as(definition, value)
+            return pydantic.TypeAdapter(definition).validate_python(value)
         except pydantic.ValidationError as err:
-            errors = err.errors()
+            errors = err.errors(include_url=False)
             for error in errors:
                 error["loc"] = (
                     "query",
                     param_name,
                 ) + error["loc"]
+                error.pop("input", None)  # type: ignore
             raise web.HTTPBadRequest(
                 headers={"Content-Type": "application/json"},
                 text=json.dumps(errors),
@@ -242,10 +245,11 @@ async def __call__(
             return form_data
 
         try:
-            return pydantic.parse_obj_as(definition, form_data)
+            return pydantic.TypeAdapter(definition).validate_python(form_data)
         except pydantic.ValidationError as err:
-            errors = err.errors()
+            errors = err.errors(include_url=False)
             for error in errors:
+                error.pop("input", None)  # type: ignore
                 error["loc"] = ("form",) + error["loc"]
             raise web.HTTPBadRequest(
                 headers={"Content-Type": "application/json"},
@@ -299,10 +303,11 @@ def __call__(
             return matched_data
 
         try:
-            return pydantic.parse_obj_as(definition, matched_data)
+            return pydantic.TypeAdapter(definition).validate_python(matched_data)
         except pydantic.ValidationError as err:
-            errors = err.errors()
+            errors = err.errors(include_url=False)
             for error in errors:
+                error.pop("input", None)  # type: ignore
                 error["loc"] = ("path",) + error["loc"]
             raise web.HTTPBadRequest(
                 headers={"Content-Type": "application/json"},