shorten public imports

src/ahriman/application/application/application_properties.py

@@ -20,7 +20,7 @@
 import logging
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.repository import Repository
 
 

src/ahriman/application/application/application_repository.py

@@ -24,7 +24,7 @@ from typing import Callable, Iterable, List
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
-from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.core.formatters import UpdatePrinter
 from ahriman.core.tree import Tree
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/application/handlers/add.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/backup.py

@@ -24,9 +24,9 @@ from pathlib import Path
 from tarfile import TarFile
 from typing import Set, Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 
 
 class Backup(Handler):

src/ahriman/application/handlers/clean.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/dump.py

@@ -21,9 +21,9 @@ import argparse
 
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.configuration_printer import ConfigurationPrinter
+from ahriman.core.formatters import ConfigurationPrinter
 
 
 class Dump(Handler):

src/ahriman/application/handlers/help.py

@@ -21,7 +21,7 @@ import argparse
 
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/key_import.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/patch.py

@@ -23,10 +23,10 @@ from pathlib import Path
 from typing import List, Optional, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.action import Action
 from ahriman.models.package import Package
 

src/ahriman/application/handlers/rebuild.py

@@ -22,9 +22,9 @@ import argparse
 from typing import List, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.core.formatters import UpdatePrinter
 from ahriman.models.package import Package
 
 

src/ahriman/application/handlers/remove.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/remove_unknown.py

@@ -22,9 +22,9 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 
 
 class RemoveUnknown(Handler):

src/ahriman/application/handlers/report.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.result import Result
 

src/ahriman/application/handlers/restore.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 from tarfile import TarFile
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/search.py

@@ -23,12 +23,11 @@ from dataclasses import fields
 from typing import Callable, Iterable, List, Tuple, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
-from ahriman.core.alpm.remote.aur import AUR
-from ahriman.core.alpm.remote.official import Official
+from ahriman.application.handlers import Handler
+from ahriman.core.alpm.remote import AUR, Official
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import InvalidOption
-from ahriman.core.formatters.aur_printer import AurPrinter
+from ahriman.core.formatters import AurPrinter
 from ahriman.models.aur_package import AURPackage
 
 

src/ahriman/application/handlers/setup.py

@@ -23,7 +23,7 @@ from pathlib import Path
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_paths import RepositoryPaths
 

src/ahriman/application/handlers/sign.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/status.py

@@ -22,10 +22,9 @@ import argparse
 from typing import Callable, Iterable, Tuple, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.package_printer import PackagePrinter
-from ahriman.core.formatters.status_printer import StatusPrinter
+from ahriman.core.formatters import PackagePrinter, StatusPrinter
 from ahriman.models.build_status import BuildStatus
 from ahriman.models.package import Package
 

src/ahriman/application/handlers/status_update.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.action import Action
 

src/ahriman/application/handlers/sync.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/unsafe_commands.py

@@ -22,9 +22,9 @@ import shlex
 
 from typing import List, Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 
 
 class UnsafeCommands(Handler):

src/ahriman/application/handlers/update.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Callable, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/users.py

@@ -23,10 +23,10 @@ import getpass
 from pathlib import Path
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
-from ahriman.core.formatters.user_printer import UserPrinter
+from ahriman.core.database import SQLite
+from ahriman.core.formatters import UserPrinter
 from ahriman.models.action import Action
 from ahriman.models.user import User
 

src/ahriman/application/handlers/web.py

@@ -21,7 +21,7 @@ import argparse
 
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.spawn import Spawn
 

src/ahriman/core/alpm/remote/__init__.py

@@ -17,3 +17,8 @@
 # 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.core.alpm.remote.remote import Remote
+
+from ahriman.core.alpm.remote.aur import AUR
+from ahriman.core.alpm.remote.official import Official
+from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb

src/ahriman/core/alpm/remote/aur.py

@@ -22,7 +22,7 @@ import requests
 from typing import Any, Dict, List, Type
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.remote import Remote
+from ahriman.core.alpm.remote import Remote
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import exception_response_text
 from ahriman.models.aur_package import AURPackage

src/ahriman/core/alpm/remote/official.py

@@ -22,7 +22,7 @@ import requests
 from typing import Any, Dict, List, Type
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.remote import Remote
+from ahriman.core.alpm.remote import Remote
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import exception_response_text
 from ahriman.models.aur_package import AURPackage

src/ahriman/core/alpm/remote/official_syncdb.py

@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.official import Official
+from ahriman.core.alpm.remote import Official
 from ahriman.models.aur_package import AURPackage
 
 

src/ahriman/core/alpm/remote/remote.py

@@ -38,8 +38,7 @@ class Remote:
         These classes are designed to be used without instancing. In order to achieve it several class methods are
         provided: ``info``, ``multisearch`` and ``search``. Thus, the basic flow is the following::
 
-            >>> from ahriman.core.alpm.remote.aur import AUR
-            >>> from ahriman.core.alpm.remote.official import Official
+            >>> from ahriman.core.alpm.remote import AUR, Official
             >>>
             >>> package = AUR.info("ahriman", pacman=pacman)
             >>> search_result = Official.multisearch("pacman", "manager", pacman=pacman)

src/ahriman/core/auth/__init__.py

@@ -17,3 +17,7 @@
 # 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.core.auth.auth import Auth
+
+from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth.oauth import OAuth

src/ahriman/core/auth/auth.py

@@ -24,7 +24,7 @@ import logging
 from typing import Optional, Type
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.models.auth_settings import AuthSettings
 from ahriman.models.user_access import UserAccess
 
@@ -82,10 +82,10 @@ class Auth:
         """
         provider = AuthSettings.from_option(configuration.get("auth", "target", fallback="disabled"))
         if provider == AuthSettings.Configuration:
-            from ahriman.core.auth.mapping import Mapping
+            from ahriman.core.auth import Mapping
             return Mapping(configuration, database)
         if provider == AuthSettings.OAuth:
-            from ahriman.core.auth.oauth import OAuth
+            from ahriman.core.auth import OAuth
             return OAuth(configuration, database)
         return cls(configuration)
 

src/ahriman/core/auth/mapping.py

@@ -19,10 +19,9 @@
 #
 from typing import Optional
 
-from ahriman.core.auth.auth import Auth
-
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.models.auth_settings import AuthSettings
 from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess

src/ahriman/core/auth/oauth.py

@@ -21,9 +21,9 @@ import aioauth_client
 
 from typing import Optional, Type
 
-from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth import Mapping
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import InvalidOption
 from ahriman.models.auth_settings import AuthSettings
 

src/ahriman/core/build_tools/task.py

@@ -25,7 +25,7 @@ from typing import List
 
 from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import BuildFailed
 from ahriman.core.util import check_output
 from ahriman.models.package import Package

src/ahriman/core/database/__init__.py

@@ -17,3 +17,4 @@
 # 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.core.database.sqlite import SQLite

src/ahriman/core/database/data/__init__.py

@@ -27,8 +27,7 @@ from ahriman.core.database.data.users import migrate_users_data
 from ahriman.models.migration_result import MigrationResult
 
 
-def migrate_data(
-        result: MigrationResult, connection: Connection, configuration: Configuration) -> None:
+def migrate_data(result: MigrationResult, connection: Connection, configuration: Configuration) -> None:
     """
     perform data migration
 

src/ahriman/core/formatters/__init__.py

@@ -1,19 +1,29 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# copyright (c) 2021-2022 ahriman team.
 #
-# This file is part of ahriman
+# this file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# this program is free software: you can redistribute it and/or modify
+# it under the terms of the gnu general public license as published by
+# the free software foundation, either version 3 of the license, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# this program is distributed in the hope that it will be useful,
+# but without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose.  see the
+# gnu general public license for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 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.core.formatters.printer import Printer
+from ahriman.core.formatters.string_printer import StringPrinter
+
+from ahriman.core.formatters.aur_printer import AurPrinter
+from ahriman.core.formatters.build_printer import BuildPrinter
+from ahriman.core.formatters.configuration_printer import ConfigurationPrinter
+from ahriman.core.formatters.package_printer import PackagePrinter
+from ahriman.core.formatters.status_printer import StatusPrinter
+from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.core.formatters.user_printer import UserPrinter

src/ahriman/core/formatters/aur_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.core.util import pretty_datetime
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.property import Property

src/ahriman/core/formatters/build_printer.py

@@ -17,7 +17,7 @@
 # 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.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.package import Package
 
 

src/ahriman/core/formatters/configuration_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import Dict, List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.property import Property
 
 

src/ahriman/core/formatters/package_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.build_status import BuildStatus
 from ahriman.models.package import Package
 from ahriman.models.property import Property

src/ahriman/core/formatters/status_printer.py

@@ -17,7 +17,7 @@
 # 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.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.build_status import BuildStatus
 
 

src/ahriman/core/formatters/string_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import Optional
 
-from ahriman.core.formatters.printer import Printer
+from ahriman.core.formatters import Printer
 
 
 class StringPrinter(Printer):

src/ahriman/core/formatters/update_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List, Optional
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.package import Package
 from ahriman.models.property import Property
 

src/ahriman/core/formatters/user_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.property import Property
 from ahriman.models.user import User
 

src/ahriman/core/report/__init__.py

@@ -17,3 +17,10 @@
 # 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.core.report.report import Report
+from ahriman.core.report.jinja_template import JinjaTemplate
+
+from ahriman.core.report.console import Console
+from ahriman.core.report.email import Email
+from ahriman.core.report.html import HTML
+from ahriman.core.report.telegram import Telegram

src/ahriman/core/report/console.py

@@ -20,8 +20,8 @@
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.build_printer import BuildPrinter
-from ahriman.core.report.report import Report
+from ahriman.core.formatters import BuildPrinter
+from ahriman.core.report import Report
 from ahriman.models.package import Package
 from ahriman.models.result import Result
 

src/ahriman/core/report/email.py

@@ -25,8 +25,7 @@ from email.mime.text import MIMEText
 from typing import Dict, Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.report.jinja_template import JinjaTemplate
-from ahriman.core.report.report import Report
+from ahriman.core.report import JinjaTemplate, Report
 from ahriman.core.util import pretty_datetime
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/core/report/html.py

@@ -20,8 +20,7 @@
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.report.jinja_template import JinjaTemplate
-from ahriman.core.report.report import Report
+from ahriman.core.report import JinjaTemplate, Report
 from ahriman.models.package import Package
 from ahriman.models.result import Result
 

src/ahriman/core/report/report.py

@@ -87,16 +87,16 @@ class Report:
         section, provider_name = configuration.gettype(target, architecture)
         provider = ReportSettings.from_option(provider_name)
         if provider == ReportSettings.HTML:
-            from ahriman.core.report.html import HTML
+            from ahriman.core.report import HTML
             return HTML(architecture, configuration, section)
         if provider == ReportSettings.Email:
-            from ahriman.core.report.email import Email
+            from ahriman.core.report import Email
             return Email(architecture, configuration, section)
         if provider == ReportSettings.Console:
-            from ahriman.core.report.console import Console
+            from ahriman.core.report import Console
             return Console(architecture, configuration, section)
         if provider == ReportSettings.Telegram:
-            from ahriman.core.report.telegram import Telegram
+            from ahriman.core.report import Telegram
             return Telegram(architecture, configuration, section)
         return cls(architecture, configuration)  # should never happen
 

src/ahriman/core/report/telegram.py

@@ -23,8 +23,7 @@ import requests
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.report.jinja_template import JinjaTemplate
-from ahriman.core.report.report import Report
+from ahriman.core.report import JinjaTemplate, Report
 from ahriman.core.util import exception_response_text
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/core/repository/executor.py

@@ -23,9 +23,9 @@ from pathlib import Path
 from typing import Iterable, List, Optional, Set
 
 from ahriman.core.build_tools.task import Task
-from ahriman.core.report.report import Report
+from ahriman.core.report import Report
 from ahriman.core.repository.cleaner import Cleaner
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import tmpdir
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/core/repository/repository.py

@@ -35,7 +35,7 @@ class Repository(Executor, UpdateHandler):
         sync local repository to remote, generate report, etc::
 
             >>> from ahriman.core.configuration import Configuration
-            >>> from ahriman.core.database.sqlite import SQLite
+            >>> from ahriman.core.database import SQLite
             >>>
             >>> configuration = Configuration()
             >>> database = SQLite.load(configuration)

src/ahriman/core/repository/repository_properties.py

@@ -22,7 +22,7 @@ import logging
 from ahriman.core.alpm.pacman import Pacman
 from ahriman.core.alpm.repo import Repo
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import UnsafeRun
 from ahriman.core.sign.gpg import GPG
 from ahriman.core.status.client import Client

src/ahriman/core/status/watcher.py

@@ -22,7 +22,7 @@ import logging
 from typing import Dict, List, Optional, Tuple
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import UnknownPackage
 from ahriman.core.repository import Repository
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum

src/ahriman/core/tree.py

@@ -22,7 +22,7 @@ from __future__ import annotations
 from typing import Iterable, List, Set, Type
 
 from ahriman.core.build_tools.sources import Sources
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.util import tmpdir
 from ahriman.models.package import Package
 
@@ -102,7 +102,7 @@ class Tree:
         method::
 
             >>> from ahriman.core.configuration import Configuration
-            >>> from ahriman.core.database.sqlite import SQLite
+            >>> from ahriman.core.database import SQLite
             >>> from ahriman.core.repository import Repository
             >>>
             >>> configuration = Configuration()

src/ahriman/core/upload/__init__.py

@@ -17,3 +17,9 @@
 # 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.core.upload.upload import Upload
+from ahriman.core.upload.http_upload import HttpUpload
+
+from ahriman.core.upload.github import Github
+from ahriman.core.upload.rsync import Rsync
+from ahriman.core.upload.s3 import S3

src/ahriman/core/upload/github.py

@@ -24,7 +24,7 @@ from pathlib import Path
 from typing import Any, Dict, Iterable, Optional
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.http_upload import HttpUpload
+from ahriman.core.upload import HttpUpload
 from ahriman.core.util import walk
 from ahriman.models.package import Package
 

src/ahriman/core/upload/http_upload.py

@@ -24,7 +24,7 @@ from pathlib import Path
 from typing import Any, Dict
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import exception_response_text
 
 

src/ahriman/core/upload/rsync.py

@@ -21,7 +21,7 @@ from pathlib import Path
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import check_output
 from ahriman.models.package import Package
 

src/ahriman/core/upload/s3.py

@@ -25,7 +25,7 @@ from pathlib import Path
 from typing import Any, Dict, Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import walk
 from ahriman.models.package import Package
 

src/ahriman/core/upload/upload.py

@@ -86,13 +86,13 @@ class Upload:
         section, provider_name = configuration.gettype(target, architecture)
         provider = UploadSettings.from_option(provider_name)
         if provider == UploadSettings.Rsync:
-            from ahriman.core.upload.rsync import Rsync
+            from ahriman.core.upload import Rsync
             return Rsync(architecture, configuration, section)
         if provider == UploadSettings.S3:
-            from ahriman.core.upload.s3 import S3
+            from ahriman.core.upload import S3
             return S3(architecture, configuration, section)
         if provider == UploadSettings.Github:
-            from ahriman.core.upload.github import Github
+            from ahriman.core.upload import Github
             return Github(architecture, configuration, section)
         return cls(architecture, configuration)  # should never happen
 

src/ahriman/models/package.py

@@ -29,9 +29,7 @@ from srcinfo.parse import parse_srcinfo  # type: ignore
 from typing import Any, Dict, Iterable, List, Optional, Set, Type
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.aur import AUR
-from ahriman.core.alpm.remote.official import Official
-from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb
+from ahriman.core.alpm.remote import AUR, Official, OfficialSyncdb
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import check_output, full_version
 from ahriman.models.package_description import PackageDescription

src/ahriman/models/remote_source.py

@@ -95,7 +95,7 @@ class RemoteSource:
             Optional[RemoteSource]: generated remote source if any, None otherwise
         """
         if source == PackageSource.AUR:
-            from ahriman.core.alpm.remote.aur import AUR
+            from ahriman.core.alpm.remote import AUR
             return RemoteSource(
                 git_url=AUR.remote_git_url(package_base, repository),
                 web_url=AUR.remote_web_url(package_base),
@@ -104,7 +104,7 @@ class RemoteSource:
                 source=source,
             )
         if source == PackageSource.Repository:
-            from ahriman.core.alpm.remote.official import Official
+            from ahriman.core.alpm.remote import Official
             return RemoteSource(
                 git_url=Official.remote_git_url(package_base, repository),
                 web_url=Official.remote_web_url(package_base),

src/ahriman/web/middlewares/auth_handler.py

@@ -30,7 +30,7 @@ from aiohttp_session.cookie_storage import EncryptedCookieStorage
 from cryptography import fernet
 from typing import Optional
 
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.models.user_access import UserAccess
 from ahriman.models.user_identity import UserIdentity
 from ahriman.web.middlewares import HandlerType, MiddlewareType

src/ahriman/web/views/base.py

@@ -22,9 +22,9 @@ from __future__ import annotations
 from aiohttp.web import Request, View
 from typing import Any, Dict, List, Optional, Type
 
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.spawn import Spawn
 from ahriman.core.status.watcher import Watcher
 from ahriman.models.user_access import UserAccess

src/ahriman/web/views/service/search.py

@@ -20,7 +20,7 @@
 from aiohttp.web import HTTPNotFound, Response, json_response
 from typing import Callable, List
 
-from ahriman.core.alpm.remote.aur import AUR
+from ahriman.core.alpm.remote import AUR
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.user_access import UserAccess
 from ahriman.web.views.base import BaseView

src/ahriman/web/views/user/login.py

@@ -48,7 +48,7 @@ class LoginView(BaseView):
             HTTPMethodNotAllowed: in case if method is used, but OAuth is disabled
             HTTPUnauthorized: if case of authorization error
         """
-        from ahriman.core.auth.oauth import OAuth
+        from ahriman.core.auth import OAuth
 
         oauth_provider = self.validator
         if not isinstance(oauth_provider, OAuth):  # there is actually property, but mypy does not like it anyway

src/ahriman/web/web.py

@@ -23,9 +23,9 @@ import logging
 
 from aiohttp import web
 
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import InitializeException
 from ahriman.core.spawn import Spawn
 from ahriman.core.status.watcher import Watcher