optimize schemas import

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 <http://www.gnu.org/licenses/>.
 #
+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

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 import AuthSchema, ErrorSchema, PackageNamesSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
-from ahriman.web.schemas.package_names_schema import PackageNamesSchema
 from ahriman.web.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, PGPKeyIdSchema, PGPKeySchema
-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.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, PackageNamesSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
-from ahriman.web.schemas.package_names_schema import PackageNamesSchema
 from ahriman.web.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, PackageNamesSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
-from ahriman.web.schemas.package_names_schema import PackageNamesSchema
 from ahriman.web.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, PackageNamesSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
-from ahriman.web.schemas.package_names_schema import PackageNamesSchema
 from ahriman.web.views.base import BaseView
 
 

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 import AURPackageSchema, AuthSchema, ErrorSchema, SearchSchema
-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.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
 from ahriman.web.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, LogSchema, LogsSchema, PackageNameSchema
-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.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, PackageNameSchema, PackageStatusSchema, PackageStatusSimplifiedSchema
-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.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, PackageStatusSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
-from ahriman.web.schemas.package_status_schema import PackageStatusSchema
 from ahriman.web.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema, InternalStatusSchema, StatusSchema
-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.views.base import BaseView
 
 

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 import ErrorSchema, LoginSchema, OAuth2Schema
-from ahriman.web.schemas.login_schema import LoginSchema
-from ahriman.web.schemas.oauth2_schema import OAuth2Schema
 from ahriman.web.views.base import BaseView
 
 

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 import AuthSchema, ErrorSchema
-from ahriman.web.schemas.error_schema import ErrorSchema
 from ahriman.web.views.base import BaseView
 
 

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:

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: