Remove: .env File

.gitignore

@@ -148,7 +148,7 @@ node_modules/
 /flask_session
 
 # Project
-**/foo.db
+**/*.db
 /alembic
 alembic.ini
 /uploads

Dockerfile

@@ -4,12 +4,14 @@ ARG INSTALL_PYTHON_VERSION=3.10
 FROM python:${INSTALL_PYTHON_VERSION}-slim-buster as production
 
 WORKDIR /app
-COPY requirements requirements
+COPY requirements.txt requirements.txt
 RUN pip3 install --upgrade pip
-RUN pip3 install -r requirements/backend.txt
-RUN pip3 install -r requirements/cli.txt
-RUN pip3 install -r requirements/data.txt
-RUN pip install --no-cache --user -r requirements/data.txt
+RUN pip3 install -r requirements.txt
+
+ENV PYTHONUNBUFFERED=1
+ENV SECRET_KEY='My-Secret-Key'
+ENV DATABASE_URL="sqlite:///./sql_app.db"
+ENV CREATE_DB='False'
 
 ENV PYTHONUNBUFFERED=1
 

requirements/backend.txt → requirements.txt

@@ -4,10 +4,16 @@ uvicorn==0.20.0
 python-multipart==0.0.5
 Pillow==9.4.0
 fastapi-camelcase==1.0.5
+Werkzeug==2.2.2
+strawberry-graphql[fastapi]==0.151.2
 
+# CLI
+cmd2~=2.4
 
 # Security
 pyjwt==2.6.0
 
 # Database
-psycopg2-binary==2.9.5
+psycopg2-binary~=2.9
+SQLAlchemy==1.4.46
+alembic==1.9.1

src/mylassi_backend/__init__.py

@@ -1,9 +1,12 @@
 __all__ = ['create_app']
 
-from dotenv import load_dotenv
+import os
+
 from fastapi import FastAPI, APIRouter
 from fastapi.responses import RedirectResponse
 
+from mylassi_data.db import Base, engine
+
 general_router = APIRouter()
 
 
@@ -13,13 +16,21 @@ def index_redirect():
 
 
 def create_app() -> FastAPI:
-    load_dotenv('.env')
     app = FastAPI(title="MyLassi.xyz - API")
 
+    bind(app)
+
     # General
     app.include_router(general_router)
 
     from .api import api_v1
     app.mount('/api', api_v1)
 
     return app
+
+
+def bind(app: FastAPI):
+    @app.on_event("startup")
+    def on_startup() -> None:
+        if os.environ.get('CREATE_DB', 'True') == 'True':
+            Base.metadata.create_all(bind=engine)

src/mylassi_backend/api/file.py

@@ -19,7 +19,7 @@
 
 router = APIRouter(tags=['Files'])
 
-upload_path = os.environ['UPLOAD_DIR']
+upload_path = os.environ.get('UPLOAD_DIR', 'upload')
 
 
 def delete_file(file_id: int):
@@ -56,10 +56,10 @@ def check_file(file_id: int):
 
 def upload_file():
     async def upload_file_helper(
-            file: UploadFile,
-            task: BackgroundTasks,
-            session: Session = Depends(get_db),
-            current_user: UserModel = Depends(get_current_active_user)) -> str:
+        file: UploadFile,
+        task: BackgroundTasks,
+        session: Session = Depends(get_db),
+        current_user: UserModel = Depends(get_current_active_user)) -> str:
 
         fs_file = FSFileModel()
         fs_file.mimetype = mimetypes.guess_type(file.filename)[0]
@@ -106,8 +106,8 @@ async def upload_file_helper(
 @router.post('/files', response_model=FileRestType,
              operation_id='uploadFile')
 async def upload_file_to_filesystem(
-        session: Session = Depends(get_db),
-        file: str = Depends(upload_file())):
+    session: Session = Depends(get_db),
+    file: str = Depends(upload_file())):
     file = FileModel.get_or_404(session, file)
     return file.rest_type()
 

src/mylassi_backend/api/security.py

@@ -18,7 +18,7 @@
 from mylassi_data.models import *
 from mylassi_data.restschema import *
 
-SECRET_KEY = os.environ['SECRET_KEY']
+SECRET_KEY = os.environ.get('SECRET_KEY', 'My-Secret-Key')
 ALGORITHM = os.environ.get('ALGORITHM', "HS256")
 ACCESS_TOKEN_EXPIRE_MINUTES = int(os.environ.get('ACCESS_TOKEN_EXPIRE_MINUTES', '30'))
 

src/mylassi_data/db.py

@@ -2,13 +2,11 @@
 
 import os
 
-from dotenv import load_dotenv
 from sqlalchemy import create_engine, MetaData
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, scoped_session
 
-load_dotenv('.env')
-SQLALCHEMY_DATABASE_URL = os.environ['DATABASE_URL']
+SQLALCHEMY_DATABASE_URL = os.environ.get('DATABASE_URL', "sqlite:///./sql_app.db")
 
 convention = {
     "ix": 'ix_%(column_0_label)s',