rename tests, bump pg, add lifespan and probe, add makefile

Signed-off-by: rafsaf <rafal.safin12@gmail.com>

Author: rafsaf

.env.example

@@ -6,4 +6,7 @@ DATABASE__HOSTNAME=localhost
 DATABASE__USERNAME=rDGJeEDqAz
 DATABASE__PASSWORD=XsPQhCoEfOQZueDjsILetLDUvbvSxAMnrVtgVZpmdcSssUgbvs
 DATABASE__PORT=5455
-DATABASE__DB=default_db
+DATABASE__DB=default_db
+
+PROMETHEUS__ENABLED=true
+PROMETHEUS__ADDR="127.0.0.1"

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13.5-slim-bookworm AS base
+FROM python:3.14-slim-trixie AS base
 
 ENV PYTHONUNBUFFERED=1
 WORKDIR /build
@@ -28,8 +28,9 @@ COPY alembic.ini .
 COPY pyproject.toml .
 COPY init.sh .
 
-# Expose port
+# Expose port 8000 for app and optional 9090 for prometheus metrics
 EXPOSE 8000
+EXPOSE 9090
 
 # Make the init script executable
 RUN chmod +x ./init.sh
@@ -39,4 +40,4 @@ ENTRYPOINT ["./init.sh"]
 
 # Set CMD to uvicorn
 # /venv/bin/uvicorn is used because from entrypoint script PATH is new
-CMD ["/venv/bin/uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "2", "--loop", "uvloop"]
+CMD ["/venv/bin/uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "1", "--loop", "uvloop"]

Makefile

@@ -0,0 +1,34 @@
+BIND_PORT ?= 8000
+BIND_HOST ?= localhost
+
+.PHONY: help
+help:  ## Print this help message
+	grep -E '^[\.a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.env:  ## Ensure there is env file or create one
+	echo "No .env file found. Want to create it from .env.example? [y/n]" && read answer && if [ $${answer:-'N'} = 'y' ]; then cp .env.example .env;fi
+
+.PHONY: local-setup
+local-setup:  ## Setup local postgres database
+	docker compose up -d
+
+.PHONY: up
+up: local-setup  ## Run FastAPI development server
+	uv run alembic upgrade head
+	uv run uvicorn app.main:app --reload --host $(BIND_HOST) --port $(BIND_PORT)
+
+.PHONY: run
+run: up  ## Alias for `up`
+
+.PHONY: down
+down:  ## Stop database
+	docker compose down
+
+.PHONY: test
+test: local-setup  ## Run unit tests
+	uv run pytest .
+
+.PHONY: lint
+lint: local-setup  ## Run all linters
+	uv run pre-commit run -a
+	uv run mypy .

app/auth/tests/test_read_current_user.py

@@ -1,4 +1,3 @@
-import pytest
 from fastapi import status
 from httpx import AsyncClient
 from sqlalchemy import select
@@ -8,7 +7,6 @@
 from app.main import app
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_delete_current_user_status_code(
     client: AsyncClient,
     default_user_headers: dict[str, str],
@@ -21,7 +19,6 @@ async def test_delete_current_user_status_code(
     assert response.status_code == status.HTTP_204_NO_CONTENT
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_delete_current_user_is_deleted_in_db(
     client: AsyncClient,
     default_user_headers: dict[str, str],

…p/auth/tests/test_delete_current_user.py …h/tests/test_view_delete_current_user.pyapp/auth/tests/test_delete_current_user.py renamed to app/auth/tests/test_view_delete_current_user.py app/auth/tests/test_delete_current_user.py renamed to app/auth/tests/test_view_delete_current_user.py

@@ -1,6 +1,5 @@
 import time
 
-import pytest
 from fastapi import status
 from freezegun import freeze_time
 from httpx import AsyncClient
@@ -15,7 +14,6 @@
 from app.tests.auth import TESTS_USER_PASSWORD
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_login_access_token_has_response_status_code(
     client: AsyncClient,
     default_user: User,
@@ -31,7 +29,6 @@ async def test_login_access_token_has_response_status_code(
     assert response.status_code == status.HTTP_200_OK, response.text
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_login_access_token_jwt_has_valid_token_type(
     client: AsyncClient,
     default_user: User,
@@ -49,7 +46,6 @@ async def test_login_access_token_jwt_has_valid_token_type(
     assert token["token_type"] == "Bearer"
 
 
-@pytest.mark.asyncio(loop_scope="session")
 @freeze_time("2023-01-01")
 async def test_login_access_token_jwt_has_valid_expire_time(
     client: AsyncClient,
@@ -72,7 +68,6 @@ async def test_login_access_token_jwt_has_valid_expire_time(
     )
 
 
-@pytest.mark.asyncio(loop_scope="session")
 @freeze_time("2023-01-01")
 async def test_login_access_token_returns_valid_jwt_access_token(
     client: AsyncClient,
@@ -97,7 +92,6 @@ async def test_login_access_token_returns_valid_jwt_access_token(
     assert token_payload.exp == token["expires_at"]
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_login_access_token_refresh_token_has_valid_expire_time(
     client: AsyncClient,
     default_user: User,
@@ -120,7 +114,6 @@ async def test_login_access_token_refresh_token_has_valid_expire_time(
     )
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_login_access_token_refresh_token_exists_in_db(
     client: AsyncClient,
     default_user: User,
@@ -144,7 +137,6 @@ async def test_login_access_token_refresh_token_exists_in_db(
     assert token_db_count == 1
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_login_access_token_refresh_token_in_db_has_valid_fields(
     client: AsyncClient,
     default_user: User,
@@ -171,7 +163,6 @@ async def test_login_access_token_refresh_token_in_db_has_valid_fields(
     assert not refresh_token.used
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_auth_access_token_fail_for_not_existing_user_with_message(
     client: AsyncClient,
 ) -> None:
@@ -188,7 +179,6 @@ async def test_auth_access_token_fail_for_not_existing_user_with_message(
     assert response.json() == {"detail": api_messages.PASSWORD_INVALID}
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_auth_access_token_fail_for_invalid_password_with_message(
     client: AsyncClient,
     default_user: User,

app/auth/tests/test_access_token.py …th/tests/test_view_login_access_token.pyapp/auth/tests/test_access_token.py renamed to app/auth/tests/test_view_login_access_token.py app/auth/tests/test_access_token.py renamed to app/auth/tests/test_view_login_access_token.py

@@ -1,4 +1,3 @@
-import pytest
 from fastapi import status
 from freezegun import freeze_time
 from httpx import AsyncClient
@@ -11,7 +10,35 @@
 from app.main import app
 
 
-@pytest.mark.asyncio(loop_scope="session")
+async def test_read_current_user_status_code(
+    client: AsyncClient,
+    default_user_headers: dict[str, str],
+    default_user: User,
+) -> None:
+    response = await client.get(
+        app.url_path_for("read_current_user"),
+        headers=default_user_headers,
+    )
+
+    assert response.status_code == status.HTTP_200_OK
+
+
+async def test_read_current_user_response(
+    client: AsyncClient,
+    default_user_headers: dict[str, str],
+    default_user: User,
+) -> None:
+    response = await client.get(
+        app.url_path_for("read_current_user"),
+        headers=default_user_headers,
+    )
+
+    assert response.json() == {
+        "user_id": default_user.user_id,
+        "email": default_user.email,
+    }
+
+
 async def test_api_raise_401_on_jwt_decode_errors(
     client: AsyncClient,
 ) -> None:
@@ -24,7 +51,6 @@ async def test_api_raise_401_on_jwt_decode_errors(
     assert response.json() == {"detail": "Token invalid: Not enough segments"}
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_api_raise_401_on_jwt_expired_token(
     client: AsyncClient,
     default_user: User,
@@ -41,7 +67,6 @@ async def test_api_raise_401_on_jwt_expired_token(
         assert response.json() == {"detail": "Token invalid: Signature has expired"}
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_api_raise_401_on_jwt_user_deleted(
     client: AsyncClient,
     default_user_headers: dict[str, str],

…auth/tests/test_api_router_jwt_errors.py …uth/tests/test_view_read_current_user.pyapp/auth/tests/test_api_router_jwt_errors.py renamed to app/auth/tests/test_view_read_current_user.py app/auth/tests/test_api_router_jwt_errors.py renamed to app/auth/tests/test_view_read_current_user.py

@@ -1,6 +1,5 @@
 import time
 
-import pytest
 from fastapi import status
 from freezegun import freeze_time
 from httpx import AsyncClient
@@ -14,7 +13,6 @@
 from app.main import app
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_fails_with_message_when_token_does_not_exist(
     client: AsyncClient,
 ) -> None:
@@ -29,7 +27,6 @@ async def test_refresh_token_fails_with_message_when_token_does_not_exist(
     assert response.json() == {"detail": api_messages.REFRESH_TOKEN_NOT_FOUND}
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_fails_with_message_when_token_is_expired(
     client: AsyncClient,
     default_user: User,
@@ -54,7 +51,6 @@ async def test_refresh_token_fails_with_message_when_token_is_expired(
     assert response.json() == {"detail": api_messages.REFRESH_TOKEN_EXPIRED}
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_fails_with_message_when_token_is_used(
     client: AsyncClient,
     default_user: User,
@@ -80,7 +76,6 @@ async def test_refresh_token_fails_with_message_when_token_is_used(
     assert response.json() == {"detail": api_messages.REFRESH_TOKEN_ALREADY_USED}
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_success_response_status_code(
     client: AsyncClient,
     default_user: User,
@@ -105,7 +100,6 @@ async def test_refresh_token_success_response_status_code(
     assert response.status_code == status.HTTP_200_OK
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_success_old_token_is_used(
     client: AsyncClient,
     default_user: User,
@@ -134,7 +128,6 @@ async def test_refresh_token_success_old_token_is_used(
     assert used_test_refresh_token.used
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_success_jwt_has_valid_token_type(
     client: AsyncClient,
     default_user: User,
@@ -160,7 +153,6 @@ async def test_refresh_token_success_jwt_has_valid_token_type(
     assert token["token_type"] == "Bearer"
 
 
-@pytest.mark.asyncio(loop_scope="session")
 @freeze_time("2023-01-01")
 async def test_refresh_token_success_jwt_has_valid_expire_time(
     client: AsyncClient,
@@ -191,7 +183,6 @@ async def test_refresh_token_success_jwt_has_valid_expire_time(
     )
 
 
-@pytest.mark.asyncio(loop_scope="session")
 @freeze_time("2023-01-01")
 async def test_refresh_token_success_jwt_has_valid_access_token(
     client: AsyncClient,
@@ -223,7 +214,6 @@ async def test_refresh_token_success_jwt_has_valid_access_token(
     assert token_payload.exp == token["expires_at"]
 
 
-@pytest.mark.asyncio(loop_scope="session")
 @freeze_time("2023-01-01")
 async def test_refresh_token_success_refresh_token_has_valid_expire_time(
     client: AsyncClient,
@@ -254,7 +244,6 @@ async def test_refresh_token_success_refresh_token_has_valid_expire_time(
     )
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_refresh_token_success_new_refresh_token_is_in_db(
     client: AsyncClient,
     default_user: User,

app/auth/tests/test_auth_refresh_token.py app/auth/tests/test_view_refresh_token.pyapp/auth/tests/test_auth_refresh_token.py renamed to app/auth/tests/test_view_refresh_token.py

@@ -1,4 +1,3 @@
-import pytest
 from fastapi import status
 from httpx import AsyncClient
 from sqlalchemy import func, select
@@ -9,7 +8,6 @@
 from app.main import app
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_register_new_user_status_code(
     client: AsyncClient,
 ) -> None:
@@ -24,7 +22,6 @@ async def test_register_new_user_status_code(
     assert response.status_code == status.HTTP_201_CREATED
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_register_new_user_creates_record_in_db(
     client: AsyncClient,
     session: AsyncSession,
@@ -43,7 +40,6 @@ async def test_register_new_user_creates_record_in_db(
     assert user_count == 1
 
 
-@pytest.mark.asyncio(loop_scope="session")
 async def test_register_new_user_cannot_create_already_created_user(
     client: AsyncClient,
     session: AsyncSession,