Merge pull request #11 from taskiq-python/feature/pydanticv2

Author: s3rius

poetry.lock

@@ -27,7 +27,7 @@ keywords = ["taskiq", "pipelines", "tasks", "distributed", "async"]
 python = "^3.8.1"
 taskiq = ">=0.0.8, <1"
 typing-extensions = "^4.3.0"
-pydantic = "^1.6.2"
+pydantic = "^2"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7"

pyproject.toml

@@ -42,7 +42,9 @@ async def post_save(  # noqa: C901, WPS212
             return
         pipeline_data = message.labels[PIPELINE_DATA]
         try:
-            steps_data = pydantic.parse_raw_as(List[DumpedStep], pipeline_data)
+            steps_data = pydantic.TypeAdapter(List[DumpedStep]).validate_json(
+                pipeline_data,
+            )
         except ValueError:
             return
         if current_step_num + 1 >= len(steps_data):
@@ -99,7 +101,7 @@ async def on_error(
             return
         pipe_data = message.labels[PIPELINE_DATA]
         try:
-            steps = pydantic.parse_raw_as(List[DumpedStep], pipe_data)
+            steps = pydantic.TypeAdapter(List[DumpedStep]).validate_json(pipe_data)
         except ValueError:
             return
         if current_step_num == len(steps) - 1:

taskiq_pipelines/middleware.py

@@ -328,7 +328,7 @@ def dumps(self) -> str:
         :returns: serialized pipeline.
         """
         return json.dumps(
-            [step.dict() for step in self.steps],
+            [step.model_dump() for step in self.steps],
         )
 
     @classmethod
@@ -344,7 +344,7 @@ def loads(cls, broker: AsyncBroker, pipe_data: str) -> "Pipeline[Any, Any]":
         :return: new
         """
         pipe: "Pipeline[Any, Any]" = Pipeline(broker)
-        pipe.steps = pydantic.parse_raw_as(List[DumpedStep], pipe_data)
+        pipe.steps = pydantic.TypeAdapter(List[DumpedStep]).validate_json(pipe_data)
         return pipe
 
     async def kiq(

taskiq_pipelines/pipeliner.py

@@ -84,7 +84,7 @@ def dumps(self) -> str:
 
         :return: returns json.
         """
-        return self.json()
+        return self.model_dump_json()
 
     @classmethod
     def loads(cls, data: str) -> "FilterStep":
@@ -94,7 +94,7 @@ def loads(cls, data: str) -> "FilterStep":
         :param data: dumped data.
         :return: parsed step.
         """
-        return pydantic.parse_raw_as(FilterStep, data)
+        return pydantic.TypeAdapter(FilterStep).validate_json(data)
 
     async def act(
         self,

taskiq_pipelines/steps/filter.py

@@ -81,7 +81,7 @@ def dumps(self) -> str:
 
         :return: returns json.
         """
-        return self.json()
+        return self.model_dump_json()
 
     @classmethod
     def loads(cls, data: str) -> "MapperStep":
@@ -91,7 +91,7 @@ def loads(cls, data: str) -> "MapperStep":
         :param data: dumped data.
         :return: parsed step.
         """
-        return pydantic.parse_raw_as(MapperStep, data)
+        return pydantic.TypeAdapter(MapperStep).validate_json(data)
 
     async def act(
         self,

taskiq_pipelines/steps/mapper.py

@@ -46,7 +46,7 @@ def dumps(self) -> str:
 
         :return: returns json.
         """
-        return self.json()
+        return self.model_dump_json()
 
     @classmethod
     def loads(cls, data: str) -> "SequentialStep":
@@ -56,7 +56,7 @@ def loads(cls, data: str) -> "SequentialStep":
         :param data: dumped data.
         :return: parsed step.
         """
-        return pydantic.parse_raw_as(SequentialStep, data)
+        return pydantic.TypeAdapter(SequentialStep).validate_json(data)
 
     async def act(
         self,