fix - pydantic model_validator("after")/classmethod deprecation

pydantic.warnings.PydanticDeprecatedSince212: Using `@model_validator` with mode='after' on a classmethod is deprecated. Instead, use an instance method. See the documentation at https://docs.pydantic.dev/2.12/concepts/validators/#model-after-validator. Deprecated in Pydantic V2.12 to be removed in V3.0.

Author: commonism

src/aiopenapi3/v30/parameter.py

@@ -316,9 +316,11 @@ class Parameter(ParameterBase, _ParameterCodec):
     in_: _In = Field(alias="in")  # TODO must be one of ["query","header","path","cookie"]
 
     @model_validator(mode="after")
-    def validate_Parameter(cls, p: "ParameterBase"):
-        assert p.in_ != "path" or p.required is True, "Parameter '%s' must be required since it is in the path" % p.name
-        return p
+    def validate_Parameter(self):
+        assert self.in_ != "path" or self.required is True, (
+            "Parameter '%s' must be required since it is in the path" % self.name
+        )
+        return self
 
 
 def encode_parameter(

src/aiopenapi3/v30/paths.py

@@ -38,15 +38,14 @@ class Link(ObjectExtended):
     server: Server | None = Field(default=None)
 
     @model_validator(mode="after")
-    @classmethod
-    def validate_Link_operation(cls, l: '__types["Link"]'):  # type: ignore[name-defined]
+    def validate_Link_operation(self):  # type: ignore[name-defined]
         assert not (
-            l.operationId != None and l.operationRef != None
+            self.operationId != None and self.operationRef != None
         ), "operationId and operationRef are mutually exclusive, only one of them is allowed"
         assert not (
-            l.operationId == l.operationRef == None
+            self.operationId == self.operationRef == None
         ), "operationId and operationRef are mutually exclusive, one of them must be specified"
-        return l
+        return self
 
 
 class Response(ObjectExtended):

src/aiopenapi3/v30/schemas.py

@@ -74,13 +74,12 @@ def is_boolean_schema(cls, data: Any) -> Any:
             return {"not": {}}
 
     @model_validator(mode="after")
-    @classmethod
-    def validate_Schema_number_type(cls, s: "Schema"):
-        if s.type == "integer":
+    def validate_Schema_number_type(self):
+        if self.type == "integer":
             for i in ["minimum", "maximum"]:
-                if (v := getattr(s, i, None)) is not None and not isinstance(v, int):
-                    setattr(s, i, int(v))
-        return s
+                if (v := getattr(self, i, None)) is not None and not isinstance(v, int):
+                    setattr(self, i, int(v))
+        return self
 
     def __getstate__(self):
         return SchemaBase.__getstate__(self)

src/aiopenapi3/v30/servers.py

@@ -17,11 +17,11 @@ class ServerVariable(ObjectExtended):
     description: str | None = Field(default=None)
 
     @model_validator(mode="after")
-    def validate_ServerVariable(cls, s: "ServerVariable"):
-        assert isinstance(s.enum, (list, None.__class__))
+    def validate_ServerVariable(self):
+        assert isinstance(self.enum, (list, None.__class__))
         # default value must be in enum
-        assert s.default is None or s.default in (s.enum or [s.default])
-        return s
+        assert self.default is None or self.default in (self.enum or [self.default])
+        return self
 
 
 class Server(ObjectExtended):

src/aiopenapi3/v31/info.py

@@ -27,13 +27,12 @@ class License(ObjectExtended):
     url: str | None = Field(default=None)
 
     @model_validator(mode="after")
-    @classmethod
-    def validate_License(cls, l: "License"):
+    def validate_License(self):
         """
         A URL to the license used for the API. This MUST be in the form of a URL. The url field is mutually exclusive of the identifier field.
         """
-        assert not all([getattr(l, i, None) is not None for i in ["identifier", "url"]])
-        return l
+        assert not all([getattr(self, i, None) is not None for i in ["identifier", "url"]])
+        return self
 
 
 class Info(ObjectExtended):

src/aiopenapi3/v31/paths.py

@@ -38,14 +38,14 @@ class Link(ObjectExtended):
     server: Server | None = Field(default=None)
 
     @model_validator(mode="after")
-    def validate_Link_operation(cls, l: '__types["Link"]'):  # type: ignore[name-defined]
+    def validate_Link_operation(self):  # type: ignore[name-defined]
         assert not (
-            l.operationId != None and l.operationRef != None
+            self.operationId != None and self.operationRef != None
         ), "operationId and operationRef are mutually exclusive, only one of them is allowed"
         assert not (
-            l.operationId == l.operationRef == None
+            self.operationId == self.operationRef == None
         ), "operationId and operationRef are mutually exclusive, one of them must be specified"
-        return l
+        return self
 
 
 class Response(ObjectExtended):

src/aiopenapi3/v31/root.py

@@ -35,10 +35,9 @@ class Root(ObjectExtended, RootBase):
     externalDocs: dict[Any, Any] = Field(default_factory=dict)
 
     @model_validator(mode="after")
-    @classmethod
-    def validate_Root(cls, r: "Root") -> "Self":
-        assert r.paths or r.components or r.webhooks
-        return r
+    def validate_Root(self) -> "Self":
+        assert self.paths or self.components or self.webhooks
+        return self
 
     def _resolve_references(self, api):
         RootBase.resolve(api, self, self, PathItem, Reference)

src/aiopenapi3/v31/schemas.py

@@ -173,13 +173,12 @@ def is_boolean_schema(cls, data: Any) -> Any:
             return {"not": {}}
 
     @model_validator(mode="after")
-    @classmethod
-    def validate_Schema_number_type(cls, s: "Schema"):
-        if s.type == "integer":
+    def validate_Schema_number_type(self):
+        if self.type == "integer":
             for i in ["minimum", "maximum"]:
-                if (v := getattr(s, i, None)) is not None and not isinstance(v, int):
-                    setattr(s, i, int(v))
-        return s
+                if (v := getattr(self, i, None)) is not None and not isinstance(v, int):
+                    setattr(self, i, int(v))
+        return self
 
     def __getstate__(self):
         return SchemaBase.__getstate__(self)

src/aiopenapi3/v31/servers.py

@@ -17,11 +17,11 @@ class ServerVariable(ObjectExtended):
     description: str | None = Field(default=None)
 
     @model_validator(mode="after")
-    def validate_ServerVariable(cls, s: "ServerVariable"):
-        assert isinstance(s.enum, (list, None.__class__))
+    def validate_ServerVariable(self):
+        assert isinstance(self.enum, (list, None.__class__))
         # default value must be in enum
-        assert s.default is None or s.default in (s.enum or [s.default])
-        return s
+        assert self.default is None or self.default in (self.enum or [self.default])
+        return self
 
 
 class Server(ObjectExtended):