refactor: consolidate web package structure

Author: MHajoha

questionpy_server/app.py

@@ -19,7 +19,7 @@ class QPyServer(web.AppKey["QPyServer"]):
 
     def __init__(self, settings: Settings):
         # We import here, so we don't have to work around circular imports.
-        from .api.routes import routes  # noqa: PLC0415
+        from questionpy_server.web._routes import routes  # noqa: PLC0415
 
         self.settings: Settings = settings
         self.web_app = web.Application(client_max_size=settings.webservice.max_main_size)

questionpy_server/collector/_package_collection.py

@@ -19,8 +19,8 @@
 
 if TYPE_CHECKING:
     from questionpy_server.collector.abc import BaseCollector
+    from questionpy_server.hash import HashContainer
     from questionpy_server.package import Package
-    from questionpy_server.web import HashContainer
 
 
 class PackageCollection:

questionpy_server/collector/lms_collector.py

@@ -11,8 +11,8 @@
 
 if TYPE_CHECKING:
     from questionpy_server.collector.indexer import Indexer
+    from questionpy_server.hash import HashContainer
     from questionpy_server.package import Package
-    from questionpy_server.web import HashContainer
 
 
 class LMSCollector(CachedCollector):

questionpy_server/collector/local_collector.py

@@ -13,7 +13,7 @@
 from watchdog.utils.dirsnapshot import DirectorySnapshot, DirectorySnapshotDiff, EmptyDirectorySnapshot
 
 from questionpy_server.collector.abc import BaseCollector
-from questionpy_server.misc import calculate_hash
+from questionpy_server.hash import calculate_hash
 
 if TYPE_CHECKING:
     from questionpy_server.collector.indexer import Indexer

questionpy_server/factories/package.py

@@ -6,7 +6,7 @@
 from faker import Faker
 from polyfactory.factories.pydantic_factory import ModelFactory
 
-from questionpy_server.api.models import PackageInfo
+from questionpy_server.models import PackageInfo
 
 languages = ["en", "de"]
 fake = Faker()

questionpy_server/factories/question_state.py

@@ -4,7 +4,7 @@
 
 from polyfactory.factories.pydantic_factory import ModelFactory
 
-from questionpy_server.api.models import RequestBaseData
+from questionpy_server.models import RequestBaseData
 
 
 class RequestBaseDataFactory(ModelFactory):

questionpy_server/misc.py questionpy_server/hash.pyquestionpy_server/misc.py renamed to questionpy_server/hash.py

@@ -4,6 +4,7 @@
 
 from hashlib import sha256
 from pathlib import Path
+from typing import NamedTuple
 
 from questionpy_common.constants import MiB
 
@@ -27,3 +28,8 @@ def calculate_hash(source: bytes | Path) -> str:
                 sha.update(chunk)
 
     return sha.hexdigest()
+
+
+class HashContainer(NamedTuple):
+    data: bytes
+    hash: str

questionpy_server/api/models.py questionpy_server/models.pyquestionpy_server/api/models.py renamed to questionpy_server/models.py

@@ -6,10 +6,10 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from questionpy_server.api.models import PackageInfo
 from questionpy_server.collector.lms_collector import LMSCollector
 from questionpy_server.collector.local_collector import LocalCollector
 from questionpy_server.collector.repo_collector import RepoCollector
+from questionpy_server.models import PackageInfo
 from questionpy_server.utils.manifest import ComparableManifest
 
 if TYPE_CHECKING:

questionpy_server/package.py

@@ -5,7 +5,7 @@
 
 from aiohttp import ClientError, ClientSession
 
-from questionpy_server.misc import calculate_hash
+from questionpy_server.hash import calculate_hash
 
 
 class DownloadError(Exception):