fix imports from kontor_model

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
 

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()

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()

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()
 

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()
 

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()
 

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()
 

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()
 

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()
 

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()

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()

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()

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()

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()
 

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()
 

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()

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()
 

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()
 

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()
 

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
 )

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()
 

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()
 

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()

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()

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()

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()

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()

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()

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()
 

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()

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()

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()
 

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()
 

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()

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()
 

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",

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]:

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:

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:

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:

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:

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:

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(

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:

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:

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:

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:

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

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):

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):

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):

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):

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):

kontor-api/src/templates/shared/base.html

@@ -17,12 +17,6 @@
         {% include "components/navbar.html" %}
         {% block subnav %}
         {% endblock %}
-        <!-- <div class="topnav">
-            <a href="#">Link</a>
-            <a href="#">Link</a>
-            <a href="#">Link</a>
-            <a href="#" style="float:right">Link</a>
-        </div> -->
 
         {% block content %}
         {% endblock %}
@@ -32,41 +26,6 @@
         {% block scripts %}
         {% endblock %}
 
-        <!-- <div class="row">
-            <div class="leftcolumn">
-                <div class="card">
-                    <h2>TITLE HEADING</h2>
-                    <h5>Title description, Dec 7, 2017</h5>
-                    <div class="fakeimg" style="height:200px;">Image</div>
-                    <p>Some text..</p>
-                    <p>Sunt in culpa qui officia deserunt mollit anim id est laborum consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco.</p>
-                </div>
-                <div class="card">
-                    <h2>TITLE HEADING</h2>
-                    <h5>Title description, Sep 2, 2017</h5>
-                    <div class="fakeimg" style="height:200px;">Image</div>
-                    <p>Some text..</p>
-                    <p>Sunt in culpa qui officia deserunt mollit anim id est laborum consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco.</p>
-                </div>
-            </div>
-            <div class="rightcolumn">
-                <div class="card">
-                    <h2>About Me</h2>
-                    <div class="fakeimg" style="height:100px;">Image</div>
-                    <p>Some text about me in culpa qui officia deserunt mollit anim..</p>
-                </div>
-                <div class="card">
-                    <h3>Popular Post</h3>
-                    <div class="fakeimg"><p>Image</p></div>
-                    <div class="fakeimg"><p>Image</p></div>
-                    <div class="fakeimg"><p>Image</p></div>
-                </div>
-                <div class="card">
-                    <h3>Follow Me</h3>
-                    <p>Some text..</p>
-                </div>
-            </div>
-        </div> -->
 
         <div class="footer">
             {% include "components/footer.html" %}

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")

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

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")

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")

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")

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
 

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
 

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
 

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__))))