pydantic: move more imports to v1

src/saturn_engine/core/topic.py

@@ -45,8 +45,7 @@ def __init__(
             config: dict[str, dict[str, t.Optional[t.Any]]] = None,  # type: ignore[assignment]
             metadata: dict[str, dict[str, t.Optional[t.Any]]] = None,  # type: ignore[assignment]
             expire_after: t.Optional[datetime.timedelta | float] = None,
-        ) -> None:
-            ...
+        ) -> None: ...
 
     def __post_init__(self) -> None:
         if isinstance(self.expire_after, datetime.timedelta):

src/saturn_engine/database.py

@@ -44,9 +44,9 @@ def drop_all() -> None:
 
 def engine() -> Engine:
     init()
-    database_connection_creator: Optional[
-        str
-    ] = current_app.saturn.config.database_connection_creator
+    database_connection_creator: Optional[str] = (
+        current_app.saturn.config.database_connection_creator
+    )
     extra_args = {}
     if database_connection_creator:
         extra_args["creator"] = import_name(database_connection_creator)

src/saturn_engine/utils/asyncutils.py

@@ -183,12 +183,12 @@ def __init__(self, func: AsyncFNone, *, delay: float) -> None:
         self.delay = delay
         self.flush_event = asyncio.Event()
         self.delayed_task: t.Optional[asyncio.Task] = None
-        self.delayed_params: t.Optional[
-            tuple[tuple[t.Any, ...], dict[str, t.Any]]
-        ] = None
-        self.current_params: t.Optional[
-            tuple[tuple[t.Any, ...], dict[str, t.Any]]
-        ] = None
+        self.delayed_params: t.Optional[tuple[tuple[t.Any, ...], dict[str, t.Any]]] = (
+            None
+        )
+        self.current_params: t.Optional[tuple[tuple[t.Any, ...], dict[str, t.Any]]] = (
+            None
+        )
 
         self._call_fut: t.Optional[asyncio.Future] = None
 

src/saturn_engine/utils/declarative_config.py

@@ -2,7 +2,7 @@
 from dataclasses import field
 
 import yaml
-from pydantic import dataclasses
+from pydantic.v1 import dataclasses
 
 from saturn_engine.utils.options import fromdict
 

src/saturn_engine/utils/options.py

@@ -18,8 +18,7 @@ class Options:
         pass
 
     @abstractmethod
-    def __init__(self, *args: object, options: Options, **kwargs: object) -> None:
-        ...
+    def __init__(self, *args: object, options: Options, **kwargs: object) -> None: ...
 
     @classmethod
     def from_options(

src/saturn_engine/utils/tester/json_utils.py

@@ -5,13 +5,11 @@
 
 
 @overload
-def normalize_json(obj: dict) -> dict:
-    ...
+def normalize_json(obj: dict) -> dict: ...
 
 
 @overload
-def normalize_json(obj: list) -> list:
-    ...
+def normalize_json(obj: list) -> list: ...
 
 
 def normalize_json(obj: object) -> object:

src/saturn_engine/worker/broker.py

@@ -13,8 +13,7 @@
 
 
 class WorkManagerInit(Protocol):
-    def __call__(self, *, services: Services) -> WorkManager:
-        ...
+    def __call__(self, *, services: Services) -> WorkManager: ...
 
 
 class Broker:

src/saturn_engine/worker/executors/bootstrap.py

@@ -4,7 +4,7 @@
 from collections.abc import Iterable
 from collections.abc import Iterator
 
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 
 from saturn_engine.core import PipelineOutput
 from saturn_engine.core import PipelineResults

src/saturn_engine/worker/inventory.py

@@ -62,8 +62,7 @@ def __init__(
             metadata: dict[str, t.Any] = None,  # type: ignore[assignment]
             config: dict[str, t.Any] = None,  # type: ignore[assignment]
             context: AsyncExitStack = None,  # type: ignore[assignment]
-        ) -> None:
-            ...
+        ) -> None: ...
 
     def __post_init__(self) -> None:
         if self.cursor is MISSING:

src/saturn_engine/worker/services/__init__.py

@@ -31,8 +31,7 @@ class BaseServices:
 
 class ConfigContainer(t.Protocol):
     @property
-    def config(self) -> t.Union[LazyConfig, BaseConfig]:
-        ...
+    def config(self) -> t.Union[LazyConfig, BaseConfig]: ...
 
 
 T = TypeVar("T")

src/saturn_engine/worker/services/usage_metrics.py

@@ -122,15 +122,15 @@ class StagesState:
     executing: StageState[SubmittingMessage, ExecutingMessage] = dataclasses.field(
         default_factory=StageState
     )
-    processing_results: StageState[
-        ExecutableMessage, ProcessingMessage
-    ] = dataclasses.field(default_factory=StageState)
+    processing_results: StageState[ExecutableMessage, ProcessingMessage] = (
+        dataclasses.field(default_factory=StageState)
+    )
     publishing: StageState[ProcessingMessage, PublishingMessage] = dataclasses.field(
         default_factory=StageState
     )
-    waiting_publish: StageState[
-        PublishingMessage, ExecutableMessage
-    ] = dataclasses.field(default_factory=StageState)
+    waiting_publish: StageState[PublishingMessage, ExecutableMessage] = (
+        dataclasses.field(default_factory=StageState)
+    )
 
 
 class UsageMetrics(MinimalService):

src/saturn_engine/worker_manager/config/declarative.py

@@ -96,9 +96,9 @@ def compile_static_definitions(
             uncompied_resources_provider.data, ResourcesProvider
         )
         resources_provider_item = resources_provider.to_core_object()
-        definitions.resources_providers[
-            resources_provider_item.name
-        ] = resources_provider_item
+        definitions.resources_providers[resources_provider_item.name] = (
+            resources_provider_item
+        )
         definitions.resources_by_type[resources_provider_item.resource_type].append(
             resources_provider_item
         )

src/saturn_engine/worker_manager/config/static_definitions.py

@@ -23,6 +23,6 @@ class StaticDefinitions:
         default_factory=dict
     )
     resources: dict[str, ResourceItem] = dataclasses.field(default_factory=dict)
-    resources_by_type: dict[
-        str, list[t.Union[ResourceItem, ResourcesProviderItem]]
-    ] = dataclasses.field(default_factory=lambda: defaultdict(list))
+    resources_by_type: dict[str, list[t.Union[ResourceItem, ResourcesProviderItem]]] = (
+        dataclasses.field(default_factory=lambda: defaultdict(list))
+    )

tests/conftest.py

@@ -81,8 +81,7 @@ def event_loop(
         loop.close()
 
 
-def pipeline() -> None:
-    ...
+def pipeline() -> None: ...
 
 
 @pytest.fixture

tests/worker/test_broker.py

@@ -56,8 +56,7 @@ async def open(self) -> None:
         await self.add(ProvidedResource(name="fake-resource", data={"foo": "bar"}))
 
 
-def pipeline(resource: FakeResource) -> None:
-    ...
+def pipeline(resource: FakeResource) -> None: ...
 
 
 @pytest.fixture

tests/worker/test_executor.py

@@ -94,8 +94,7 @@ async def test_base_executor(
     assert executor.processed == 10
 
 
-def pipeline(resource: FakeResource) -> None:
-    ...
+def pipeline(resource: FakeResource) -> None: ...
 
 
 @pytest.mark.asyncio

tests/worker/test_pipeline_info.py

@@ -16,45 +16,37 @@ class ResourceB(Resource):
     pass
 
 
-def simple_pipeline() -> None:
-    ...
+def simple_pipeline() -> None: ...
 
 
-def pipeline_with_resources(a: ResourceA, b: "ResourceB") -> None:
-    ...
+def pipeline_with_resources(a: ResourceA, b: "ResourceB") -> None: ...
 
 
 class Namespace:
-    def pipeline(self) -> None:
-        ...
+    def pipeline(self) -> None: ...
 
 
-def deleted_pipeline() -> None:
-    ...
+def deleted_pipeline() -> None: ...
 
 
-def modified_pipeline() -> None:
-    ...
+def modified_pipeline() -> None: ...
 
 
 def decorator(func: Callable) -> Callable:
     @wraps(func)
-    def wrapper() -> None:
-        ...
+    def wrapper() -> None: ...
 
     return wrapper
 
 
 @decorator
-def wrapped_pipeline() -> None:
-    ...
+def wrapped_pipeline() -> None: ...
 
 
 def test_pipeline_info_name() -> None:
     global deleted_pipeline, modified_pipeline
 
-    def local_pipeline() -> None:
-        ...
+    def local_pipeline() -> None: ...
 
     assert PipelineInfo.from_pipeline(simple_pipeline) == PipelineInfo(
         name="tests.worker.test_pipeline_info.simple_pipeline", resources={}

tests/worker/topics/conftest.py

@@ -14,8 +14,7 @@
 
 
 class RabbitMQTopicMaker(t.Protocol):
-    async def __call__(self, klass: t.Type[T], **kwargs: t.Any) -> T:
-        ...
+    async def __call__(self, klass: t.Type[T], **kwargs: t.Any) -> T: ...
 
 
 async def ensure_clean_queue(

tests/worker/topics/test_batching_topic.py

@@ -83,8 +83,7 @@ async def test_batching_topic_flush_timeout() -> None:
 
 class NestedTestTopic(Topic):
     @dataclasses.dataclass
-    class Options:
-        ...
+    class Options: ...
 
     def __init__(self, options: Options, services: Services, **kwargs: object) -> None:
         self.entered_context_managers: list[int] = []