[DOP-25282] Fix test warnings

Author: dolfinus

pyproject.toml

@@ -237,8 +237,16 @@ markers = [
     "hive: tests for Hive",
     "postgres: tests on Postgres",
     "oracle: tests for Oracle",
+    "clickhouse: tests for Clickhouse",
+    "mysql: tests for MySQL",
+    "mssql: tests for MSSQL",
     "hdfs: tests for hadoop hdfs",
     "s3: tests for S3",
+    "ftp: tests for FTP",
+    "ftps: tests for FTPS",
+    "sftp: tests for SFTP",
+    "samba: tests for Samba",
+    "webdav: tests for WebDAV",
 ]
 
 [tool.coverage.paths]
@@ -457,6 +465,8 @@ per-file-ignores = [
 # WPS432 Found magic number: 256
   "*migrations/*.py:WPS102,WPS432",
   "*db/models/*.py:WPS102,WPS432",
+# WPS404 Found complex default value
+  "*server/api/*.py:WPS404",
 # WPS237 Found a too complex `f` string
   "*exceptions/*.py:WPS237",
   "*exceptions/__init__.py:F40,WPS410",

syncmaster/scheduler/transfer_job_manager.py

@@ -66,7 +66,7 @@ async def remove_orphan_jobs(self) -> None:
             self.scheduler.remove_job(str(job_id))
 
     @staticmethod
-    async def send_job_to_celery(transfer_id: int) -> None:
+    async def send_job_to_celery(transfer_id: int) -> None:  # noqa: WPS602, WPS217
         """
         1. Do not pass additional arguments like settings,
         otherwise they will be serialized in jobs table.
@@ -90,8 +90,8 @@ async def send_job_to_celery(transfer_id: int) -> None:
             async with unit_of_work:
                 run = await unit_of_work.run.create(
                     transfer_id=transfer_id,
-                    source_creds=ReadAuthDataSchema(auth_data=credentials_source).dict(),
-                    target_creds=ReadAuthDataSchema(auth_data=credentials_target).dict(),
+                    source_creds=ReadAuthDataSchema(auth_data=credentials_source).model_dump(),
+                    target_creds=ReadAuthDataSchema(auth_data=credentials_target).model_dump(),
                     type=RunType.SCHEDULED,
                 )
 

syncmaster/server/__init__.py

@@ -27,7 +27,7 @@ def celery_factory(settings: Settings) -> Celery:
     app = Celery(
         __name__,
         broker=settings.broker.url,
-        backend="db+" + settings.database.sync_url,
+        backend="db+" + settings.database.sync_url,  # noqa: WPS336
     )
     return app
 
@@ -50,7 +50,7 @@ def application_factory(settings: Settings) -> FastAPI:
     application.exception_handler(HTTPException)(http_exception_handler)
     application.exception_handler(Exception)(unknown_exception_handler)
 
-    engine = async_engine_from_config(settings.database.dict(), prefix="")
+    engine = async_engine_from_config(settings.database.model_dump(), prefix="")
     session_factory = create_session_factory(engine=engine)
 
     application.dependency_overrides.update(

syncmaster/server/api/v1/auth.py

@@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
+from http.client import NOT_FOUND
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException, Request
@@ -38,7 +39,7 @@ async def token(
         client_id=form_data.client_id,
         client_secret=form_data.client_secret,
     )
-    return AuthTokenSchema.parse_obj(token)
+    return AuthTokenSchema.model_validate(token)
 
 
 @router.get("/callback")
@@ -50,7 +51,7 @@ async def auth_callback(
 ):
     original_redirect_url = validate_state(state)
     if not original_redirect_url:
-        raise HTTPException(status_code=400, detail="Invalid state parameter")
+        raise HTTPException(status_code=NOT_FOUND, detail="Invalid state parameter")
     token = await auth_provider.get_token_authorization_code_grant(
         code=code,
         redirect_uri=auth_provider.settings.keycloak.redirect_uri,

syncmaster/server/api/v1/connections.py

@@ -37,7 +37,7 @@
 async def read_connections(
     group_id: int,
     page: int = Query(gt=0, default=1),
-    page_size: int = Query(gt=0, le=200, default=20),
+    page_size: int = Query(gt=0, le=50, default=20),  # noqa: WPS432
     type: list[ConnectionType] | None = Query(None),
     current_user: User = Depends(get_user(is_active=True)),
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
@@ -122,12 +122,12 @@ async def create_connection(
             type=connection_data.type,
             description=connection_data.description,
             group_id=connection_data.group_id,
-            data=connection_data.data.dict(),
+            data=connection_data.data.model_dump(),
         )
 
         await unit_of_work.credentials.create(
             connection_id=connection.id,
-            data=connection_data.auth_data.dict(),
+            data=connection_data.auth_data.model_dump(),
         )
 
     credentials = await unit_of_work.credentials.read(connection.id)
@@ -183,7 +183,7 @@ async def read_connection(
 
 
 @router.put("/connections/{connection_id}")
-async def update_connection(
+async def update_connection(  # noqa: WPS217, WPS238
     connection_id: int,
     connection_data: UpdateConnectionSchema,
     current_user: User = Depends(get_user(is_active=True)),
@@ -208,7 +208,7 @@ async def update_connection(
                 raise ConnectionTypeUpdateError
 
         existing_credentials = await unit_of_work.credentials.read(connection_id=connection_id)
-        auth_data = connection_data.auth_data.dict()
+        auth_data = connection_data.auth_data.model_dump()
         secret_field = connection_data.auth_data.secret_field
 
         if auth_data[secret_field] is None:
@@ -222,7 +222,7 @@ async def update_connection(
             name=connection_data.name,
             type=connection_data.type,
             description=connection_data.description,
-            data=connection_data.data.dict(),
+            data=connection_data.data.model_dump(),
         )
         await unit_of_work.credentials.update(
             connection_id=connection_id,
@@ -277,7 +277,7 @@ async def delete_connection(
 
 
 @router.post("/connections/{connection_id}/copy_connection")
-async def copy_connection(
+async def copy_connection(  # noqa: WPS238
     connection_id: int,
     copy_connection_data: ConnectionCopySchema,
     current_user: User = Depends(get_user(is_active=True)),

syncmaster/server/api/v1/groups.py

@@ -1,5 +1,7 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
+from http.client import OK
+
 from fastapi import APIRouter, Depends, Query
 
 from syncmaster.db.models import User
@@ -27,7 +29,7 @@
 @router.get("/groups")
 async def read_groups(
     page: int = Query(gt=0, default=1),
-    page_size: int = Query(gt=0, le=200, default=20),
+    page_size: int = Query(gt=0, le=50, default=20),  # noqa: WPS432
     role: str | None = Query(default=None),
     current_user: User = Depends(get_user(is_active=True)),
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
@@ -66,7 +68,7 @@ async def create_group(
             description=group_data.description,
             owner_id=current_user.id,
         )
-    return ReadGroupSchema.from_orm(group)
+    return ReadGroupSchema.model_validate(group, from_attributes=True)
 
 
 @router.get("/groups/{group_id}")
@@ -85,11 +87,14 @@ async def read_group(
 
     group = await unit_of_work.group.read_by_id(group_id=group_id)
     user_role = await unit_of_work.group.get_member_role(group_id=group_id, user_id=current_user.id)
-    return GroupWithUserRoleSchema.from_orm({"data": group, "role": user_role})
+    return GroupWithUserRoleSchema(
+        data=ReadGroupSchema.model_validate(group, from_attributes=True),
+        role=GroupMemberRole(user_role),
+    )
 
 
 @router.patch("/groups/{group_id}")
-async def update_group(
+async def update_group(  # noqa: WPS217
     group_id: int,
     group_data: UpdateGroupSchema,
     current_user: User = Depends(get_user(is_active=True)),
@@ -129,7 +134,7 @@ async def update_group(
                 new_user_id=previous_owner_id,
                 role=GroupMemberRole.Guest,
             )
-    return ReadGroupSchema.from_orm(group)
+    return ReadGroupSchema.model_validate(group, from_attributes=True)
 
 
 @router.delete("/groups/{group_id}", dependencies=[Depends(get_user(is_superuser=True))])
@@ -139,14 +144,14 @@ async def delete_group(
 ) -> StatusResponseSchema:
     async with unit_of_work:
         await unit_of_work.group.delete(group_id=group_id)
-    return StatusResponseSchema(ok=True, status_code=200, message="Group was deleted")
+    return StatusResponseSchema(ok=True, status_code=OK, message="Group was deleted")
 
 
 @router.get("/groups/{group_id}/users")
 async def read_group_users(
     group_id: int,
     page: int = Query(gt=0, default=1),
-    page_size: int = Query(gt=0, le=200, default=20),
+    page_size: int = Query(gt=0, le=50, default=20),  # noqa: WPS432
     current_user: User = Depends(get_user(is_active=True)),
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
 ) -> UserPageSchemaAsGroupMember:
@@ -192,7 +197,7 @@ async def update_user_role_group(
             role=update_user_data.role,
         )
 
-    return AddUserSchema.from_orm(result)
+    return AddUserSchema.model_validate(result, from_attributes=True)
 
 
 @router.post("/groups/{group_id}/users/{user_id}")
@@ -226,7 +231,7 @@ async def add_user_to_group(
         )
     return StatusResponseSchema(
         ok=True,
-        status_code=200,
+        status_code=OK,
         message="User was successfully added to group",
     )
 
@@ -256,4 +261,4 @@ async def delete_user_from_group(
             group_id=group_id,
             target_user_id=user_id,
         )
-    return StatusResponseSchema(ok=True, status_code=200, message="User was successfully removed from group")
+    return StatusResponseSchema(ok=True, status_code=OK, message="User was successfully removed from group")

syncmaster/server/api/v1/queue.py

@@ -25,7 +25,7 @@
 async def read_queues(
     group_id: int,
     page: int = Query(gt=0, default=1),
-    page_size: int = Query(gt=0, le=200, default=20),
+    page_size: int = Query(gt=0, le=50, default=20),  # noqa: WPS432
     current_user: User = Depends(get_user(is_active=True)),
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
     search_query: str | None = Query(
@@ -68,7 +68,7 @@ async def read_queue(
     queue = await unit_of_work.queue.read_by_id(
         queue_id=queue_id,
     )
-    return ReadQueueSchema.from_orm(queue)
+    return ReadQueueSchema.model_validate(queue, from_attributes=True)
 
 
 @router.post("/queues", description="Create new queue")
@@ -88,9 +88,9 @@ async def create_queue(
         raise ActionNotAllowedError
 
     async with unit_of_work:
-        queue = await unit_of_work.queue.create(queue_data.dict())
+        queue = await unit_of_work.queue.create(queue_data.model_dump())
 
-    return ReadQueueSchema.from_orm(queue)
+    return ReadQueueSchema.model_validate(queue, from_attributes=True)
 
 
 @router.patch("/queues/{queue_id}", description="Updating queue information")
@@ -116,7 +116,7 @@ async def update_queue(
             queue_id=queue_id,
             queue_data=queue_data,
         )
-    return ReadQueueSchema.from_orm(queue)
+    return ReadQueueSchema.model_validate(queue, from_attributes=True)
 
 
 @router.delete("/queues/{queue_id}", description="Delete queue by id")

syncmaster/server/api/v1/runs.py

@@ -33,7 +33,7 @@ async def read_runs(
     transfer_id: int,
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
     page: int = Query(gt=0, default=1),
-    page_size: int = Query(gt=0, le=200, default=20),
+    page_size: int = Query(gt=0, le=50, default=20),  # noqa: WPS432
     status: list[Status] | None = Query(default=None),
     started_at_since: datetime | None = Query(default=None),
     started_at_until: datetime | None = Query(default=None),
@@ -76,11 +76,11 @@ async def read_run(
     if resource_role == Permission.NONE:
         raise TransferNotFoundError
 
-    return ReadRunSchema.from_orm(run)
+    return ReadRunSchema.model_validate(run, from_attributes=True)
 
 
 @router.post("/runs")
-async def start_run(
+async def start_run(  # noqa: WPS217
     create_run_data: CreateRunSchema,
     settings: Annotated[Settings, Depends(Stub(Settings))],
     celery: Annotated[Celery, Depends(Stub(Celery))],
@@ -115,8 +115,8 @@ async def start_run(
             transfer_id=create_run_data.transfer_id,
             # Since fields with credentials may have different names (for example, S3 and Postgres have different names)
             # the work of checking fields and removing passwords is delegated to the ReadAuthDataSchema class
-            source_creds=ReadAuthDataSchema(auth_data=credentials_source).dict(),
-            target_creds=ReadAuthDataSchema(auth_data=credentials_target).dict(),
+            source_creds=ReadAuthDataSchema(auth_data=credentials_source).model_dump(),
+            target_creds=ReadAuthDataSchema(auth_data=credentials_target).model_dump(),
             type=RunType.MANUAL,
         )
 
@@ -134,7 +134,7 @@ async def start_run(
                 status=Status.FAILED,
             )
         raise CannotConnectToTaskQueueError(run_id=run.id) from e
-    return ReadRunSchema.from_orm(run)
+    return ReadRunSchema.model_validate(run, from_attributes=True)
 
 
 @router.post("/runs/{run_id}/stop")
@@ -160,4 +160,4 @@ async def stop_run(
     async with unit_of_work:
         run = await unit_of_work.run.stop(run_id=run_id)
         # TODO: add immediate stop transfer after stop Run
-    return ReadRunSchema.from_orm(run)
+    return ReadRunSchema.model_validate(run, from_attributes=True)