Merge pull request #29 from ArielMAJ/release/2.0.1

Release/2.0.1

Author: ArielMAJ

.env.docker.example

@@ -0,0 +1,22 @@
+APPLICATION_HOST=sso
+APPLICATION_PORT=3000
+
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_HOST=sso-db
+POSTGRES_DATABASE=postgres
+POSTGRES_PORT=5432
+
+RELOAD=false
+
+POSTGRES_ECHO=true  # Set to false if you don't want to see SQL queries in the console
+DATABASE_ENABLE_CONNECTION_POOLING=true  # Set to false to correctly work on Vercel
+
+LOGGER_IGNORE_PATHS=GET:/docs,GET:/openapi.json
+LOGGER_IGNORE_INPUT_BODY_PATHS=POST:/user/register,PUT:/user/,POST:/auth/token
+LOGGER_IGNORE_OUTPUT_BODY_PATHS=POST:/auth/token
+
+# Needs to be set to correctly work. Run `make generate-secret-key` to generate a random key.
+SECRET_KEY=
+ALGORITHM=
+ACCESS_TOKEN_EXPIRE_MINUTES=

.gitignore

@@ -121,6 +121,9 @@ celerybeat.pid
 
 # Environments
 .env
+.env.local
+.env.prod
+.env.docker
 .venv
 env/
 venv/
@@ -158,3 +161,5 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+.DS_Store

Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.12.10-slim
+
+WORKDIR /
+
+COPY requirements.txt .
+
+RUN pip install --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
+
+COPY ./src ./src
+COPY ./alembic.ini .
+
+EXPOSE 3000
+
+CMD ["/bin/sh", "-c", "alembic upgrade head && python -m src.main"]

Makefile

@@ -21,9 +21,17 @@ install: ## Install Python package dependencies.
 test: ## Run automated tests.
 	ENVIRONMENT=test poetry run pytest --cov
 
+.PHONY: up
+up: ## Start all containers.
+	$(COMPOSE) -f ./docker-compose.yml up -d --force-recreate
+
+.PHONY: recreate
+recreate: ## Recreate all containers.
+	$(COMPOSE) -f ./docker-compose.yml up -d --force-recreate --build
+
 .PHONY: up-database
 up-database: ## Start database container.
-	$(COMPOSE) up -d postgres --force-recreate
+	$(COMPOSE) -f ./docker-compose.yml up -d database --force-recreate
 
 .PHONY: down
 down: ## Stop all containers.
@@ -80,8 +88,15 @@ init-env: ## Copy .env.example to .env and populate SECRET_KEY, ALGORITHM, ACCES
 		exit 1; \
 	fi;
 
+	@if [ -f .env.docker ]; then \
+		echo "Error: .env.docker already exists. Aborting."; \
+		exit 1; \
+	fi;
+
 	@cp .env.example .env
+	@cp .env.docker.example .env.docker
 	@sed -i '' -e '/^SECRET_KEY=/d' -e '/^ALGORITHM=/d' -e '/^ACCESS_TOKEN_EXPIRE_MINUTES=/d' .env
+	@sed -i '' -e '/^SECRET_KEY=/d' -e '/^ALGORITHM=/d' -e '/^ACCESS_TOKEN_EXPIRE_MINUTES=/d' .env.docker
 
 	@SECRET_KEY=$$( \
 		if command -v python >/dev/null 2>&1; then \
@@ -96,10 +111,12 @@ init-env: ## Copy .env.example to .env and populate SECRET_KEY, ALGORITHM, ACCES
 		echo "Error: Failed to generate SECRET_KEY. Aborting."; \
 		exit 1; \
 	fi; \
-	echo "SECRET_KEY=$$SECRET_KEY" >> .env
+	echo "SECRET_KEY=$$SECRET_KEY" | tee -a .env .env.docker > /dev/null
 
 	@echo "ALGORITHM=HS256" >> .env
 	@echo "ACCESS_TOKEN_EXPIRE_MINUTES=30" >> .env
+	@echo "ALGORITHM=HS256" >> .env.docker
+	@echo "ACCESS_TOKEN_EXPIRE_MINUTES=30" >> .env.docker
 
 .PHONY: clean
 clean: ## Clean project's temporary files.

docker-compose.yml

@@ -1,13 +1,24 @@
 services:
-  postgres:
+  sso:
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
+    env_file:
+      - .env.docker
+    environment:
+      - APPLICATION_PORT=3000
+    ports:
+      - "${SSO_PORT:-3001}:3000"
+    depends_on:
+      - database
+
+  sso-db:
     image: postgres:16.3
     restart: always
-    environment:
-      POSTGRES_DB: ${POSTGRES_DATABASE}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    env_file:
+      - .env.docker
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT:-5432}:${POSTGRES_PORT:-5432}"
     volumes:
       - pgdata:/var/lib/postgresql/data
 

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastapi-backend-template"
-version = "2.0.0"
+version = "2.0.1"
 description = "A FastAPI backend template."
 authors = ["ArielMAJ <ariel.maj@hotmail.com>"]
 readme = "README.md"

pyproject.toml

@@ -11,7 +11,7 @@ email-validator==2.2.0 ; python_version >= "3.12" and python_version < "4.0"
 fastapi-async-sqlalchemy==0.6.1 ; python_version >= "3.12" and python_version < "4.0"
 fastapi-cache2==0.2.2 ; python_version >= "3.12" and python_version < "4.0"
 fastapi==0.115.12 ; python_version >= "3.12" and python_version < "4.0"
-greenlet==3.2.2 ; python_version >= "3.12" and python_version < "4.0"
+greenlet==3.2.3 ; python_version >= "3.12" and python_version < "4.0"
 h11==0.16.0 ; python_version >= "3.12" and python_version < "4.0"
 httpcore==1.0.9 ; python_version >= "3.12" and python_version < "4.0"
 httptools==0.6.4 ; python_version >= "3.12" and python_version < "4.0"
@@ -36,11 +36,11 @@ sniffio==1.3.1 ; python_version >= "3.12" and python_version < "4.0"
 sqlalchemy==2.0.41 ; python_version >= "3.12" and python_version < "4.0"
 sqlalchemy[asyncio]==2.0.41 ; python_version >= "3.12" and python_version < "4.0"
 starlette==0.46.2 ; python_version >= "3.12" and python_version < "4.0"
-typing-extensions==4.13.2 ; python_version >= "3.12" and python_version < "4.0"
+typing-extensions==4.14.0 ; python_version >= "3.12" and python_version < "4.0"
 typing-inspection==0.4.1 ; python_version >= "3.12" and python_version < "4.0"
 tzdata==2025.2 ; python_version >= "3.12" and python_version < "4.0"
-uvicorn==0.34.2 ; python_version >= "3.12" and python_version < "4.0"
-uvicorn[standard]==0.34.2 ; python_version >= "3.12" and python_version < "4.0"
+uvicorn==0.34.3 ; python_version >= "3.12" and python_version < "4.0"
+uvicorn[standard]==0.34.3 ; python_version >= "3.12" and python_version < "4.0"
 uvloop==0.21.0 ; (sys_platform != "win32" and sys_platform != "cygwin") and platform_python_implementation != "PyPy" and python_version >= "3.12" and python_version < "4.0"
 watchfiles==1.0.5 ; python_version >= "3.12" and python_version < "4.0"
 websockets==15.0.1 ; python_version >= "3.12" and python_version < "4.0"

requirements.txt

@@ -1,18 +1,14 @@
 from datetime import datetime
 from typing import Union
 
-from pydantic import BaseModel, field_serializer
+from pydantic import BaseModel
 
 
 class Token(BaseModel):
     access_token: str
     token_type: str
     expires_at: datetime
 
-    @field_serializer("expires_at")
-    def serialize_expires_at(self, value: datetime):
-        return value.strftime("%d-%m-%Y %H:%M:%S")
-
 
 class TokenData(BaseModel):
     email: Union[str, None] = None

src/schemas/auth.py

@@ -1,7 +1,6 @@
 from datetime import datetime
-from typing import Optional
 
-from pydantic import BaseModel, field_serializer
+from pydantic import BaseModel
 
 
 class BaseDBSchema(BaseModel):
@@ -12,8 +11,8 @@ class BaseDBSchema(BaseModel):
     class Config:
         from_attributes = True
 
-    @field_serializer("created_at", "updated_at")
-    def serialize_dt(self, dt: Optional[datetime]):
-        if not dt:
-            return dt
-        return dt.strftime("%d-%m-%Y %H:%M:%S")
+    # @field_serializer("created_at", "updated_at")
+    # def serialize_dt(self, dt: Optional[datetime]):
+    #     if not dt:
+    #         return dt
+    #     return dt.strftime("%d-%m-%Y %H:%M:%S")