From 1434d6f541d37224e953955783bcddee97aef132 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 15 Apr 2026 10:04:23 +0200 Subject: [PATCH] change structure to make package build --- app/__init__.py | 6 ++++++ {controllers => app/controllers}/cardManager.py | 6 +++--- {controllers => app/controllers}/userManager.py | 6 +++--- main.py => app/main.py | 2 +- {schemas => app/model}/card.py | 0 models.py => app/model/dbModels.py | 0 {schemas => app/model}/user.py | 0 {services => app/services}/database.py | 3 ++- 8 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 app/__init__.py rename {controllers => app/controllers}/cardManager.py (91%) rename {controllers => app/controllers}/userManager.py (92%) rename main.py => app/main.py (72%) rename {schemas => app/model}/card.py (100%) rename models.py => app/model/dbModels.py (100%) rename {schemas => app/model}/user.py (100%) rename {services => app/services}/database.py (90%) diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..958d6b5 --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,6 @@ +from fastapi import FastAPI +from .controllers import userManager, cardManager + +app = FastAPI() +app.include_router(userManager.user_router) +app.include_router(cardManager.card_router) \ No newline at end of file diff --git a/controllers/cardManager.py b/app/controllers/cardManager.py similarity index 91% rename from controllers/cardManager.py rename to app/controllers/cardManager.py index ff8da38..0ee258a 100644 --- a/controllers/cardManager.py +++ b/app/controllers/cardManager.py @@ -3,9 +3,9 @@ from sqlalchemy.orm import Session from sqlalchemy import select from typing import List -from models import Card, AccessAuthorization -from schemas.card import CardBase, AccessAuthorizationCreate, AccessAuthorization as AccessSchema -from services.database import SessionLocal, engine +from ..model.dbModels import Card, AccessAuthorization +from ..model.card import CardBase, AccessAuthorizationCreate, AccessAuthorization as AccessSchema +from ..services.database import SessionLocal, engine import uuid as gen_uuid card_router = APIRouter(tags=["Card"]) diff --git a/controllers/userManager.py b/app/controllers/userManager.py similarity index 92% rename from controllers/userManager.py rename to app/controllers/userManager.py index 064507c..693fde0 100644 --- a/controllers/userManager.py +++ b/app/controllers/userManager.py @@ -2,9 +2,9 @@ from fastapi import APIRouter, Depends, HTTPException from sqlalchemy.orm import Session from typing import List -from models import User -from schemas.user import UserCreate, User as UserSchema -from services.database import SessionLocal, engine +from ..model.dbModels import User +from ..model.user import UserCreate, User as UserSchema +from ..services.database import SessionLocal, engine user_router = APIRouter(tags=["users"]) diff --git a/main.py b/app/main.py similarity index 72% rename from main.py rename to app/main.py index 0792703..958d6b5 100644 --- a/main.py +++ b/app/main.py @@ -1,5 +1,5 @@ from fastapi import FastAPI -from controllers import userManager, cardManager +from .controllers import userManager, cardManager app = FastAPI() app.include_router(userManager.user_router) diff --git a/schemas/card.py b/app/model/card.py similarity index 100% rename from schemas/card.py rename to app/model/card.py diff --git a/models.py b/app/model/dbModels.py similarity index 100% rename from models.py rename to app/model/dbModels.py diff --git a/schemas/user.py b/app/model/user.py similarity index 100% rename from schemas/user.py rename to app/model/user.py diff --git a/services/database.py b/app/services/database.py similarity index 90% rename from services/database.py rename to app/services/database.py index 8fc97bb..4bcf92e 100644 --- a/services/database.py +++ b/app/services/database.py @@ -1,6 +1,8 @@ from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker +from ..model.dbModels import Base + SQLALCHEMY_DATABASE_URL = "sqlite:///./gatekeeper.db" engine = create_engine( @@ -8,5 +10,4 @@ engine = create_engine( ) SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) -from models import Base Base.metadata.create_all(bind=engine) \ No newline at end of file