From 24f4a1dcac1f8dc86c5ffe02cd4fc250afbcbc86 Mon Sep 17 00:00:00 2001 From: j3rrryy Date: Sat, 23 Nov 2024 02:04:23 +0300 Subject: [PATCH] feat: use Ruff --- README.md | 6 +++--- docker-compose.yml | 16 ++++++++-------- src/auth/config/__init__.py | 2 +- src/auth/controllers/__init__.py | 2 +- src/auth/database/__init__.py | 6 +++--- src/auth/database/crud.py | 2 +- src/auth/errors/__init__.py | 2 +- src/auth/proto/__init__.py | 2 +- src/auth/proto/auth_pb2.py | 1 + src/auth/proto/auth_pb2_grpc.py | 3 ++- src/auth/service/__init__.py | 2 +- src/auth/utils/__init__.py | 2 +- src/files/config/__init__.py | 2 +- src/files/controllers/__init__.py | 4 ++-- src/files/controllers/storage.py | 2 +- src/files/database/__init__.py | 6 +++--- src/files/proto/__init__.py | 2 +- src/files/proto/files_pb2.py | 1 + src/files/proto/files_pb2_grpc.py | 3 ++- src/files/service/__init__.py | 2 +- src/files/storage/__init__.py | 4 ++-- src/files/utils/__init__.py | 2 +- src/gateway/config/__init__.py | 2 +- src/gateway/proto/__init__.py | 4 ++-- src/gateway/proto/auth_pb2.py | 1 + src/gateway/proto/auth_pb2_grpc.py | 3 ++- src/gateway/proto/files_pb2.py | 1 + src/gateway/proto/files_pb2_grpc.py | 3 ++- src/gateway/routes/__init__.py | 1 - src/gateway/schemas/base.py | 1 - src/gateway/services/__init__.py | 8 ++++---- src/gateway/utils/__init__.py | 2 +- src/gateway/utils/utils.py | 2 +- src/mail/config/__init__.py | 2 +- src/mail/controllers/__init__.py | 2 +- src/mail/mail/__init__.py | 4 ++-- src/mail/service/__init__.py | 2 +- src/mail/services/__init__.py | 2 +- src/mail/utils/__init__.py | 2 +- 39 files changed, 61 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index d4d7518..6a35a51 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ MIT License - - Black formatter + + Ruff

@@ -36,7 +36,7 @@ > [!NOTE] > API located at `/api` -> +> > Docs located at `/api/docs`, but Swagger does not support MessagePack, so use another tool to send requests with this content type ## :computer: Requirements diff --git a/docker-compose.yml b/docker-compose.yml index 5b31e82..d50ffc4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: env_file: - ./docker/env/.env.dev volumes: - - ./:/app/ + - ./src/gateway/:/app/ networks: - nginx_network - main_network @@ -52,7 +52,7 @@ services: - auth - files - mail - command: bash -c "cd ./src/gateway/ && python ./main.py" + command: python ./main.py container_name: gateway_dev auth: @@ -64,14 +64,14 @@ services: env_file: - ./docker/env/.env.dev volumes: - - ./:/app/ + - ./src/auth/:/app/ networks: - main_network - auth_network depends_on: - auth_postgres - auth_redis - command: bash -c "cd ./src/auth/ && alembic -c "./config/alembic.ini" upgrade head && python ./main.py" + command: bash -c "alembic -c "./config/alembic.ini" upgrade head && python ./main.py" container_name: auth_dev auth_postgres: @@ -108,7 +108,7 @@ services: env_file: - ./docker/env/.env.dev volumes: - - ./:/app/ + - ./src/files/:/app/ networks: - main_network - files_network @@ -116,7 +116,7 @@ services: - files_minio - files_postgres - files_redis - command: bash -c "cd ./src/files/ && alembic -c "./config/alembic.ini" upgrade head && python ./main.py" + command: bash -c "alembic -c "./config/alembic.ini" upgrade head && python ./main.py" container_name: files_dev files_minio: @@ -202,10 +202,10 @@ services: env_file: - ./docker/env/.env.dev volumes: - - ./:/app/ + - ./src/mail/:/app/ networks: - mail_network depends_on: - mail_kafka - command: bash -c "cd ./src/mail/ && python ./main.py" + command: python ./main.py container_name: mail_dev diff --git a/src/auth/config/__init__.py b/src/auth/config/__init__.py index 1110335..a68689f 100644 --- a/src/auth/config/__init__.py +++ b/src/auth/config/__init__.py @@ -1 +1 @@ -from .config import * +from .config import * # noqa: F403 diff --git a/src/auth/controllers/__init__.py b/src/auth/controllers/__init__.py index dfab7bf..6a35040 100644 --- a/src/auth/controllers/__init__.py +++ b/src/auth/controllers/__init__.py @@ -1 +1 @@ -from .database import * +from .database import * # noqa: F403 diff --git a/src/auth/database/__init__.py b/src/auth/database/__init__.py index 2bb4b0d..62814b6 100644 --- a/src/auth/database/__init__.py +++ b/src/auth/database/__init__.py @@ -1,3 +1,3 @@ -from .crud import * -from .engine import * -from .models import * +from .crud import * # noqa: F403 +from .engine import * # noqa: F403 +from .models import * # noqa: F403 diff --git a/src/auth/database/crud.py b/src/auth/database/crud.py index de57e1b..0fad0a8 100644 --- a/src/auth/database/crud.py +++ b/src/auth/database/crud.py @@ -169,7 +169,7 @@ async def validate_refresh_token( ).scalar_one_or_none() else: result = await session.get(RefreshToken, token_or_id) - + return bool(result) except Exception as exc: exc.args = (StatusCode.INTERNAL, "Internal database error") diff --git a/src/auth/errors/__init__.py b/src/auth/errors/__init__.py index 9b0db57..32f1819 100644 --- a/src/auth/errors/__init__.py +++ b/src/auth/errors/__init__.py @@ -1 +1 @@ -from .errors import * +from .errors import * # noqa: F403 diff --git a/src/auth/proto/__init__.py b/src/auth/proto/__init__.py index 93abaa4..60dd670 100644 --- a/src/auth/proto/__init__.py +++ b/src/auth/proto/__init__.py @@ -1 +1 @@ -from .auth_pb2_grpc import * +from .auth_pb2_grpc import * # noqa: F403 diff --git a/src/auth/proto/auth_pb2.py b/src/auth/proto/auth_pb2.py index 00094f5..fe5b252 100644 --- a/src/auth/proto/auth_pb2.py +++ b/src/auth/proto/auth_pb2.py @@ -4,6 +4,7 @@ # source: auth.proto # Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import runtime_version as _runtime_version diff --git a/src/auth/proto/auth_pb2_grpc.py b/src/auth/proto/auth_pb2_grpc.py index bcd66e5..3ad4457 100644 --- a/src/auth/proto/auth_pb2_grpc.py +++ b/src/auth/proto/auth_pb2_grpc.py @@ -1,5 +1,6 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" + import grpc from . import auth_pb2 as auth__pb2 @@ -20,7 +21,7 @@ if _version_not_supported: raise RuntimeError( f"The grpc package installed is at version {GRPC_VERSION}," - + f" but the generated code in auth_pb2_grpc.py depends on" + + " but the generated code in auth_pb2_grpc.py depends on" + f" grpcio>={GRPC_GENERATED_VERSION}." + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}" + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}." diff --git a/src/auth/service/__init__.py b/src/auth/service/__init__.py index 21144f4..afc2e8d 100644 --- a/src/auth/service/__init__.py +++ b/src/auth/service/__init__.py @@ -1 +1 @@ -from .service import * +from .service import * # noqa: F403 diff --git a/src/auth/utils/__init__.py b/src/auth/utils/__init__.py index 5657b56..80587fc 100644 --- a/src/auth/utils/__init__.py +++ b/src/auth/utils/__init__.py @@ -1 +1 @@ -from .utils import * +from .utils import * # noqa: F403 diff --git a/src/files/config/__init__.py b/src/files/config/__init__.py index 1110335..a68689f 100644 --- a/src/files/config/__init__.py +++ b/src/files/config/__init__.py @@ -1 +1 @@ -from .config import * +from .config import * # noqa: F403 diff --git a/src/files/controllers/__init__.py b/src/files/controllers/__init__.py index 61fc8df..28340e8 100644 --- a/src/files/controllers/__init__.py +++ b/src/files/controllers/__init__.py @@ -1,2 +1,2 @@ -from .database import * -from .storage import * +from .database import * # noqa: F403 +from .storage import * # noqa: F403 diff --git a/src/files/controllers/storage.py b/src/files/controllers/storage.py index 253734f..1ddbb6d 100644 --- a/src/files/controllers/storage.py +++ b/src/files/controllers/storage.py @@ -17,7 +17,7 @@ async def upload_file( ) -> dict[str, str]: SIZE_NAMES = ("B", "KB", "MB", "GB") - metadata = await anext(data_iterator) + metadata = await anext(data_iterator) # noqa: F821 data = {"user_id": metadata.user_id, "name": metadata.name} file_size = await CRUD.upload_file(data_iterator, data, client) diff --git a/src/files/database/__init__.py b/src/files/database/__init__.py index 2bb4b0d..62814b6 100644 --- a/src/files/database/__init__.py +++ b/src/files/database/__init__.py @@ -1,3 +1,3 @@ -from .crud import * -from .engine import * -from .models import * +from .crud import * # noqa: F403 +from .engine import * # noqa: F403 +from .models import * # noqa: F403 diff --git a/src/files/proto/__init__.py b/src/files/proto/__init__.py index 2a308d7..20556aa 100644 --- a/src/files/proto/__init__.py +++ b/src/files/proto/__init__.py @@ -1 +1 @@ -from .files_pb2_grpc import * +from .files_pb2_grpc import * # noqa: F403 diff --git a/src/files/proto/files_pb2.py b/src/files/proto/files_pb2.py index 8e97de8..0bc9c69 100644 --- a/src/files/proto/files_pb2.py +++ b/src/files/proto/files_pb2.py @@ -4,6 +4,7 @@ # source: files.proto # Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import runtime_version as _runtime_version diff --git a/src/files/proto/files_pb2_grpc.py b/src/files/proto/files_pb2_grpc.py index 9d19e38..ec94df1 100644 --- a/src/files/proto/files_pb2_grpc.py +++ b/src/files/proto/files_pb2_grpc.py @@ -1,5 +1,6 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" + import grpc from . import files_pb2 as files__pb2 @@ -20,7 +21,7 @@ if _version_not_supported: raise RuntimeError( f"The grpc package installed is at version {GRPC_VERSION}," - + f" but the generated code in files_pb2_grpc.py depends on" + + " but the generated code in files_pb2_grpc.py depends on" + f" grpcio>={GRPC_GENERATED_VERSION}." + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}" + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}." diff --git a/src/files/service/__init__.py b/src/files/service/__init__.py index 21144f4..afc2e8d 100644 --- a/src/files/service/__init__.py +++ b/src/files/service/__init__.py @@ -1 +1 @@ -from .service import * +from .service import * # noqa: F403 diff --git a/src/files/storage/__init__.py b/src/files/storage/__init__.py index 89b2b54..48a6dc7 100644 --- a/src/files/storage/__init__.py +++ b/src/files/storage/__init__.py @@ -1,2 +1,2 @@ -from .crud import * -from .engine import * +from .crud import * # noqa: F403 +from .engine import * # noqa: F403 diff --git a/src/files/utils/__init__.py b/src/files/utils/__init__.py index 5657b56..80587fc 100644 --- a/src/files/utils/__init__.py +++ b/src/files/utils/__init__.py @@ -1 +1 @@ -from .utils import * +from .utils import * # noqa: F403 diff --git a/src/gateway/config/__init__.py b/src/gateway/config/__init__.py index 1110335..a68689f 100644 --- a/src/gateway/config/__init__.py +++ b/src/gateway/config/__init__.py @@ -1 +1 @@ -from .config import * +from .config import * # noqa: F403 diff --git a/src/gateway/proto/__init__.py b/src/gateway/proto/__init__.py index 408fe3b..95c94ef 100644 --- a/src/gateway/proto/__init__.py +++ b/src/gateway/proto/__init__.py @@ -1,2 +1,2 @@ -from .auth_pb2_grpc import * -from .files_pb2_grpc import * +from .auth_pb2_grpc import * # noqa: F403 +from .files_pb2_grpc import * # noqa: F403 diff --git a/src/gateway/proto/auth_pb2.py b/src/gateway/proto/auth_pb2.py index 00094f5..fe5b252 100644 --- a/src/gateway/proto/auth_pb2.py +++ b/src/gateway/proto/auth_pb2.py @@ -4,6 +4,7 @@ # source: auth.proto # Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import runtime_version as _runtime_version diff --git a/src/gateway/proto/auth_pb2_grpc.py b/src/gateway/proto/auth_pb2_grpc.py index bcd66e5..3ad4457 100644 --- a/src/gateway/proto/auth_pb2_grpc.py +++ b/src/gateway/proto/auth_pb2_grpc.py @@ -1,5 +1,6 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" + import grpc from . import auth_pb2 as auth__pb2 @@ -20,7 +21,7 @@ if _version_not_supported: raise RuntimeError( f"The grpc package installed is at version {GRPC_VERSION}," - + f" but the generated code in auth_pb2_grpc.py depends on" + + " but the generated code in auth_pb2_grpc.py depends on" + f" grpcio>={GRPC_GENERATED_VERSION}." + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}" + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}." diff --git a/src/gateway/proto/files_pb2.py b/src/gateway/proto/files_pb2.py index 8e97de8..0bc9c69 100644 --- a/src/gateway/proto/files_pb2.py +++ b/src/gateway/proto/files_pb2.py @@ -4,6 +4,7 @@ # source: files.proto # Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" + from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import runtime_version as _runtime_version diff --git a/src/gateway/proto/files_pb2_grpc.py b/src/gateway/proto/files_pb2_grpc.py index 9d19e38..ec94df1 100644 --- a/src/gateway/proto/files_pb2_grpc.py +++ b/src/gateway/proto/files_pb2_grpc.py @@ -1,5 +1,6 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" + import grpc from . import files_pb2 as files__pb2 @@ -20,7 +21,7 @@ if _version_not_supported: raise RuntimeError( f"The grpc package installed is at version {GRPC_VERSION}," - + f" but the generated code in files_pb2_grpc.py depends on" + + " but the generated code in files_pb2_grpc.py depends on" + f" grpcio>={GRPC_GENERATED_VERSION}." + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}" + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}." diff --git a/src/gateway/routes/__init__.py b/src/gateway/routes/__init__.py index ede302b..e69de29 100644 --- a/src/gateway/routes/__init__.py +++ b/src/gateway/routes/__init__.py @@ -1 +0,0 @@ -from .v1 import auth, files diff --git a/src/gateway/schemas/base.py b/src/gateway/schemas/base.py index 0e4eeb6..e371667 100644 --- a/src/gateway/schemas/base.py +++ b/src/gateway/schemas/base.py @@ -4,6 +4,5 @@ class BaseStruct(Struct): - def to_dict(self) -> dict[str, Any]: return {field: getattr(self, field) for field in self.__struct_fields__} diff --git a/src/gateway/services/__init__.py b/src/gateway/services/__init__.py index 4052219..d961d41 100644 --- a/src/gateway/services/__init__.py +++ b/src/gateway/services/__init__.py @@ -1,4 +1,4 @@ -from .auth import * -from .connect import * -from .files import * -from .mail import * +from .auth import * # noqa: F403 +from .connect import * # noqa: F403 +from .files import * # noqa: F403 +from .mail import * # noqa: F403 diff --git a/src/gateway/utils/__init__.py b/src/gateway/utils/__init__.py index 16281fe..e0fe9da 100644 --- a/src/gateway/utils/__init__.py +++ b/src/gateway/utils/__init__.py @@ -1 +1 @@ -from .utils import * +from .utils import * # noqa: F403 diff --git a/src/gateway/utils/utils.py b/src/gateway/utils/utils.py index 3281cfa..8022ca9 100644 --- a/src/gateway/utils/utils.py +++ b/src/gateway/utils/utils.py @@ -23,7 +23,7 @@ async def chunk_generator( async def converted_chunks_generator( - chunk_generator: AsyncGenerator[dict[str, str | bytes], None] + chunk_generator: AsyncGenerator[dict[str, str | bytes], None], ) -> AsyncGenerator[pb2.UploadFileRequest, None]: async for chunk in chunk_generator: request = pb2.UploadFileRequest(**chunk) diff --git a/src/mail/config/__init__.py b/src/mail/config/__init__.py index 1110335..a68689f 100644 --- a/src/mail/config/__init__.py +++ b/src/mail/config/__init__.py @@ -1 +1 @@ -from .config import * +from .config import * # noqa: F403 diff --git a/src/mail/controllers/__init__.py b/src/mail/controllers/__init__.py index 2db6c49..cf2d3dc 100644 --- a/src/mail/controllers/__init__.py +++ b/src/mail/controllers/__init__.py @@ -1 +1 @@ -from .mail import * +from .mail import * # noqa: F403 diff --git a/src/mail/mail/__init__.py b/src/mail/mail/__init__.py index 897164d..4ef71b0 100644 --- a/src/mail/mail/__init__.py +++ b/src/mail/mail/__init__.py @@ -1,2 +1,2 @@ -from .engine import * -from .send import * +from .engine import * # noqa: F403 +from .send import * # noqa: F403 diff --git a/src/mail/service/__init__.py b/src/mail/service/__init__.py index 21144f4..afc2e8d 100644 --- a/src/mail/service/__init__.py +++ b/src/mail/service/__init__.py @@ -1 +1 @@ -from .service import * +from .service import * # noqa: F403 diff --git a/src/mail/services/__init__.py b/src/mail/services/__init__.py index 6ce5f0f..44df247 100644 --- a/src/mail/services/__init__.py +++ b/src/mail/services/__init__.py @@ -1 +1 @@ -from .connect import * +from .connect import * # noqa: F403 diff --git a/src/mail/utils/__init__.py b/src/mail/utils/__init__.py index 5657b56..80587fc 100644 --- a/src/mail/utils/__init__.py +++ b/src/mail/utils/__init__.py @@ -1 +1 @@ -from .utils import * +from .utils import * # noqa: F403