refactor: Migrate models to app.db and update imports across the codebase

Author: Zzackllack

app/api/legacy_downloader.py

@@ -10,7 +10,7 @@
 from sqlmodel import Session
 
 from app.core.scheduler import schedule_download, RUNNING, RUNNING_LOCK
-from app.models import get_session, get_job as db_get_job
+from app.db import get_session, get_job as db_get_job
 
 from app.core.downloader import Provider, Language
 

app/api/qbittorrent/sync.py

@@ -5,7 +5,7 @@
 from loguru import logger
 from sqlmodel import Session
 
-from app.models import get_session, get_job
+from app.db import get_session, get_job
 
 from . import router
 from .common import CATEGORIES, public_save_path
@@ -17,7 +17,7 @@ def sync_maindata(session: Session = Depends(get_session)):
     """Minimal maindata dump accepted by Sonarr."""
     logger.debug("Sync maindata requested.")
     from sqlmodel import select
-    from app.models import ClientTask
+    from app.db import ClientTask
     import os
     import time
 

app/api/qbittorrent/torrents.py

@@ -14,7 +14,7 @@
     DELETE_FILES_ON_TORRENT_DELETE,
 )
 from app.utils.magnet import parse_magnet
-from app.models import (
+from app.db import (
     get_session,
     upsert_client_task,
     get_client_task,
@@ -99,7 +99,7 @@ def torrents_info(
     """List torrents (ClientTasks) in qBittorrent-compatible subset."""
     logger.debug("Fetching torrents info.")
     from sqlmodel import select
-    from app.models import ClientTask
+    from app.db import ClientTask
     import os
 
     rows = session.exec(select(ClientTask)).all()

app/api/torznab/__init__.py

@@ -37,7 +37,7 @@
 from app.utils.naming import build_release_name  # noqa: E402
 from app.utils.probe_quality import probe_episode_quality  # noqa: E402
 from app.utils.magnet import build_magnet  # noqa: E402
-from app.models import (  # noqa: E402
+from app.db import (  # noqa: E402
     get_session,
     get_availability,
     list_available_languages_cached,
@@ -69,4 +69,3 @@
     "list_available_languages_cached",
     "upsert_availability",
 ]
-

app/api/torznab/api.py

@@ -18,7 +18,7 @@
     TORZNAB_TEST_SLUG,
     TORZNAB_TEST_TITLE,
 )
-from app.models import get_session
+from app.db import get_session
 
 from . import router
 from .utils import _build_item, _caps_xml, _require_apikey, _rss_root

app/core/lifespan.py

@@ -26,7 +26,7 @@
 )
 
 from app.core.scheduler import init_executor, shutdown_executor
-from app.models import (
+from app.db import (
     engine,
     dispose_engine,
     create_db_and_tables,

app/core/scheduler.py

@@ -12,7 +12,7 @@
     ProgressSnapshot,
     is_interactive_terminal,
 )
-from app.models import engine, create_job, update_job
+from app.db import engine, create_job, update_job
 from app.core.downloader import download_episode, Provider, Language
 from app.utils.logger import config as configure_logger
 
@@ -47,7 +47,7 @@ def shutdown_executor() -> None:
 
 def _progress_updater(job_id: str, stop_event: threading.Event):
     from sqlmodel import Session
-    from app.models import engine, update_job
+    from app.db import engine, update_job
 
     reporter: ProgressReporter | None = None
     last_db_n = -1

app/db/__init__.py

@@ -0,0 +1,11 @@
+"""Database package: SQLModel models, engine, and CRUD helpers.
+
+This package contains the SQLite/SQLModel data models and related utilities
+that used to live in `app/models.py`. Functionality and public API are preserved;
+imports should now use `from app.db import ...`.
+"""
+
+from .models import *  # re-export full surface for backwards compatibility
+
+__all__ = [name for name in globals() if not name.startswith("_")]
+

app/models.py app/db/models.pyapp/models.py renamed to app/db/models.py

@@ -126,10 +126,7 @@ class ClientTask(ModelBase, table=True):
     )  # queued/downloading/paused/completed/error
 
 
-import os
-
-# --- DB Bootstrap (use central DATA_DIR from config)
-logger.debug(f"DATA_DIR for jobs DB: {DATA_DIR}")
+# ---------------- Engine and Session utilities
 DATABASE_URL = f"sqlite:///{(DATA_DIR / 'anibridge_jobs.db').as_posix()}"
 logger.debug(f"DATABASE_URL: {DATABASE_URL}")
 
@@ -402,3 +399,4 @@ def delete_client_task(session: Session, hash: str) -> None:
         logger.success(f"Deleted client task for hash {hash}")
     else:
         logger.warning(f"Client task for hash {hash} not found, nothing to delete.")
+

app/domain/models.py

@@ -1,8 +1,8 @@
-"""Compatibility shim: re-export models from `app.models`.
+"""Compatibility shim: re-export models from `app.db`.
 
-Keeping `app.models` as the canonical definition allows pytest to reset
+Keeping `app.db` as the canonical definition allows pytest to reset
 metadata by purging that module name. This module simply forwards imports
 for readability under `app.domain`.
 """
 
-from app.models import *  # noqa: F401,F403
+from app.db import *  # noqa: F401,F403