Pydantiv2.4.0 compat

faststream/__about__.py

@@ -1,5 +1,5 @@
 """Simple and fast framework to create message brokers based microservices"""
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 
 INSTALL_YAML = """

faststream/_compat.py

@@ -84,13 +84,13 @@ def raise_fastapi_validation_error(errors: List[Any], body: AnyDict) -> Never:
 
 if PYDANTIC_V2:
     from pydantic import ConfigDict as ConfigDict
-    from pydantic._internal._annotated_handlers import (
+    from pydantic.annotated_handlers import (
         GetJsonSchemaHandler as GetJsonSchemaHandler,
     )
     from pydantic_core import CoreSchema as CoreSchema
     from pydantic_core import to_jsonable_python
     from pydantic_core.core_schema import (
-        general_plain_validator_function as general_plain_validator_function,
+        with_info_plain_validator_function as with_info_plain_validator_function,
     )
 
     SCHEMA_FIELD = "json_schema_extra"
@@ -168,7 +168,8 @@ def model_to_jsonable(
     def model_copy(model: ModelVar, **kwargs: Any) -> ModelVar:
         return model.copy(**kwargs)
 
-    def general_plain_validator_function(  # type: ignore[misc]
+    # TODO: pydantic types misc
+    def with_info_plain_validator_function(  # type: ignore[misc]
         function: Callable[..., Any],
         *,
         ref: Optional[str] = None,

faststream/asyncapi/schema/info.py

@@ -9,7 +9,7 @@
     JsonSchemaValue,
     Required,
     TypedDict,
-    general_plain_validator_function,
+    with_info_plain_validator_function,
     is_installed,
 )
 from faststream.log import logger
@@ -54,7 +54,7 @@ def __get_pydantic_core_schema__(
             source: Type[Any],
             handler: Callable[[Any], CoreSchema],
         ) -> JsonSchemaValue:
-            return general_plain_validator_function(cls._validate)
+            return with_info_plain_validator_function(cls._validate)
 
 
 class ContactDict(TypedDict, total=False):

faststream/asyncapi/schema/message.py

@@ -5,9 +5,7 @@
 from faststream._compat import PYDANTIC_V2
 from faststream.asyncapi.schema.utils import (
     ExternalDocs,
-    ExternalDocsDict,
     Tag,
-    TagDict,
 )
 
 
@@ -72,8 +70,12 @@ class Message(BaseModel):
     # examples
     # traits
 
-    tags: Optional[List[Union[Tag, TagDict, Dict[str, Any]]]] = None
-    externalDocs: Optional[Union[ExternalDocs, ExternalDocsDict, Dict[str, Any]]] = None
+    tags: Optional[
+        List[Union[Tag, Dict[str, Any]]]
+    ] = None  # TODO: weird TagDict behavior
+    externalDocs: Optional[
+        Union[ExternalDocs, Dict[str, Any]]
+    ] = None  # TODO: weird ExternalDocsDict behavior
 
     if PYDANTIC_V2:
         model_config = {"extra": "allow"}