From 6743f1d62a4b392e9131db492be3aaa2b98148bc Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Sun, 23 Jul 2023 02:24:39 +0300 Subject: [PATCH] optimize schemas import --- src/ahriman/web/schemas/__init__.py | 19 +++++++++++++++++++ src/ahriman/web/views/service/add.py | 4 +--- src/ahriman/web/views/service/pgp.py | 5 +---- src/ahriman/web/views/service/rebuild.py | 4 +--- src/ahriman/web/views/service/remove.py | 4 +--- src/ahriman/web/views/service/request.py | 4 +--- src/ahriman/web/views/service/search.py | 5 +---- src/ahriman/web/views/service/update.py | 3 +-- src/ahriman/web/views/status/logs.py | 6 +----- src/ahriman/web/views/status/package.py | 5 +---- src/ahriman/web/views/status/packages.py | 4 +--- src/ahriman/web/views/status/status.py | 5 +---- src/ahriman/web/views/user/login.py | 4 +--- src/ahriman/web/views/user/logout.py | 3 +-- tests/ahriman/web/schemas/test_auth_schema.py | 2 +- .../web/schemas/test_package_name_schema.py | 2 +- 16 files changed, 34 insertions(+), 45 deletions(-) diff --git a/src/ahriman/web/schemas/__init__.py b/src/ahriman/web/schemas/__init__.py index 8fc622e9..c713f97d 100644 --- a/src/ahriman/web/schemas/__init__.py +++ b/src/ahriman/web/schemas/__init__.py @@ -17,3 +17,22 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +from ahriman.web.schemas.aur_package_schema import AURPackageSchema +from ahriman.web.schemas.auth_schema import AuthSchema +from ahriman.web.schemas.counters_schema import CountersSchema +from ahriman.web.schemas.error_schema import ErrorSchema +from ahriman.web.schemas.internal_status_schema import InternalStatusSchema +from ahriman.web.schemas.log_schema import LogSchema +from ahriman.web.schemas.login_schema import LoginSchema +from ahriman.web.schemas.logs_schema import LogsSchema +from ahriman.web.schemas.oauth2_schema import OAuth2Schema +from ahriman.web.schemas.package_name_schema import PackageNameSchema +from ahriman.web.schemas.package_names_schema import PackageNamesSchema +from ahriman.web.schemas.package_properties_schema import PackagePropertiesSchema +from ahriman.web.schemas.package_schema import PackageSchema +from ahriman.web.schemas.package_status_schema import PackageStatusSimplifiedSchema, PackageStatusSchema +from ahriman.web.schemas.pgp_key_id_schema import PGPKeyIdSchema +from ahriman.web.schemas.pgp_key_schema import PGPKeySchema +from ahriman.web.schemas.remote_schema import RemoteSchema +from ahriman.web.schemas.search_schema import SearchSchema +from ahriman.web.schemas.status_schema import StatusSchema diff --git a/src/ahriman/web/views/service/add.py b/src/ahriman/web/views/service/add.py index 2d800b46..9dbc7001 100644 --- a/src/ahriman/web/views/service/add.py +++ b/src/ahriman/web/views/service/add.py @@ -22,9 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPBadRequest, HTTPNoContent from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.package_names_schema import PackageNamesSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNamesSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/service/pgp.py b/src/ahriman/web/views/service/pgp.py index 80f48fb0..2e49b868 100644 --- a/src/ahriman/web/views/service/pgp.py +++ b/src/ahriman/web/views/service/pgp.py @@ -22,10 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPBadRequest, HTTPNoContent, HTTPNotFound, Response, json_response from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.pgp_key_id_schema import PGPKeyIdSchema -from ahriman.web.schemas.pgp_key_schema import PGPKeySchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PGPKeyIdSchema, PGPKeySchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/service/rebuild.py b/src/ahriman/web/views/service/rebuild.py index 0fe24236..ec9193dd 100644 --- a/src/ahriman/web/views/service/rebuild.py +++ b/src/ahriman/web/views/service/rebuild.py @@ -22,9 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPBadRequest, HTTPNoContent from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.package_names_schema import PackageNamesSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNamesSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/service/remove.py b/src/ahriman/web/views/service/remove.py index a3e7ac62..edb13d71 100644 --- a/src/ahriman/web/views/service/remove.py +++ b/src/ahriman/web/views/service/remove.py @@ -22,9 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPBadRequest, HTTPNoContent from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.package_names_schema import PackageNamesSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNamesSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/service/request.py b/src/ahriman/web/views/service/request.py index 54fd1161..3c5e7a38 100644 --- a/src/ahriman/web/views/service/request.py +++ b/src/ahriman/web/views/service/request.py @@ -22,9 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPBadRequest, HTTPNoContent from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.package_names_schema import PackageNamesSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNamesSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/service/search.py b/src/ahriman/web/views/service/search.py index 85906767..ffa4273f 100644 --- a/src/ahriman/web/views/service/search.py +++ b/src/ahriman/web/views/service/search.py @@ -25,10 +25,7 @@ from collections.abc import Callable from ahriman.core.alpm.remote import AUR from ahriman.models.aur_package import AURPackage from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.aur_package_schema import AURPackageSchema -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.search_schema import SearchSchema +from ahriman.web.schemas import AURPackageSchema, AuthSchema, ErrorSchema, SearchSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/service/update.py b/src/ahriman/web/views/service/update.py index 1f9a4572..b8d41ece 100644 --- a/src/ahriman/web/views/service/update.py +++ b/src/ahriman/web/views/service/update.py @@ -22,8 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPNoContent from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/status/logs.py b/src/ahriman/web/views/status/logs.py index 6d2a6694..93b1bb18 100644 --- a/src/ahriman/web/views/status/logs.py +++ b/src/ahriman/web/views/status/logs.py @@ -24,11 +24,7 @@ from aiohttp.web import HTTPBadRequest, HTTPNoContent, HTTPNotFound, Response, j from ahriman.core.exceptions import UnknownPackageError from ahriman.models.log_record_id import LogRecordId from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.log_schema import LogSchema -from ahriman.web.schemas.logs_schema import LogsSchema -from ahriman.web.schemas.package_name_schema import PackageNameSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, LogSchema, LogsSchema, PackageNameSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/status/package.py b/src/ahriman/web/views/status/package.py index 23e3e3d5..f9e46672 100644 --- a/src/ahriman/web/views/status/package.py +++ b/src/ahriman/web/views/status/package.py @@ -25,10 +25,7 @@ from ahriman.core.exceptions import UnknownPackageError from ahriman.models.build_status import BuildStatusEnum from ahriman.models.package import Package from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.package_name_schema import PackageNameSchema -from ahriman.web.schemas.package_status_schema import PackageStatusSchema, PackageStatusSimplifiedSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNameSchema, PackageStatusSchema, PackageStatusSimplifiedSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/status/packages.py b/src/ahriman/web/views/status/packages.py index fb0b7ae6..c5429fe0 100644 --- a/src/ahriman/web/views/status/packages.py +++ b/src/ahriman/web/views/status/packages.py @@ -22,9 +22,7 @@ import aiohttp_apispec # type: ignore[import] from aiohttp.web import HTTPNoContent, Response, json_response from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.package_status_schema import PackageStatusSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageStatusSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/status/status.py b/src/ahriman/web/views/status/status.py index e6269d18..fee72c47 100644 --- a/src/ahriman/web/views/status/status.py +++ b/src/ahriman/web/views/status/status.py @@ -26,10 +26,7 @@ from ahriman.models.build_status import BuildStatusEnum from ahriman.models.counters import Counters from ahriman.models.internal_status import InternalStatus from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.internal_status_schema import InternalStatusSchema -from ahriman.web.schemas.status_schema import StatusSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema, InternalStatusSchema, StatusSchema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/user/login.py b/src/ahriman/web/views/user/login.py index 35e1c59e..88f662ab 100644 --- a/src/ahriman/web/views/user/login.py +++ b/src/ahriman/web/views/user/login.py @@ -23,9 +23,7 @@ from aiohttp.web import HTTPFound, HTTPMethodNotAllowed, HTTPUnauthorized from ahriman.core.auth.helpers import remember from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.error_schema import ErrorSchema -from ahriman.web.schemas.login_schema import LoginSchema -from ahriman.web.schemas.oauth2_schema import OAuth2Schema +from ahriman.web.schemas import ErrorSchema, LoginSchema, OAuth2Schema from ahriman.web.views.base import BaseView diff --git a/src/ahriman/web/views/user/logout.py b/src/ahriman/web/views/user/logout.py index 4e7e4ba9..0b36d158 100644 --- a/src/ahriman/web/views/user/logout.py +++ b/src/ahriman/web/views/user/logout.py @@ -23,8 +23,7 @@ from aiohttp.web import HTTPFound, HTTPUnauthorized from ahriman.core.auth.helpers import check_authorized, forget from ahriman.models.user_access import UserAccess -from ahriman.web.schemas.auth_schema import AuthSchema -from ahriman.web.schemas.error_schema import ErrorSchema +from ahriman.web.schemas import AuthSchema, ErrorSchema from ahriman.web.views.base import BaseView diff --git a/tests/ahriman/web/schemas/test_auth_schema.py b/tests/ahriman/web/schemas/test_auth_schema.py index 3fee57c2..a960157e 100644 --- a/tests/ahriman/web/schemas/test_auth_schema.py +++ b/tests/ahriman/web/schemas/test_auth_schema.py @@ -1,4 +1,4 @@ -from ahriman.web.schemas.auth_schema import AuthSchema +from ahriman.web.schemas import AuthSchema def test_schema() -> None: diff --git a/tests/ahriman/web/schemas/test_package_name_schema.py b/tests/ahriman/web/schemas/test_package_name_schema.py index f723244a..8d66915b 100644 --- a/tests/ahriman/web/schemas/test_package_name_schema.py +++ b/tests/ahriman/web/schemas/test_package_name_schema.py @@ -1,5 +1,5 @@ from ahriman.models.package import Package -from ahriman.web.schemas.package_name_schema import PackageNameSchema +from ahriman.web.schemas import PackageNameSchema def test_schema(package_ahriman: Package) -> None: