extract SQLAlchemy model in separate python library

2026-08-14 16:39:46 +02:00
parent 9f0a0c1d1e
commit 48149b67cf
148 changed files with 1195 additions and 1062 deletions
@@ -18,6 +18,7 @@ from src.apis.version1.comics import (
 from src.apis.version1.media import (
    actor,
    file,
+    lofi,
    mediaactorfile,
    mediavideo,
    mediaarticle,
@@ -104,6 +105,12 @@ api_router.include_router(
    tags=["media"],
    dependencies=[Depends(get_current_user_from_token)],
 )
+api_router.include_router(
+    lofi.router,
+    prefix="/media",
+    tags=["media"],
+    dependencies=[Depends(get_current_user_from_token)],
+)
 api_router.include_router(
    mediaarticle.router,
    prefix="/media",
@@ -9,8 +9,8 @@ from src.core.security import (
    authenticate_user_by_username,
    create_access_token,
 )
-from src.schema.admin.login import LoginRequest
-from src.schema.admin.token import Token
+from kontor_model.schema.admin.login import LoginRequest
+from kontor_model.schema.admin.token import Token
 from src.webapps.auth.forms import LoginForm

 login_router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.admin import MailAccount
+from kontor_model.db.models.admin import MailAccount
 from src.db.session import SessionDep
-from src.schema.admin.mailaccount import MailAccountResponse, to_response
+from kontor_model.schema.admin.mailaccount import MailAccountResponse, to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.bookshelf import Article
+from kontor_model.db.models.bookshelf import Article
 from src.db.session import SessionDep
-from src.schema.bookshelf.article import ArticleResponse, to_response
+from kontor_model.schema.bookshelf.article import ArticleResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.bookshelf import ArticleAuthor
+from kontor_model.db.models.bookshelf import ArticleAuthor
 from src.db.session import SessionDep
-from src.schema.bookshelf.articleauthor import ArticleAuthorResponse, to_response
+from kontor_model.schema.bookshelf.articleauthor import ArticleAuthorResponse, to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.bookshelf import Author
+from kontor_model.db.models.bookshelf import Author
 from src.db.session import SessionDep
-from src.schema.bookshelf.author import AuthorResponse, to_response
+from kontor_model.schema.bookshelf.author import AuthorResponse, to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.bookshelf import Book
+from kontor_model.db.models.bookshelf import Book
 from src.db.session import SessionDep
-from src.schema.bookshelf.book import BookResponse, to_response
+from kontor_model.schema.bookshelf.book import BookResponse, to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.bookshelf import BookAuthor
+from kontor_model.db.models.bookshelf import BookAuthor
 from src.db.session import SessionDep
-from src.schema.bookshelf.bookauthor import BookAuthorResponse, to_response
+from kontor_model.schema.bookshelf.bookauthor import BookAuthorResponse, to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.bookshelf import BookshelfPublisher
+from kontor_model.db.models.bookshelf import BookshelfPublisher
 from src.db.session import SessionDep
-from src.schema.bookshelf.publisher import PublisherResponse, to_response
+from kontor_model.schema.bookshelf.publisher import PublisherResponse, to_response

 router = APIRouter()

@@ -2,11 +2,11 @@ from typing import List

 from fastapi import APIRouter, HTTPException, status

-from src.db.models.comic import Artist
-from src.db.repository.comics.artist import get_artist_details
+from kontor_model.db.models.comic import Artist
+from kontor_model.db.repository.comics.artist import get_artist_details
 from src.db.session import SessionDep
-from src.schema.comics.artist import ArtistCreation, ArtistResponse, artist_to_response
-from src.schema.comics.artist_details import ArtistDetailResponse
+from kontor_model.schema.comics.artist import ArtistCreation, ArtistResponse, artist_to_response
+from kontor_model.schema.comics.artist_details import ArtistDetailResponse


 router = APIRouter()
@@ -3,13 +3,13 @@ from typing import List
 from fastapi import APIRouter, HTTPException

 from src.core.log_conf import logger
-from src.db.models.comic import Comic
-from src.db.repository.comics.comic import (
+from kontor_model.db.models.comic import Comic
+from kontor_model.db.repository.comics.comic import (
    get_comic_details,
 )
 from src.db.session import SessionDep
-from src.schema.comics.comic import ComicResponse, comic_to_response
-from src.schema.comics.comic_details import ComicDetailsResponse
+from kontor_model.schema.comics.comic import ComicResponse, comic_to_response
+from kontor_model.schema.comics.comic_details import ComicDetailsResponse

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import ComicWork
+from kontor_model.db.models.comic import ComicWork
 from src.db.session import SessionDep
-from src.schema.comics.comicwork import ComicWorkResponse, comicwork_to_response
+from kontor_model.schema.comics.comicwork import ComicWorkResponse, comicwork_to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import Issue
+from kontor_model.db.models.comic import Issue
 from src.db.session import SessionDep
-from src.schema.comics.issue import IssueResponse, issue_to_response
+from kontor_model.schema.comics.issue import IssueResponse, issue_to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import IssueWork
+from kontor_model.db.models.comic import IssueWork
 from src.db.session import SessionDep
-from src.schema.comics.issuework import IssueWorkResponse, issuework_to_response
+from kontor_model.schema.comics.issuework import IssueWorkResponse, issuework_to_response


 router = APIRouter()
@@ -2,11 +2,11 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import Publisher
-from src.db.repository.comics.publisher import get_publisher_details
+from kontor_model.db.models.comic import Publisher
+from kontor_model.db.repository.comics.publisher import get_publisher_details
 from src.db.session import SessionDep
-from src.schema.comics.publisher import PublisherResponse, publisher_to_response
-from src.schema.comics.publisher_details import PublisherDetailsResponse
+from kontor_model.schema.comics.publisher import PublisherResponse, publisher_to_response
+from kontor_model.schema.comics.publisher_details import PublisherDetailsResponse


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import StoryArc
+from kontor_model.db.models.comic import StoryArc
 from src.db.session import SessionDep
-from src.schema.comics.storyarc import StoryArcResponse, storyarc_to_response
+from kontor_model.schema.comics.storyarc import StoryArcResponse, storyarc_to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import Volume
+from kontor_model.db.models.comic import Volume
 from src.db.session import SessionDep
-from src.schema.comics.volume import VolumeResponse, volume_to_response
+from kontor_model.schema.comics.volume import VolumeResponse, volume_to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.comic import WorkType
+from kontor_model.db.models.comic import WorkType
 from src.db.session import SessionDep
-from src.schema.comics.worktype import WorktypeResponse, worktype_to_response
+from kontor_model.schema.comics.worktype import WorktypeResponse, worktype_to_response


 router = APIRouter()
@@ -1,6 +1,6 @@
 from fastapi import APIRouter, status

-from src.schema.admin.healthcheck import HealthCheck
+from kontor_model.schema.admin.healthcheck import HealthCheck

 health_router = APIRouter()

@@ -2,10 +2,10 @@ from typing import List

 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from src.db.repository.media.actor import delete_mediaactor, import_mediaactor
+from kontor_model.db.repository.media.actor import delete_mediaactor, import_mediaactor
 from src.db.session import SessionDep
-from src.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response
-from src.db.models.media import MediaActor
+from kontor_model.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response
+from kontor_model.db.models.media import MediaActor

 router = APIRouter()

@@ -2,21 +2,21 @@ from typing import List

 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from src.db.repository.media.actorfile import (
+from kontor_model.db.repository.media.actorfile import (
    create_new_mediaactorfile,
    delete_mediaactorfile,
 )
-from src.db.repository.media.file import delete_mediafile, import_mediafile
+from kontor_model.db.repository.media.file import delete_mediafile, import_mediafile
 from src.db.session import SessionDep
-from src.schema.media.actor import MediaActorResponse, actor_to_response
-from src.schema.media.actorfile import MediaActorFileResponse, actorfile_to_response
-from src.schema.media.file import (
+from kontor_model.schema.media.actor import MediaActorResponse, actor_to_response
+from kontor_model.schema.media.actorfile import MediaActorFileResponse, actorfile_to_response
+from kontor_model.schema.media.file import (
    MediaFileModel,
    MediaFileResponse,
    file_to_response,
    file_to_model,
 )
-from src.db.models.media import MediaFile
+from kontor_model.db.models.media import MediaFile

 router = APIRouter()

@@ -0,0 +1,42 @@
+
+from typing import List
+
+from fastapi import APIRouter, HTTPException
+
+from kontor_model.db.models.media import MediaLofi
+from src.db.session import SessionDep
+from kontor_model.schema.media.lofi import MediaLofiResponse, lofi_to_response
+
+
+router = APIRouter()
+
+@router.get("/lofi", response_model=List[MediaLofiResponse])
+def get_all_lofis(
+    db: SessionDep, review: bool = False, download: bool = False
+) -> List[MediaLofiResponse]:
+    """
+    Get all MediaLofis.
+    """
+    results: List[MediaLofiResponse] = []
+    lofis: List[MediaLofi]
+    if review:
+        lofis = db.query(MediaLofi).filter(MediaLofi.review.is_(True)).all()
+    elif download:
+        lofis = db.query(MediaLofi).filter(MediaLofi.should_download.is_(True)).all()
+    else:
+        lofis = db.query(MediaLofi).all()
+    for medialofi in lofis:
+        response = lofi_to_response(medialofi)
+        results.append(response)
+    return results
+
+@router.get("/lofi/{lofi_id}", response_model=MediaLofiResponse)
+def get_lofi(lofi_id: str, db: SessionDep) -> MediaLofiResponse:
+    """
+    Get MediaLofi by id.
+    """
+    lofi = db.get(MediaLofi, lofi_id)
+    if lofi is None:
+        raise HTTPException(status_code=404, detail="MediaLofi could not be found")
+    response = lofi_to_response(lofi)
+    return response
@@ -1,10 +1,10 @@
 from typing import List
 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from src.db.models.media import MediaActorFile
-from src.db.repository.media.actorfile import delete_mediaactorfile, import_mediaactorfile
+from kontor_model.db.models.media import MediaActorFile
+from kontor_model.db.repository.media.actorfile import delete_mediaactorfile, import_mediaactorfile
 from src.db.session import SessionDep
-from src.schema.media.actorfile import MediaActorFileModel, MediaActorFileResponse, actorfile_to_response
+from kontor_model.schema.media.actorfile import MediaActorFileModel, MediaActorFileResponse, actorfile_to_response

 router = APIRouter()

@@ -3,9 +3,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.media import MediaArticle
+from kontor_model.db.models.media import MediaArticle
 from src.db.session import SessionDep
-from src.schema.media.article import MediaArticleResponse, to_response
+from kontor_model.schema.media.article import MediaArticleResponse, to_response

 router = APIRouter()

@@ -3,9 +3,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.media import MediaVideo
+from kontor_model.db.models.media import MediaVideo
 from src.db.session import SessionDep
-from src.schema.media.video import MediaVideoResponse, video_to_response
+from kontor_model.schema.media.video import MediaVideoResponse, video_to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import Card
+from kontor_model.db.models.tysc import Card
 from src.db.session import SessionDep
-from src.schema.tysc.card import CardResponse, to_response
+from kontor_model.schema.tysc.card import CardResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import CardSet
+from kontor_model.db.models.tysc import CardSet
 from src.db.session import SessionDep
-from src.schema.tysc.cardset import CardSetResponse, to_response
+from kontor_model.schema.tysc.cardset import CardSetResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import FieldPosition
+from kontor_model.db.models.tysc import FieldPosition
 from src.db.session import SessionDep
-from src.schema.tysc.fieldposition import FieldPositionResponse, to_response
+from kontor_model.schema.tysc.fieldposition import FieldPositionResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import Player
+from kontor_model.db.models.tysc import Player
 from src.db.session import SessionDep
-from src.schema.tysc.player import PlayerResponse, to_response
+from kontor_model.schema.tysc.player import PlayerResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import Rooster
+from kontor_model.db.models.tysc import Rooster
 from src.db.session import SessionDep
-from src.schema.tysc.rooster import RoosterResponse, to_response
+from kontor_model.schema.tysc.rooster import RoosterResponse, to_response


 router = APIRouter()
@@ -3,8 +3,8 @@ from fastapi import APIRouter, HTTPException

 from src.core.log_conf import logger
 from src.db.session import SessionDep
-from src.schema.tysc.sport import SportResponse, to_response
-from src.db.models.tysc import Sport
+from kontor_model.schema.tysc.sport import SportResponse, to_response
+from kontor_model.db.models.tysc import Sport

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import Team
+from kontor_model.db.models.tysc import Team
 from src.db.session import SessionDep
-from src.schema.tysc.team import TeamResponse, to_response
+from kontor_model.schema.tysc.team import TeamResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.tysc import Vendor
+from kontor_model.db.models.tysc import Vendor
 from src.db.session import SessionDep
-from src.schema.tysc.vendor import VendorResponse, to_response
+from kontor_model.schema.tysc.vendor import VendorResponse, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.admin import Assignment
+from kontor_model.db.models.admin import Assignment
 from src.db.session import SessionDep
-from src.schema.user.assignment import AssignmentResponse, to_response
+from kontor_model.schema.user.assignment import AssignmentResponse, to_response

 router = APIRouter()

@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter, HTTPException

-from src.db.models.admin import Permission
+from kontor_model.db.models.admin import Permission
 from src.db.session import SessionDep
-from src.schema.user.permission import PermissionResponse, to_response
+from kontor_model.schema.user.permission import PermissionResponse, to_response

 router = APIRouter()

@@ -4,10 +4,10 @@ from sqlalchemy import select
 from src.core.log_conf import logger

 from src.core.security import CurrentUser
-from src.db.models.admin import Profile
+from kontor_model.db.models.admin import Profile
 from src.db.repository.user import create_new_profile
 from src.db.session import SessionDep
-from src.schema.user.profile import ProfileResponse, ProfileModel, to_response
+from kontor_model.schema.user.profile import ProfileResponse, ProfileModel, to_response


 router = APIRouter()
@@ -2,9 +2,9 @@ from typing import List

 from fastapi import APIRouter

-from src.db.models.admin import Token
+from kontor_model.db.models.admin import Token
 from src.db.session import SessionDep
-from src.schema.user.token import TokenResponse, to_response
+from kontor_model.schema.user.token import TokenResponse, to_response

 router = APIRouter()