From c2154a65c447e5c56b11d4439298eb8198f0bb47 Mon Sep 17 00:00:00 2001 From: DAVID Axel <axel.david@etu.univ-amu.fr> Date: Wed, 3 May 2023 04:11:00 +0200 Subject: [PATCH] chore: :art: Change formatting of isort --- pyproject.toml | 2 +- src/openapidocs/v3.pyi | 7 ++----- src/strenum/__init__.pyi | 2 -- src/vigenere_api/api/app.py | 2 ++ src/vigenere_api/api/app.pyi | 3 +-- src/vigenere_api/api/utils/__init__.py | 1 + src/vigenere_api/api/utils/open_api_handler.py | 3 ++- .../api/v1/controllers/caesar/__init__.py | 1 + .../api/v1/controllers/caesar/caesar.py | 6 ++---- .../api/v1/controllers/caesar/caesar.pyi | 3 +-- .../api/v1/controllers/caesar/docs.py | 15 ++++++++------- src/vigenere_api/models/errors.py | 3 +-- src/vigenere_api/models/helper/errors.py | 3 +-- src/vigenere_api/models/helper/helper.py | 14 ++++++++------ src/vigenere_api/server.py | 3 +-- src/vigenere_api/version/__init__.py | 1 + src/vigenere_api/version/version.py | 1 + 17 files changed, 34 insertions(+), 36 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e5ff39..755d586 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -775,7 +775,7 @@ length_sort_straight = false length_sort_sections = [] reverse_relative = false -force_single_line = true +force_single_line = false single_line_exclusions = [] balanced_wrapping = false diff --git a/src/openapidocs/v3.pyi b/src/openapidocs/v3.pyi index 33651ef..17257bd 100644 --- a/src/openapidocs/v3.pyi +++ b/src/openapidocs/v3.pyi @@ -30,12 +30,9 @@ https://swagger.io/specification/. from abc import ABC from dataclasses import dataclass from enum import Enum -from typing import Any -from typing import Optional -from typing import Union +from typing import Any, Optional, Union -from openapidocs.common import OpenAPIElement -from openapidocs.common import OpenAPIRoot +from openapidocs.common import OpenAPIElement, OpenAPIRoot class ParameterLocation(Enum): QUERY = "query" diff --git a/src/strenum/__init__.pyi b/src/strenum/__init__.pyi index 9fef3c0..1edd5e9 100644 --- a/src/strenum/__init__.pyi +++ b/src/strenum/__init__.pyi @@ -25,10 +25,8 @@ import enum from typing import Any - class StrEnum(str, enum.Enum): def __str__(self) -> str: ... - @staticmethod def _generate_next_value_(name: str, *_: Any) -> str: ... diff --git a/src/vigenere_api/api/app.py b/src/vigenere_api/api/app.py index a963bbc..ef2af34 100644 --- a/src/vigenere_api/api/app.py +++ b/src/vigenere_api/api/app.py @@ -21,9 +21,11 @@ from blacksheep.server.env import is_development from blacksheep.server.responses import redirect from vigenere_api.version import get_version + from .v1.controllers import CaesarController as V1CaesarController from .v1.openapi_docs import docs as v1_docs + application = Application() application.debug = False application.show_error_details = False diff --git a/src/vigenere_api/api/app.pyi b/src/vigenere_api/api/app.pyi index d981a74..7d70fc9 100644 --- a/src/vigenere_api/api/app.pyi +++ b/src/vigenere_api/api/app.pyi @@ -14,8 +14,7 @@ # this program. If not, see <https://www.gnu.org/licenses/>. + # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -from blacksheep import Application -from blacksheep import Response +from blacksheep import Application, Response application: Application diff --git a/src/vigenere_api/api/utils/__init__.py b/src/vigenere_api/api/utils/__init__.py index aaee77d..98e67f3 100644 --- a/src/vigenere_api/api/utils/__init__.py +++ b/src/vigenere_api/api/utils/__init__.py @@ -19,4 +19,5 @@ from .controller import Controller from .open_api_handler import VigenereAPIOpenAPIHandler + __all__ = ["VigenereAPIOpenAPIHandler", "Controller"] diff --git a/src/vigenere_api/api/utils/open_api_handler.py b/src/vigenere_api/api/utils/open_api_handler.py index 4d4a236..a95cfbd 100644 --- a/src/vigenere_api/api/utils/open_api_handler.py +++ b/src/vigenere_api/api/utils/open_api_handler.py @@ -20,10 +20,11 @@ from typing import final, Final from blacksheep.server.openapi.ui import ReDocUIProvider from blacksheep.server.openapi.v3 import OpenAPIHandler + from openapidocs.common import Format from openapidocs.v3 import Contact, ExternalDocs, Info, License, OpenAPI, Tag - from vigenere_api.version import Version + from .errors import VersionTypeError from .open_api_route_filter import get_route_filter diff --git a/src/vigenere_api/api/v1/controllers/caesar/__init__.py b/src/vigenere_api/api/v1/controllers/caesar/__init__.py index f582c94..4fb5e93 100644 --- a/src/vigenere_api/api/v1/controllers/caesar/__init__.py +++ b/src/vigenere_api/api/v1/controllers/caesar/__init__.py @@ -18,4 +18,5 @@ from .caesar import CaesarController + __all__ = ["CaesarController"] diff --git a/src/vigenere_api/api/v1/controllers/caesar/caesar.py b/src/vigenere_api/api/v1/controllers/caesar/caesar.py index eda8491..40fffce 100644 --- a/src/vigenere_api/api/v1/controllers/caesar/caesar.py +++ b/src/vigenere_api/api/v1/controllers/caesar/caesar.py @@ -22,10 +22,8 @@ from blacksheep.server.controllers import post from vigenere_api.api.utils import Controller from vigenere_api.api.v1.openapi_docs import docs from vigenere_api.models import CaesarData -from .docs import ( - post_caesar_cipher_docs, - post_caesar_decipher_docs, -) + +from .docs import post_caesar_cipher_docs, post_caesar_decipher_docs class CaesarController(Controller): diff --git a/src/vigenere_api/api/v1/controllers/caesar/caesar.pyi b/src/vigenere_api/api/v1/controllers/caesar/caesar.pyi index 52aa6f5..868c77b 100644 --- a/src/vigenere_api/api/v1/controllers/caesar/caesar.pyi +++ b/src/vigenere_api/api/v1/controllers/caesar/caesar.pyi @@ -14,8 +14,7 @@ # this program. If not, see <https://www.gnu.org/licenses/>. + # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -from blacksheep import FromJSON -from blacksheep import Response +from blacksheep import FromJSON, Response from blacksheep.server.controllers import APIController from vigenere_api.models import CaesarData diff --git a/src/vigenere_api/api/v1/controllers/caesar/docs.py b/src/vigenere_api/api/v1/controllers/caesar/docs.py index cd25385..e7f5cf4 100644 --- a/src/vigenere_api/api/v1/controllers/caesar/docs.py +++ b/src/vigenere_api/api/v1/controllers/caesar/docs.py @@ -18,16 +18,17 @@ """The caesar controller's documentation.""" from dataclasses import dataclass -from enum import Enum -from enum import unique +from enum import Enum, unique from http import HTTPStatus from typing import final -from blacksheep.server.openapi.common import ContentInfo -from blacksheep.server.openapi.common import EndpointDocs -from blacksheep.server.openapi.common import RequestBodyInfo -from blacksheep.server.openapi.common import ResponseExample -from blacksheep.server.openapi.common import ResponseInfo +from blacksheep.server.openapi.common import ( + ContentInfo, + EndpointDocs, + RequestBodyInfo, + ResponseExample, + ResponseInfo, +) from vigenere_api.models import CaesarData diff --git a/src/vigenere_api/models/errors.py b/src/vigenere_api/models/errors.py index ee36652..5c211d5 100644 --- a/src/vigenere_api/models/errors.py +++ b/src/vigenere_api/models/errors.py @@ -16,8 +16,7 @@ """All errors thrown by the caesar model.""" -from typing import Any -from typing import final +from typing import Any, final from vigenere_api.helpers import VigenereAPITypeError diff --git a/src/vigenere_api/models/helper/errors.py b/src/vigenere_api/models/helper/errors.py index 169442b..2c39a40 100644 --- a/src/vigenere_api/models/helper/errors.py +++ b/src/vigenere_api/models/helper/errors.py @@ -16,8 +16,7 @@ """All errors thrown by the helper.""" -from typing import Any -from typing import final +from typing import Any, final from vigenere_api.helpers import VigenereAPITypeError diff --git a/src/vigenere_api/models/helper/helper.py b/src/vigenere_api/models/helper/helper.py index 9b1a4c2..0a5c41f 100644 --- a/src/vigenere_api/models/helper/helper.py +++ b/src/vigenere_api/models/helper/helper.py @@ -18,12 +18,14 @@ from typing import Literal -from .errors import HelperBadCharValueError -from .errors import HelperBadFirstLetterValueError -from .errors import HelperBadLengthCharValueError -from .errors import HelperCharTypeError -from .errors import HelperFirstLetterTypeError -from .errors import HelperKeyTypeError +from .errors import ( + HelperBadCharValueError, + HelperBadFirstLetterValueError, + HelperBadLengthCharValueError, + HelperCharTypeError, + HelperFirstLetterTypeError, + HelperKeyTypeError, +) def move_char(char: str, key: int, first_letter: Literal["a", "A"]) -> str: diff --git a/src/vigenere_api/server.py b/src/vigenere_api/server.py index fc65be2..3c2edc7 100644 --- a/src/vigenere_api/server.py +++ b/src/vigenere_api/server.py @@ -16,8 +16,7 @@ """Start method of API.""" -from uvicorn import Config -from uvicorn import Server +from uvicorn import Config, Server from .api import application diff --git a/src/vigenere_api/version/__init__.py b/src/vigenere_api/version/__init__.py index f1f1334..e9db55a 100644 --- a/src/vigenere_api/version/__init__.py +++ b/src/vigenere_api/version/__init__.py @@ -18,4 +18,5 @@ from .version import get_version, Version + __all__ = ["Version", "get_version"] diff --git a/src/vigenere_api/version/version.py b/src/vigenere_api/version/version.py index a91a12d..e18282a 100644 --- a/src/vigenere_api/version/version.py +++ b/src/vigenere_api/version/version.py @@ -30,6 +30,7 @@ from .errors import ( PatchTypeError, ) + StrictPositiveIntOrNull = int -- GitLab