Fixed pydantic v1 support.

Author: s3rius

taskiq/abc/broker.py

@@ -23,7 +23,6 @@
 )
 from uuid import uuid4
 
-from pydantic import TypeAdapter
 from typing_extensions import ParamSpec, Self, TypeAlias
 
 from taskiq.abc.middleware import TaskiqMiddleware
@@ -331,15 +330,15 @@ def inner(
                 sign = get_type_hints(func)
                 return_type = None
                 if "return" in sign:
-                    return_type = TypeAdapter(sign["return"])
+                    return_type = sign["return"]
 
                 decorated_task = wrapper(
                     self.decorator_class(
                         broker=self,
                         original_func=func,
                         labels=inner_labels,
                         task_name=inner_task_name,
-                        return_type=return_type,
+                        return_type=return_type,  # type: ignore
                     ),
                 )
 

taskiq/compat.py

@@ -1,6 +1,6 @@
 # flake8: noqa
 from functools import lru_cache
-from typing import Any, Dict, Optional, Type, TypeVar, Union
+from typing import Any, Dict, Hashable, Optional, Type, TypeVar, Union
 
 import pydantic
 from importlib_metadata import version
@@ -12,13 +12,13 @@
 IS_PYDANTIC2 = PYDANTIC_VER >= Version("2.0")
 
 if IS_PYDANTIC2:
-    T = TypeVar("T")
+    T = TypeVar("T", bound=Hashable)
 
     @lru_cache()
-    def create_type_adapter(annot: T) -> pydantic.TypeAdapter[T]:
+    def create_type_adapter(annot: Type[T]) -> pydantic.TypeAdapter[T]:
         return pydantic.TypeAdapter(annot)
 
-    def parse_obj_as(annot: T, obj: Any) -> T:
+    def parse_obj_as(annot: Type[T], obj: Any) -> T:
         return create_type_adapter(annot).validate_python(obj)
 
     def model_validate(

taskiq/decor.py

@@ -8,12 +8,12 @@
     Dict,
     Generic,
     Optional,
+    Type,
     TypeVar,
     Union,
     overload,
 )
 
-from pydantic import TypeAdapter
 from typing_extensions import ParamSpec
 
 from taskiq.kicker import AsyncKicker
@@ -52,7 +52,7 @@ def __init__(
         task_name: str,
         original_func: Callable[_FuncParams, _ReturnType],
         labels: Dict[str, Any],
-        return_type: Optional[TypeAdapter[_ReturnType]] = None,
+        return_type: Optional[Type[_ReturnType]] = None,
     ) -> None:
         self.broker = broker
         self.task_name = task_name

taskiq/kicker.py

@@ -9,12 +9,13 @@
     Dict,
     Generic,
     Optional,
+    Type,
     TypeVar,
     Union,
     overload,
 )
 
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel
 from typing_extensions import ParamSpec
 
 from taskiq.abc.middleware import TaskiqMiddleware
@@ -46,7 +47,7 @@ def __init__(
         task_name: str,
         broker: "AsyncBroker",
         labels: Dict[str, Any],
-        return_type: Optional[TypeAdapter[_ReturnType]] = None,
+        return_type: Optional[Type[_ReturnType]] = None,
     ) -> None:
         self.task_name = task_name
         self.broker = broker

taskiq/task.py

@@ -1,11 +1,11 @@
 import asyncio
 from logging import getLogger
 from time import time
-from typing import TYPE_CHECKING, Any, Generic, Optional
+from typing import TYPE_CHECKING, Any, Generic, Optional, Type
 
-from pydantic import TypeAdapter
 from typing_extensions import TypeVar
 
+from taskiq.compat import parse_obj_as
 from taskiq.exceptions import (
     ResultGetError,
     ResultIsReadyError,
@@ -29,7 +29,7 @@ def __init__(
         self,
         task_id: str,
         result_backend: "AsyncResultBackend[_ReturnType]",
-        return_type: Optional[TypeAdapter[_ReturnType]] = None,
+        return_type: Optional[Type[_ReturnType]] = None,
     ) -> None:
         self.task_id = task_id
         self.result_backend = result_backend
@@ -65,7 +65,8 @@ async def get_result(self, with_logs: bool = False) -> "TaskiqResult[_ReturnType
             )
             if self.return_type is not None:
                 try:
-                    res.return_value = self.return_type.validate_python(
+                    res.return_value = parse_obj_as(
+                        self.return_type,
                         res.return_value,
                     )
                 except ValueError: