diff --git a/kontor-api/Containerfile b/kontor-api/Containerfile index 039bbe6..ce97e88 100644 --- a/kontor-api/Containerfile +++ b/kontor-api/Containerfile @@ -1,7 +1,7 @@ ## ------------------------------- Builder Stage ------------------------------ ## FROM python:3.13-bookworm AS builder -RUN apt-get update && apt-get install --no-install-recommends -y build-essential && \ +RUN apt-get update && apt-get install --no-install-recommends -y build-essential libpq-dev && \ apt-get clean && rm -rf /var/lib/apt/lists/* # Download the latest installer, install it and then remove it @@ -19,7 +19,7 @@ RUN uv sync # ------------------------------- Production Stage ------------------------------ ## FROM python:3.13-slim-bookworm AS production -RUN apt-get update && apt-get install --no-install-recommends -y curl +RUN apt-get update && apt-get install --no-install-recommends -y curl libpq-dev WORKDIR /app diff --git a/kontor-api/src/apis/version1/admin/login.py b/kontor-api/src/apis/version1/admin/login.py index bbf743f..22bbc93 100644 --- a/kontor-api/src/apis/version1/admin/login.py +++ b/kontor-api/src/apis/version1/admin/login.py @@ -9,8 +9,8 @@ from src.core.security import ( authenticate_user_by_username, create_access_token, ) -from kontor_model.schema.admin.login import LoginRequest -from kontor_model.schema.admin.token import Token +from src.schema.admin.login import LoginRequest +from src.schema.admin.token import Token from src.webapps.auth.forms import LoginForm login_router = APIRouter() diff --git a/kontor-api/src/apis/version1/bookshelf/article.py b/kontor-api/src/apis/version1/bookshelf/article.py index 64646e1..b985b36 100644 --- a/kontor-api/src/apis/version1/bookshelf/article.py +++ b/kontor-api/src/apis/version1/bookshelf/article.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.bookshelf import Article +from src.db.models.bookshelf import Article from src.db.session import SessionDep -from kontor_model.schema.bookshelf.article import ArticleResponse, to_response +from src.schema.bookshelf.article import ArticleResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/bookshelf/articleauthor.py b/kontor-api/src/apis/version1/bookshelf/articleauthor.py index 0addeb9..8ebb982 100644 --- a/kontor-api/src/apis/version1/bookshelf/articleauthor.py +++ b/kontor-api/src/apis/version1/bookshelf/articleauthor.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.bookshelf import ArticleAuthor +from src.db.models.bookshelf import ArticleAuthor from src.db.session import SessionDep -from kontor_model.schema.bookshelf.articleauthor import ArticleAuthorResponse, to_response +from src.schema.bookshelf.articleauthor import ArticleAuthorResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/bookshelf/author.py b/kontor-api/src/apis/version1/bookshelf/author.py index 9bbb9a7..e4bc73c 100644 --- a/kontor-api/src/apis/version1/bookshelf/author.py +++ b/kontor-api/src/apis/version1/bookshelf/author.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.bookshelf import Author +from src.db.models.bookshelf import Author from src.db.session import SessionDep -from kontor_model.schema.bookshelf.author import AuthorResponse, to_response +from src.schema.bookshelf.author import AuthorResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/bookshelf/book.py b/kontor-api/src/apis/version1/bookshelf/book.py index 55345a0..5c12f16 100644 --- a/kontor-api/src/apis/version1/bookshelf/book.py +++ b/kontor-api/src/apis/version1/bookshelf/book.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.bookshelf import Book +from src.db.models.bookshelf import Book from src.db.session import SessionDep -from kontor_model.schema.bookshelf.book import BookResponse, to_response +from src.schema.bookshelf.book import BookResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/bookshelf/bookauthor.py b/kontor-api/src/apis/version1/bookshelf/bookauthor.py index 4150bf2..8ecc856 100644 --- a/kontor-api/src/apis/version1/bookshelf/bookauthor.py +++ b/kontor-api/src/apis/version1/bookshelf/bookauthor.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.bookshelf import BookAuthor +from src.db.models.bookshelf import BookAuthor from src.db.session import SessionDep -from kontor_model.schema.bookshelf.bookauthor import BookAuthorResponse, to_response +from src.schema.bookshelf.bookauthor import BookAuthorResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/bookshelf/bookshelf_publisher.py b/kontor-api/src/apis/version1/bookshelf/bookshelf_publisher.py index 94898a6..74859ad 100644 --- a/kontor-api/src/apis/version1/bookshelf/bookshelf_publisher.py +++ b/kontor-api/src/apis/version1/bookshelf/bookshelf_publisher.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.bookshelf import BookshelfPublisher +from src.db.models.bookshelf import BookshelfPublisher from src.db.session import SessionDep -from kontor_model.schema.bookshelf.publisher import PublisherResponse, to_response +from src.schema.bookshelf.publisher import PublisherResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/comic.py b/kontor-api/src/apis/version1/comics/comic.py index 823c198..bca4acc 100644 --- a/kontor-api/src/apis/version1/comics/comic.py +++ b/kontor-api/src/apis/version1/comics/comic.py @@ -3,13 +3,13 @@ from typing import List from fastapi import APIRouter, HTTPException from src.core.log_conf import logger -from kontor_model.db.models.comic import Comic -from kontor_model.db.repository.comics.comic import ( +from src.db.models.comic import Comic +from src.db.repository.comics.comic import ( get_comic_details, ) from src.db.session import SessionDep -from kontor_model.schema.comics.comic import ComicResponse, comic_to_response -from kontor_model.schema.comics.comic_details import ComicDetailsResponse +from src.schema.comics.comic import ComicResponse, comic_to_response +from src.schema.comics.comic_details import ComicDetailsResponse router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/comicwork.py b/kontor-api/src/apis/version1/comics/comicwork.py index 2dcd441..650c36c 100644 --- a/kontor-api/src/apis/version1/comics/comicwork.py +++ b/kontor-api/src/apis/version1/comics/comicwork.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import ComicWork +from src.db.models.comic import ComicWork from src.db.session import SessionDep -from kontor_model.schema.comics.comicwork import ComicWorkResponse, comicwork_to_response +from src.schema.comics.comicwork import ComicWorkResponse, comicwork_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/issue.py b/kontor-api/src/apis/version1/comics/issue.py index 8af3fb7..78c6245 100644 --- a/kontor-api/src/apis/version1/comics/issue.py +++ b/kontor-api/src/apis/version1/comics/issue.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import Issue +from src.db.models.comic import Issue from src.db.session import SessionDep -from kontor_model.schema.comics.issue import IssueResponse, issue_to_response +from src.schema.comics.issue import IssueResponse, issue_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/issuework.py b/kontor-api/src/apis/version1/comics/issuework.py index 078a8ec..a5465a4 100644 --- a/kontor-api/src/apis/version1/comics/issuework.py +++ b/kontor-api/src/apis/version1/comics/issuework.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import IssueWork +from src.db.models.comic import IssueWork from src.db.session import SessionDep -from kontor_model.schema.comics.issuework import IssueWorkResponse, issuework_to_response +from src.schema.comics.issuework import IssueWorkResponse, issuework_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/publisher.py b/kontor-api/src/apis/version1/comics/publisher.py index 4780877..bdafb7b 100644 --- a/kontor-api/src/apis/version1/comics/publisher.py +++ b/kontor-api/src/apis/version1/comics/publisher.py @@ -2,11 +2,11 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import Publisher -from kontor_model.db.repository.comics.publisher import get_publisher_details +from src.db.models.comic import Publisher +from src.db.repository.comics.publisher import get_publisher_details from src.db.session import SessionDep -from kontor_model.schema.comics.publisher import PublisherResponse, publisher_to_response -from kontor_model.schema.comics.publisher_details import PublisherDetailsResponse +from src.schema.comics.publisher import PublisherResponse, publisher_to_response +from src.schema.comics.publisher_details import PublisherDetailsResponse router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/storyarc.py b/kontor-api/src/apis/version1/comics/storyarc.py index 2ae6239..6347187 100644 --- a/kontor-api/src/apis/version1/comics/storyarc.py +++ b/kontor-api/src/apis/version1/comics/storyarc.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import StoryArc +from src.db.models.comic import StoryArc from src.db.session import SessionDep -from kontor_model.schema.comics.storyarc import StoryArcResponse, storyarc_to_response +from src.schema.comics.storyarc import StoryArcResponse, storyarc_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/volume.py b/kontor-api/src/apis/version1/comics/volume.py index faab88f..b538136 100644 --- a/kontor-api/src/apis/version1/comics/volume.py +++ b/kontor-api/src/apis/version1/comics/volume.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import Volume +from src.db.models.comic import Volume from src.db.session import SessionDep -from kontor_model.schema.comics.volume import VolumeResponse, volume_to_response +from src.schema.comics.volume import VolumeResponse, volume_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/comics/worktype.py b/kontor-api/src/apis/version1/comics/worktype.py index a06df0f..39c6285 100644 --- a/kontor-api/src/apis/version1/comics/worktype.py +++ b/kontor-api/src/apis/version1/comics/worktype.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.comic import WorkType +from src.db.models.comic import WorkType from src.db.session import SessionDep -from kontor_model.schema.comics.worktype import WorktypeResponse, worktype_to_response +from src.schema.comics.worktype import WorktypeResponse, worktype_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/healthcheck.py b/kontor-api/src/apis/version1/healthcheck.py index aec2131..33d1e7e 100644 --- a/kontor-api/src/apis/version1/healthcheck.py +++ b/kontor-api/src/apis/version1/healthcheck.py @@ -1,6 +1,6 @@ from fastapi import APIRouter, status -from kontor_model.schema.admin.healthcheck import HealthCheck +from src.schema.admin.healthcheck import HealthCheck health_router = APIRouter() diff --git a/kontor-api/src/apis/version1/media/actor.py b/kontor-api/src/apis/version1/media/actor.py index 222e236..86c5bd1 100644 --- a/kontor-api/src/apis/version1/media/actor.py +++ b/kontor-api/src/apis/version1/media/actor.py @@ -2,10 +2,10 @@ from typing import List from fastapi import APIRouter, status, HTTPException from src.core.log_conf import logger -from kontor_model.db.repository.media.actor import delete_mediaactor, import_mediaactor +from src.db.repository.media.actor import delete_mediaactor, import_mediaactor from src.db.session import SessionDep -from kontor_model.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response -from kontor_model.db.models.media import MediaActor +from src.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response +from src.db.models.media import MediaActor router = APIRouter() diff --git a/kontor-api/src/apis/version1/media/file.py b/kontor-api/src/apis/version1/media/file.py index 3c695e0..de2a664 100644 --- a/kontor-api/src/apis/version1/media/file.py +++ b/kontor-api/src/apis/version1/media/file.py @@ -2,21 +2,21 @@ from typing import List from fastapi import APIRouter, status, HTTPException from src.core.log_conf import logger -from kontor_model.db.repository.media.actorfile import ( +from src.db.repository.media.actorfile import ( create_new_mediaactorfile, delete_mediaactorfile, ) -from kontor_model.db.repository.media.file import delete_mediafile, import_mediafile +from src.db.repository.media.file import delete_mediafile, import_mediafile from src.db.session import SessionDep -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 ( +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 ( MediaFileModel, MediaFileResponse, file_to_response, file_to_model, ) -from kontor_model.db.models.media import MediaFile +from src.db.models.media import MediaFile router = APIRouter() diff --git a/kontor-api/src/apis/version1/media/lofi.py b/kontor-api/src/apis/version1/media/lofi.py index 7a54371..651acaa 100644 --- a/kontor-api/src/apis/version1/media/lofi.py +++ b/kontor-api/src/apis/version1/media/lofi.py @@ -3,16 +3,16 @@ from typing import List from fastapi import APIRouter, status, HTTPException -from kontor_model.db.models.media import MediaLofi +from src.db.models.media import MediaLofi from src.db.session import SessionDep from src.core.log_conf import logger -from kontor_model.schema.media.lofi import ( +from src.schema.media.lofi import ( MediaLofiModel, MediaLofiResponse, lofi_to_response, lofi_to_model ) -from kontor_model.db.repository.media.lofi import ( +from src.db.repository.media.lofi import ( import_medialofi, delete_medialofi ) diff --git a/kontor-api/src/apis/version1/media/mediaactorfile.py b/kontor-api/src/apis/version1/media/mediaactorfile.py index 97f436b..4748c93 100644 --- a/kontor-api/src/apis/version1/media/mediaactorfile.py +++ b/kontor-api/src/apis/version1/media/mediaactorfile.py @@ -1,10 +1,10 @@ from typing import List from fastapi import APIRouter, status, HTTPException from src.core.log_conf import logger -from kontor_model.db.models.media import MediaActorFile -from kontor_model.db.repository.media.actorfile import delete_mediaactorfile, import_mediaactorfile +from src.db.models.media import MediaActorFile +from src.db.repository.media.actorfile import delete_mediaactorfile, import_mediaactorfile from src.db.session import SessionDep -from kontor_model.schema.media.actorfile import MediaActorFileModel, MediaActorFileResponse, actorfile_to_response +from src.schema.media.actorfile import MediaActorFileModel, MediaActorFileResponse, actorfile_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/media/mediaarticle.py b/kontor-api/src/apis/version1/media/mediaarticle.py index 4c0b89d..cb19dc8 100644 --- a/kontor-api/src/apis/version1/media/mediaarticle.py +++ b/kontor-api/src/apis/version1/media/mediaarticle.py @@ -3,9 +3,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.media import MediaArticle +from src.db.models.media import MediaArticle from src.db.session import SessionDep -from kontor_model.schema.media.article import MediaArticleResponse, to_response +from src.schema.media.article import MediaArticleResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/media/mediavideo.py b/kontor-api/src/apis/version1/media/mediavideo.py index 2dba52c..5d57434 100644 --- a/kontor-api/src/apis/version1/media/mediavideo.py +++ b/kontor-api/src/apis/version1/media/mediavideo.py @@ -3,9 +3,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.media import MediaVideo +from src.db.models.media import MediaVideo from src.db.session import SessionDep -from kontor_model.schema.media.video import MediaVideoResponse, video_to_response +from src.schema.media.video import MediaVideoResponse, video_to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/card.py b/kontor-api/src/apis/version1/tysc/card.py index 9449f34..98606d0 100644 --- a/kontor-api/src/apis/version1/tysc/card.py +++ b/kontor-api/src/apis/version1/tysc/card.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import Card +from src.db.models.tysc import Card from src.db.session import SessionDep -from kontor_model.schema.tysc.card import CardResponse, to_response +from src.schema.tysc.card import CardResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/cardset.py b/kontor-api/src/apis/version1/tysc/cardset.py index 3faa267..a952d6c 100644 --- a/kontor-api/src/apis/version1/tysc/cardset.py +++ b/kontor-api/src/apis/version1/tysc/cardset.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import CardSet +from src.db.models.tysc import CardSet from src.db.session import SessionDep -from kontor_model.schema.tysc.cardset import CardSetResponse, to_response +from src.schema.tysc.cardset import CardSetResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/fieldposition.py b/kontor-api/src/apis/version1/tysc/fieldposition.py index d613940..e46cf2e 100644 --- a/kontor-api/src/apis/version1/tysc/fieldposition.py +++ b/kontor-api/src/apis/version1/tysc/fieldposition.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import FieldPosition +from src.db.models.tysc import FieldPosition from src.db.session import SessionDep -from kontor_model.schema.tysc.fieldposition import FieldPositionResponse, to_response +from src.schema.tysc.fieldposition import FieldPositionResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/player.py b/kontor-api/src/apis/version1/tysc/player.py index c91296a..d255166 100644 --- a/kontor-api/src/apis/version1/tysc/player.py +++ b/kontor-api/src/apis/version1/tysc/player.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import Player +from src.db.models.tysc import Player from src.db.session import SessionDep -from kontor_model.schema.tysc.player import PlayerResponse, to_response +from src.schema.tysc.player import PlayerResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/rooster.py b/kontor-api/src/apis/version1/tysc/rooster.py index 7fd3187..b6ee70c 100644 --- a/kontor-api/src/apis/version1/tysc/rooster.py +++ b/kontor-api/src/apis/version1/tysc/rooster.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import Rooster +from src.db.models.tysc import Rooster from src.db.session import SessionDep -from kontor_model.schema.tysc.rooster import RoosterResponse, to_response +from src.schema.tysc.rooster import RoosterResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/sport.py b/kontor-api/src/apis/version1/tysc/sport.py index 1c712cc..26ca581 100644 --- a/kontor-api/src/apis/version1/tysc/sport.py +++ b/kontor-api/src/apis/version1/tysc/sport.py @@ -3,8 +3,8 @@ from fastapi import APIRouter, HTTPException from src.core.log_conf import logger from src.db.session import SessionDep -from kontor_model.schema.tysc.sport import SportResponse, to_response -from kontor_model.db.models.tysc import Sport +from src.schema.tysc.sport import SportResponse, to_response +from src.db.models.tysc import Sport router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/team.py b/kontor-api/src/apis/version1/tysc/team.py index d1a047e..78acecc 100644 --- a/kontor-api/src/apis/version1/tysc/team.py +++ b/kontor-api/src/apis/version1/tysc/team.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import Team +from src.db.models.tysc import Team from src.db.session import SessionDep -from kontor_model.schema.tysc.team import TeamResponse, to_response +from src.schema.tysc.team import TeamResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/tysc/vendor.py b/kontor-api/src/apis/version1/tysc/vendor.py index e86752b..a074d87 100644 --- a/kontor-api/src/apis/version1/tysc/vendor.py +++ b/kontor-api/src/apis/version1/tysc/vendor.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.tysc import Vendor +from src.db.models.tysc import Vendor from src.db.session import SessionDep -from kontor_model.schema.tysc.vendor import VendorResponse, to_response +from src.schema.tysc.vendor import VendorResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/user/assignment.py b/kontor-api/src/apis/version1/user/assignment.py index 64ee2e4..8a01556 100644 --- a/kontor-api/src/apis/version1/user/assignment.py +++ b/kontor-api/src/apis/version1/user/assignment.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.admin import Assignment +from src.db.models.admin import Assignment from src.db.session import SessionDep -from kontor_model.schema.user.assignment import AssignmentResponse, to_response +from src.schema.user.assignment import AssignmentResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/user/permission.py b/kontor-api/src/apis/version1/user/permission.py index 4c99faa..6057b5f 100644 --- a/kontor-api/src/apis/version1/user/permission.py +++ b/kontor-api/src/apis/version1/user/permission.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter, HTTPException -from kontor_model.db.models.admin import Permission +from src.db.models.admin import Permission from src.db.session import SessionDep -from kontor_model.schema.user.permission import PermissionResponse, to_response +from src.schema.user.permission import PermissionResponse, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/user/profile.py b/kontor-api/src/apis/version1/user/profile.py index 7187d6d..2d7a768 100644 --- a/kontor-api/src/apis/version1/user/profile.py +++ b/kontor-api/src/apis/version1/user/profile.py @@ -4,10 +4,10 @@ from sqlalchemy import select from src.core.log_conf import logger from src.core.security import CurrentUser -from kontor_model.db.models.admin import Profile +from src.db.models.admin import Profile from src.db.repository.user import create_new_profile from src.db.session import SessionDep -from kontor_model.schema.user.profile import ProfileResponse, ProfileModel, to_response +from src.schema.user.profile import ProfileResponse, ProfileModel, to_response router = APIRouter() diff --git a/kontor-api/src/apis/version1/user/token.py b/kontor-api/src/apis/version1/user/token.py index 9a53e25..f3a18ba 100644 --- a/kontor-api/src/apis/version1/user/token.py +++ b/kontor-api/src/apis/version1/user/token.py @@ -2,9 +2,9 @@ from typing import List from fastapi import APIRouter -from kontor_model.db.models.admin import Token +from src.db.models.admin import Token from src.db.session import SessionDep -from kontor_model.schema.user.token import TokenResponse, to_response +from src.schema.user.token import TokenResponse, to_response router = APIRouter() diff --git a/kontor-api/src/core/security.py b/kontor-api/src/core/security.py index 3567de6..96f2a06 100644 --- a/kontor-api/src/core/security.py +++ b/kontor-api/src/core/security.py @@ -15,15 +15,15 @@ from pydantic import ValidationError from src.core.config import settings from src.core.log_conf import logger -from kontor_model.db.models.admin import Profile -from kontor_model.db.repository.admin import ( +from src.db.models.admin import Profile +from src.db.repository.admin import ( get_profile_by_username, get_profile_by_email, is_database_empty, ) from src.db.session import SessionLocal -from kontor_model.schema.admin.token import TokenData -from kontor_model.schema.user.profile import ProfileModel, to_model +from src.schema.admin.token import TokenData +from src.schema.user.profile import ProfileModel, to_model oauth2_scheme = OAuth2PasswordBearer( tokenUrl="/token", diff --git a/kontor-api/src/db/repository/admin.py b/kontor-api/src/db/repository/admin.py index bca48c7..dbaa671 100644 --- a/kontor-api/src/db/repository/admin.py +++ b/kontor-api/src/db/repository/admin.py @@ -2,7 +2,7 @@ from typing import Optional from sqlalchemy.orm import Session -from kontor_model.db.models.admin import Profile +from src.db.models.admin import Profile def get_profile_by_username(username: str, db: Session) -> Optional[Profile]: diff --git a/kontor-api/src/db/repository/comics/artist.py b/kontor-api/src/db/repository/comics/artist.py index a2bd1f0..9c3b5be 100644 --- a/kontor-api/src/db/repository/comics/artist.py +++ b/kontor-api/src/db/repository/comics/artist.py @@ -2,11 +2,11 @@ from typing import List, Optional from sqlalchemy.orm import Session -from kontor_model.db.models.comic import Artist -from kontor_model.schema.comics.artist import AddArtist -from kontor_model.schema.comics.artist_details import ArtistDetailResponse, ArtistWorktypeComicResponse, ArtistWorktypeIssueResponse -from kontor_model.schema.comics.comic import ComicResponse -from kontor_model.schema.comics.worktype import WorktypeResponse +from src.db.models.comic import Artist +from src.schema.comics.artist import AddArtist +from src.schema.comics.artist_details import ArtistDetailResponse, ArtistWorktypeComicResponse, ArtistWorktypeIssueResponse +from src.schema.comics.comic import ComicResponse +from src.schema.comics.worktype import WorktypeResponse def get_artist_details(artist: Artist) -> ArtistDetailResponse: diff --git a/kontor-api/src/db/repository/comics/comic.py b/kontor-api/src/db/repository/comics/comic.py index 785f9ad..fdc241d 100644 --- a/kontor-api/src/db/repository/comics/comic.py +++ b/kontor-api/src/db/repository/comics/comic.py @@ -2,15 +2,15 @@ from typing import Dict, List, Optional from sqlalchemy.orm import Session -from kontor_model.db.models.comic import Comic, Issue -from kontor_model.schema.comics.artist import artist_to_response -from kontor_model.schema.comics.comic import ComicSchema, comic_to_response -from kontor_model.schema.comics.comic_details import ComicDetailsResponse, ComicWorktypeArtistResponse -from kontor_model.schema.comics.issue import IssueResponse, issue_to_response -from kontor_model.schema.comics.issue_details import IssueDetailsResponse -from kontor_model.schema.comics.publisher import publisher_to_response -from kontor_model.schema.comics.volume import VolumeResponse, volume_to_response -from kontor_model.schema.comics.worktype import worktype_to_response +from src.db.models.comic import Comic, Issue +from src.schema.comics.artist import artist_to_response +from src.schema.comics.comic import ComicSchema, comic_to_response +from src.schema.comics.comic_details import ComicDetailsResponse, ComicWorktypeArtistResponse +from src.schema.comics.issue import IssueResponse, issue_to_response +from src.schema.comics.issue_details import IssueDetailsResponse +from src.schema.comics.publisher import publisher_to_response +from src.schema.comics.volume import VolumeResponse, volume_to_response +from src.schema.comics.worktype import worktype_to_response def get_issue_details(issue: Issue) -> IssueDetailsResponse: diff --git a/kontor-api/src/db/repository/comics/publisher.py b/kontor-api/src/db/repository/comics/publisher.py index e0edcfb..107aa7c 100644 --- a/kontor-api/src/db/repository/comics/publisher.py +++ b/kontor-api/src/db/repository/comics/publisher.py @@ -1,9 +1,9 @@ from typing import List -from kontor_model.db.models.comic import Publisher -from kontor_model.schema.comics.comic import ComicResponse -from kontor_model.schema.comics.publisher import PublisherResponse -from kontor_model.schema.comics.publisher_details import PublisherDetailsResponse +from src.db.models.comic import Publisher +from src.schema.comics.comic import ComicResponse +from src.schema.comics.publisher import PublisherResponse +from src.schema.comics.publisher_details import PublisherDetailsResponse def get_publisher_details(publisher: Publisher) -> PublisherDetailsResponse: diff --git a/kontor-api/src/db/repository/comics/worktype.py b/kontor-api/src/db/repository/comics/worktype.py index 2d2a13f..7ebe239 100644 --- a/kontor-api/src/db/repository/comics/worktype.py +++ b/kontor-api/src/db/repository/comics/worktype.py @@ -4,8 +4,8 @@ from typing import AnyStr, Optional from sqlalchemy.orm import Session -from kontor_model.db.models.comic import WorkType -from kontor_model.schema.comics.worktype import AddWorkType +from src.db.models.comic import WorkType +from src.schema.comics.worktype import AddWorkType def create_new_worktype(work: AddWorkType, db: Session) -> WorkType: diff --git a/kontor-api/src/db/repository/media/actor.py b/kontor-api/src/db/repository/media/actor.py index 9bf58b5..80868cd 100644 --- a/kontor-api/src/db/repository/media/actor.py +++ b/kontor-api/src/db/repository/media/actor.py @@ -3,9 +3,9 @@ import uuid from sqlalchemy.orm import Session -from kontor_model.db.models.media import MediaActor -from kontor_model.db.repository.media.actorfile import delete_mediaactorfile -from kontor_model.schema.media.actor import MediaActorModel +from src.db.models.media import MediaActor +from src.db.repository.media.actorfile import delete_mediaactorfile +from src.schema.media.actor import MediaActorModel def create_new_mediaactor(new_actor: MediaActorModel, db: Session) -> MediaActor: diff --git a/kontor-api/src/db/repository/media/actorfile.py b/kontor-api/src/db/repository/media/actorfile.py index 04ab50c..2321c94 100644 --- a/kontor-api/src/db/repository/media/actorfile.py +++ b/kontor-api/src/db/repository/media/actorfile.py @@ -3,8 +3,8 @@ import uuid from sqlalchemy.orm import Session -from kontor_model.db.models.media import MediaActorFile -from kontor_model.schema.media.actorfile import MediaActorFileModel +from src.db.models.media import MediaActorFile +from src.schema.media.actorfile import MediaActorFileModel def create_new_mediaactorfile( diff --git a/kontor-api/src/db/repository/media/file.py b/kontor-api/src/db/repository/media/file.py index ca99a6c..661dee2 100644 --- a/kontor-api/src/db/repository/media/file.py +++ b/kontor-api/src/db/repository/media/file.py @@ -3,8 +3,8 @@ import uuid from sqlalchemy.orm import Session -from kontor_model.db.models.media import MediaFile -from kontor_model.schema.media.file import MediaFileModel +from src.db.models.media import MediaFile +from src.schema.media.file import MediaFileModel def create_new_mediafile(link: str, db: Session) -> MediaFile: diff --git a/kontor-api/src/db/repository/media/lofi.py b/kontor-api/src/db/repository/media/lofi.py index c8820f3..bd85d98 100644 --- a/kontor-api/src/db/repository/media/lofi.py +++ b/kontor-api/src/db/repository/media/lofi.py @@ -3,8 +3,8 @@ import uuid from sqlalchemy.orm import Session -from kontor_model.db.models.media import MediaLofi -from kontor_model.schema.media.lofi import MediaLofiModel +from src.db.models.media import MediaLofi +from src.schema.media.lofi import MediaLofiModel def create_new_lofi(url: str, db: Session) -> MediaLofi: diff --git a/kontor-api/src/db/repository/media/video.py b/kontor-api/src/db/repository/media/video.py index b1196dc..14347a1 100644 --- a/kontor-api/src/db/repository/media/video.py +++ b/kontor-api/src/db/repository/media/video.py @@ -3,7 +3,7 @@ import uuid from sqlalchemy.orm import Session -from kontor_model.db.models.media import MediaVideo +from src.db.models.media import MediaVideo def create_new_video(url: str, db: Session) -> MediaVideo: diff --git a/kontor-api/src/db/repository/user.py b/kontor-api/src/db/repository/user.py index 2511845..9a68b84 100644 --- a/kontor-api/src/db/repository/user.py +++ b/kontor-api/src/db/repository/user.py @@ -1,10 +1,10 @@ from datetime import datetime from typing import Optional import uuid -from kontor_model.db.models.admin import Assignment, Profile +from src.db.models.admin import Assignment, Profile from sqlalchemy.orm import Session -from kontor_model.schema.user.profile import ProfileModel +from src.schema.user.profile import ProfileModel def create_new_profile(new_profile: ProfileModel, db: Session) -> Profile: diff --git a/kontor-api/src/main.py b/kontor-api/src/main.py index f1e715d..f090518 100644 --- a/kontor-api/src/main.py +++ b/kontor-api/src/main.py @@ -10,7 +10,7 @@ from src.apis.version1.admin.login import login_router from src.core.config import settings from src.core.log_conf import logger from src.core.middleware import RequestLoggingMiddleware -from kontor_model.db.models.base import Base +from src.db.models.base import Base from src.db.session import engine from src.db.utils import check_db_connected, check_db_disconnected from src.webapps.base import api_router as web_app_router diff --git a/kontor-api/src/schema/bookshelf/bookauthor.py b/kontor-api/src/schema/bookshelf/bookauthor.py index 4ef95fe..e8a7609 100644 --- a/kontor-api/src/schema/bookshelf/bookauthor.py +++ b/kontor-api/src/schema/bookshelf/bookauthor.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from kontor_model.db.models.bookshelf import BookAuthor +from src.db.models.bookshelf import BookAuthor class BookAuthorResponse(BaseModel): diff --git a/kontor-api/src/schema/user/assignment.py b/kontor-api/src/schema/user/assignment.py index 5a61b05..f2673a5 100644 --- a/kontor-api/src/schema/user/assignment.py +++ b/kontor-api/src/schema/user/assignment.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from kontor_model.db.models.admin import Assignment +from src.db.models.admin import Assignment class AssignmentResponse(BaseModel): diff --git a/kontor-api/src/schema/user/permission.py b/kontor-api/src/schema/user/permission.py index 18ab3b4..3f5867b 100644 --- a/kontor-api/src/schema/user/permission.py +++ b/kontor-api/src/schema/user/permission.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from kontor_model.db.models.admin import Permission +from src.db.models.admin import Permission class PermissionResponse(BaseModel): diff --git a/kontor-api/src/schema/user/profile.py b/kontor-api/src/schema/user/profile.py index 7bb21a6..0315fda 100644 --- a/kontor-api/src/schema/user/profile.py +++ b/kontor-api/src/schema/user/profile.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from kontor_model.db.models.admin import Profile +from src.db.models.admin import Profile class ProfileResponse(BaseModel): diff --git a/kontor-api/src/schema/user/token.py b/kontor-api/src/schema/user/token.py index e26409c..3fd9211 100644 --- a/kontor-api/src/schema/user/token.py +++ b/kontor-api/src/schema/user/token.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from kontor_model.db.models.admin import Token +from src.db.models.admin import Token class TokenResponse(BaseModel): diff --git a/kontor-api/src/templates/shared/base.html b/kontor-api/src/templates/shared/base.html index a4a4216..c858d88 100644 --- a/kontor-api/src/templates/shared/base.html +++ b/kontor-api/src/templates/shared/base.html @@ -17,12 +17,6 @@ {% include "components/navbar.html" %} {% block subnav %} {% endblock %} - {% block content %} {% endblock %} @@ -32,41 +26,6 @@ {% block scripts %} {% endblock %} -
{% include "components/footer.html" %} diff --git a/kontor-api/src/webapps/admin/route_admin.py b/kontor-api/src/webapps/admin/route_admin.py index 114ad09..0e7f611 100644 --- a/kontor-api/src/webapps/admin/route_admin.py +++ b/kontor-api/src/webapps/admin/route_admin.py @@ -2,7 +2,7 @@ from typing import Optional from fastapi import APIRouter, Request from fastapi.templating import Jinja2Templates -from kontor_model.db.models.admin import Permission, Profile +from src.db.models.admin import Permission, Profile from src.db.session import SessionDep templates = Jinja2Templates(directory="src/templates") diff --git a/kontor-api/src/webapps/comic/route_artists.py b/kontor-api/src/webapps/comic/route_artists.py index 94d2729..672a524 100644 --- a/kontor-api/src/webapps/comic/route_artists.py +++ b/kontor-api/src/webapps/comic/route_artists.py @@ -2,13 +2,13 @@ from fastapi import APIRouter, Request, status, Form from fastapi.templating import Jinja2Templates from fastapi.responses import RedirectResponse -from kontor_model.db.models.comic import Artist +from src.db.models.comic import Artist from typing import AnyStr -from kontor_model.db.repository.comics.artist import update_artist +from src.db.repository.comics.artist import update_artist from src.db.session import SessionDep #from src.db.repository.comic import create_new_worktype, update_worktype -from kontor_model.schema.comics.artist import AddArtist +from src.schema.comics.artist import AddArtist from src.webapps.comic.forms.artist import AddArtistForm #from src.schema.comics.worktype import AddWorkType diff --git a/kontor-api/src/webapps/comic/route_comics.py b/kontor-api/src/webapps/comic/route_comics.py index cb1c572..9285273 100644 --- a/kontor-api/src/webapps/comic/route_comics.py +++ b/kontor-api/src/webapps/comic/route_comics.py @@ -2,12 +2,12 @@ from fastapi import APIRouter, Form, Request, status from fastapi.templating import Jinja2Templates from fastapi.responses import RedirectResponse -from kontor_model.db.models.comic import Comic, Publisher, Issue +from src.db.models.comic import Comic, Publisher, Issue from typing import AnyStr from src.core.log_conf import logger -from kontor_model.db.repository.comics.comic import update_comic +from src.db.repository.comics.comic import update_comic from src.db.session import SessionDep -from kontor_model.schema.comics.comic import ComicSchema +from src.schema.comics.comic import ComicSchema from src.webapps.comic.forms.comic import ValidateComicForm templates = Jinja2Templates(directory="src/templates") diff --git a/kontor-api/src/webapps/comic/route_worktype.py b/kontor-api/src/webapps/comic/route_worktype.py index bff9025..365dc76 100644 --- a/kontor-api/src/webapps/comic/route_worktype.py +++ b/kontor-api/src/webapps/comic/route_worktype.py @@ -2,13 +2,13 @@ from fastapi import APIRouter, Request, status from fastapi.templating import Jinja2Templates from fastapi.responses import RedirectResponse -from kontor_model.db.models.comic import WorkType +from src.db.models.comic import WorkType from typing import AnyStr -from kontor_model.db.repository.comics.worktype import create_new_worktype, update_worktype +from src.db.repository.comics.worktype import create_new_worktype, update_worktype from src.db.session import SessionDep from src.main import logger -from kontor_model.schema.comics.worktype import AddWorkType +from src.schema.comics.worktype import AddWorkType from src.webapps.comic.forms.worktype import AddWorktypeForm templates = Jinja2Templates(directory="src/templates") diff --git a/kontor-api/src/webapps/media/route_actors.py b/kontor-api/src/webapps/media/route_actors.py index 9624e3a..63bcce8 100644 --- a/kontor-api/src/webapps/media/route_actors.py +++ b/kontor-api/src/webapps/media/route_actors.py @@ -2,7 +2,7 @@ from typing import AnyStr from fastapi import APIRouter, Request from fastapi.templating import Jinja2Templates -from kontor_model.db.models.media import MediaActor +from src.db.models.media import MediaActor from src.db.session import SessionDep templates = Jinja2Templates(directory="src/templates") diff --git a/kontor-api/src/webapps/media/route_lofi.py b/kontor-api/src/webapps/media/route_lofi.py index 9b934a7..15c5ed1 100644 --- a/kontor-api/src/webapps/media/route_lofi.py +++ b/kontor-api/src/webapps/media/route_lofi.py @@ -5,9 +5,9 @@ from fastapi.security.utils import get_authorization_scheme_param from fastapi.templating import Jinja2Templates from src.core.security import get_current_user_from_token -from kontor_model.db.models.media import MediaLofi -from kontor_model.db.models.admin import Profile -from kontor_model.db.repository.media.lofi import create_new_lofi +from src.db.models.media import MediaLofi +from src.db.models.admin import Profile +from src.db.repository.media.lofi import create_new_lofi from src.db.session import SessionDep from src.webapps.media.forms import AddLinkForm diff --git a/kontor-api/src/webapps/media/route_media.py b/kontor-api/src/webapps/media/route_media.py index 1ffbefd..842ff67 100644 --- a/kontor-api/src/webapps/media/route_media.py +++ b/kontor-api/src/webapps/media/route_media.py @@ -6,8 +6,8 @@ from fastapi.templating import Jinja2Templates from sqlalchemy import or_ from src.core.security import get_current_user_from_token -from kontor_model.db.models.admin import Profile -from kontor_model.db.models.media import MediaFile +from src.db.models.admin import Profile +from src.db.models.media import MediaFile from src.core.log_conf import logger from src.db.session import SessionDep diff --git a/kontor-api/src/webapps/media/route_videos.py b/kontor-api/src/webapps/media/route_videos.py index b4c3cd2..e4419db 100644 --- a/kontor-api/src/webapps/media/route_videos.py +++ b/kontor-api/src/webapps/media/route_videos.py @@ -5,9 +5,9 @@ from fastapi.security.utils import get_authorization_scheme_param from fastapi.templating import Jinja2Templates from src.core.security import get_current_user_from_token -from kontor_model.db.models.media import MediaVideo -from kontor_model.db.models.admin import Profile -from kontor_model.db.repository.media.video import create_new_video +from src.db.models.media import MediaVideo +from src.db.models.admin import Profile +from src.db.repository.media.video import create_new_video from src.db.session import SessionDep from src.webapps.media.forms import AddLinkForm diff --git a/kontor-api/tests/conftest.py b/kontor-api/tests/conftest.py index ffb24d6..d3afb43 100644 --- a/kontor-api/tests/conftest.py +++ b/kontor-api/tests/conftest.py @@ -11,7 +11,7 @@ from sqlalchemy import create_engine from sqlalchemy.orm import Session, sessionmaker from src.apis.base import api_router -from kontor_model.db.models.base import Base +from src.db.models.base import Base from src.db.session import get_db sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))