Merge branch 'switch-logger-to-rotoger' of https://github.com/grillazz/fastapi-sqlalchemy-asyncpg into switch-logger-to-rotoger

Author: grillazz

Makefile

@@ -60,7 +60,7 @@ safety:	## Check for insecure dependencies
 
 .PHONY: py-upgrade
 py-upgrade:	## Upgrade Python syntax to a newer version
-	pyupgrade --py313-plus `find app -name "*.py"`
+	pyupgrade --py314-plus `find app -name "*.py"`
 
 .PHONY: lint
 lint:  ## Lint and format project code

README.md

@@ -48,22 +48,10 @@ This example demonstrates the seamless integration of [FastAPI](https://fastapi.
 with [Pydantic 2.0](https://github.com/pydantic/pydantic), a robust and powerful data validation library.
 The integration is further enhanced by the use of [SQLAlchemy ORM](https://www.sqlalchemy.org/), a popular and feature-rich Object-Relational Mapping tool,
 and [PostgreSQL17](https://www.postgresql.org/docs/17/release.html) relational database.
-
 The entire stack is connected using the [asyncpg](https://github.com/MagicStack/asyncpg) Database Client Library,
 which provides a robust and efficient way to interact with PostgreSQL databases in Python,
 leveraging the power of asyncio and event loops.
 
-Notably, this example showcases the latest and greatest versions of SQLAlchemy and psycopg,
-which are renowned for their robustness, power, and speed. The inclusion of FastAPI adds a modern, fast, and high-performance web framework to the mix
-allowing for the rapid development of APIs with Python 3.13.
-
-FastAPI has received significant recognition in the industry, including a review on thoughtworks Technology Radar in April 2021,
-where it was classified as a Trial technology, with comments praising its performance, ease of use,
-and features such as API documentation using OpenAPI. Additionally, FastAPI was recognized in the Python Developers Survey 2023 Results,
-conducted by the Python Software Foundation and JetBrains, where it was reported that 1 in 4 Python developers use FastAPI,
-with a 4 percentage point increase from the previous year.
-
-
 ### Built With
 [![FastAPI][fastapi.tiangolo.com]][fastapi-url]
 [![Pydantic][pydantic.com]][pydantic-url]
@@ -73,6 +61,11 @@ with a 4 percentage point increase from the previous year.
 [![asyncpg][asyncpg.github.io]][asyncpg-url]
 [![alembic][alembic.sqlalchemy.org]][alembic-url]
 [![rich][rich.readthedocs.io]][rich-url]
+[![redis][redis.io]][redis-url]
+[![structlog][structlog.org]][structlog-url]
+[![rotoger][rotoger]][rotoger-url]
+[![granian][granian]][granian-url]
+
 
 
 
@@ -106,7 +99,7 @@ Next models were generated with https://github.com/agronholm/sqlacodegen
 
 To elevate the logging capabilities beyond simple colored output,
 this project has transitioned to [Rotoger](https://github.com/tinyplugins/rotoger).
-This powerful library provides a comprehensive, production-ready logging setup for modern asynchronous applications,
+This tiny library provides a comprehensive, production-ready logging setup for modern asynchronous applications,
 addressing challenges like log management, performance, and readability.
 
 Rotoger is built upon the excellent [structlog](http://structlog.org/) library and brings several key advantages:
@@ -218,7 +211,7 @@ I've included a few of my favorites to kick things off!
 
 ## Change Log
 <details>
-  <summary>2025 (3 changes)</summary>
+  <summary>2025 (7 changes)</summary>
       <ul>
          <li>[SEP 2 2025] add sample high availability with nginx as load balancer</li>   
          <li>[AUG 23 2025] intro exception handlers</li>
@@ -280,21 +273,27 @@ I've included a few of my favorites to kick things off!
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=for-the-badge&logo=linkedin&colorB=555
 [linkedin-url]: https://www.linkedin.com/in/python-has-powers/
 
-[fastapi.tiangolo.com]: https://img.shields.io/badge/FastAPI-0.116.1-009485?style=for-the-badge&logo=fastapi&logoColor=white
+[fastapi.tiangolo.com]: https://img.shields.io/badge/FastAPI-0.121.2-009485?style=for-the-badge&logo=fastapi&logoColor=white
 [fastapi-url]: https://fastapi.tiangolo.com/
-[pydantic.com]: https://img.shields.io/badge/Pydantic-2.12.0a1-e92063?style=for-the-badge&logo=pydantic&logoColor=white
+[pydantic.com]: https://img.shields.io/badge/Pydantic-2.12.4-e92063?style=for-the-badge&logo=pydantic&logoColor=white
 [pydantic-url]: https://docs.pydantic.dev/latest/
-[sqlalchemy.org]: https://img.shields.io/badge/SQLAlchemy-2.0.43-bb0000?color=bb0000&style=for-the-badge
+[sqlalchemy.org]: https://img.shields.io/badge/SQLAlchemy-2.0.44-bb0000?color=bb0000&style=for-the-badge&logo=python&logoColor=white
 [sqlalchemy-url]: https://docs.sqlalchemy.org/en/20/
-[uvicorn.org]: https://img.shields.io/badge/Uvicorn-0.35.0-2094f3?style=for-the-badge&logo=uvicorn&logoColor=white
+[uvicorn.org]: https://img.shields.io/badge/Uvicorn-0.38.0-2094f3?style=for-the-badge&logo=python&logoColor=white
 [uvicorn-url]: https://www.uvicorn.org/
 [asyncpg.github.io]: https://img.shields.io/badge/asyncpg-0.30.0-2e6fce?style=for-the-badge&logo=postgresql&logoColor=white
 [asyncpg-url]: https://magicstack.github.io/asyncpg/current/
-[pytest.org]: https://img.shields.io/badge/pytest-8.4.1-fff?style=for-the-badge&logo=pytest&logoColor=white
-[pytest-url]: https://docs.pytest.org/en/6.2.x/
-[alembic.sqlalchemy.org]: https://img.shields.io/badge/alembic-1.16.4-6BA81E?style=for-the-badge&logo=alembic&logoColor=white
+[pytest.org]: https://img.shields.io/badge/pytest-9.0.1-fff?style=for-the-badge&logo=pytest&logoColor=white
+[pytest-url]: https://docs.pytest.org/en/9.0.x/
+[alembic.sqlalchemy.org]: https://img.shields.io/badge/alembic-1.17.2-6BA81E?style=for-the-badge&logo=python&logoColor=white
 [alembic-url]: https://alembic.sqlalchemy.org/en/latest/
-[rich.readthedocs.io]: https://img.shields.io/badge/rich-14.1.0-009485?style=for-the-badge&logo=rich&logoColor=white
+[rich.readthedocs.io]: https://img.shields.io/badge/rich-14.2.0-009485?style=for-the-badge&logo=rich&logoColor=white
 [rich-url]: https://rich.readthedocs.io/en/latest/
-[redis.io]: https://img.shields.io/badge/redis-6.4.0-dc382d?style=for-the-badge&logo=redis&logoColor=white
+[redis.io]: https://img.shields.io/badge/redis-7.0.1-dc382d?style=for-the-badge&logo=redis&logoColor=white
 [redis-url]: https://redis.io/
+[structlog.org]: https://img.shields.io/badge/structlog-25.5.0-000000?style=for-the-badge&logo=python&logoColor=white
+[structlog-url]: https://www.structlog.org/en/stable/
+[rotoger]: https://img.shields.io/badge/rotoger-0.2.1-00bfff?style=for-the-badge&logo=python&logoColor=white
+[rotoger-url]: https://github.com/tinyplugins/rotoger
+[granian]: https://img.shields.io/badge/granian-2.5.7-4f6cb4?style=for-the-badge&logo=rust&logoColor=white
+[granian-url]:  https://github.com/emmett-framework/granian

app/api/health.py

@@ -12,8 +12,6 @@
 router = APIRouter()
 
 
-
-
 @router.get("/redis", status_code=status.HTTP_200_OK)
 async def redis_check(request: Request):
     """

app/main.py

@@ -47,7 +47,7 @@ async def lifespan(app: FastAPI):
 def create_app() -> FastAPI:
     app = FastAPI(
         title="Stuff And Nonsense API",
-        version="0.20.0",
+        version="1.22.0",
         lifespan=lifespan,
     )
     app.include_router(stuff_router)

app/models/shakespeare.py

@@ -46,10 +46,10 @@ class Character(Base):
     abbrev: Mapped[str | None] = mapped_column(String(32))
     description: Mapped[str | None] = mapped_column(String(2056))
 
-    work: Mapped[list["Work"]] = relationship(
+    work: Mapped[list[Work]] = relationship(
         "Work", secondary="shakespeare.character_work", back_populates="character"
     )
-    paragraph: Mapped[list["Paragraph"]] = relationship(
+    paragraph: Mapped[list[Paragraph]] = relationship(
         "Paragraph", back_populates="character"
     )
 
@@ -122,11 +122,11 @@ class Work(Base):
     total_paragraphs: Mapped[int] = mapped_column(Integer)
     notes: Mapped[str | None] = mapped_column(Text)
 
-    character: Mapped[list["Character"]] = relationship(
+    character: Mapped[list[Character]] = relationship(
         "Character", secondary="shakespeare.character_work", back_populates="work"
     )
-    chapter: Mapped[list["Chapter"]] = relationship("Chapter", back_populates="work")
-    paragraph: Mapped[list["Paragraph"]] = relationship(
+    chapter: Mapped[list[Chapter]] = relationship("Chapter", back_populates="work")
+    paragraph: Mapped[list[Paragraph]] = relationship(
         "Paragraph", back_populates="work"
     )
 
@@ -170,8 +170,8 @@ class Chapter(Base):
     chapter_number: Mapped[int] = mapped_column(Integer)
     description: Mapped[str] = mapped_column(String(256))
 
-    work: Mapped["Work"] = relationship("Work", back_populates="chapter")
-    paragraph: Mapped[list["Paragraph"]] = relationship(
+    work: Mapped[Work] = relationship("Work", back_populates="chapter")
+    paragraph: Mapped[list[Paragraph]] = relationship(
         "Paragraph", back_populates="chapter"
     )
 
@@ -259,11 +259,9 @@ class Paragraph(Base):
     char_count: Mapped[int] = mapped_column(Integer)
     word_count: Mapped[int] = mapped_column(Integer)
 
-    character: Mapped["Character"] = relationship(
-        "Character", back_populates="paragraph"
-    )
-    chapter: Mapped["Chapter"] = relationship("Chapter", back_populates="paragraph")
-    work: Mapped["Work"] = relationship("Work", back_populates="paragraph")
+    character: Mapped[Character] = relationship("Character", back_populates="paragraph")
+    chapter: Mapped[Chapter] = relationship("Chapter", back_populates="paragraph")
+    work: Mapped[Work] = relationship("Work", back_populates="paragraph")
 
     @classmethod
     async def find(cls, db_session: AsyncSession, character: str):

app/models/stuff.py

@@ -29,7 +29,7 @@ class Stuff(Base):
     name: Mapped[str] = mapped_column(String, primary_key=True, unique=True)
     description: Mapped[str | None]
 
-    nonsense: Mapped["Nonsense"] = relationship(
+    nonsense: Mapped[Nonsense] = relationship(
         "Nonsense", secondary="happy_hog.stuff_full_of_nonsense"
     )
 
@@ -47,7 +47,7 @@ class StuffFullOfNonsense(Base):
         UUID(as_uuid=True), default=uuid.uuid4, primary_key=True
     )
     stuff_id: Mapped[Stuff] = mapped_column(UUID, ForeignKey("happy_hog.stuff.id"))
-    nonsense_id: Mapped["Nonsense"] = mapped_column(
+    nonsense_id: Mapped[Nonsense] = mapped_column(
         UUID, ForeignKey("happy_hog.nonsense.id")
     )
     but_why: Mapped[str | None]

app/schemas/shakespeare.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from pydantic import BaseModel

pyproject.toml

@@ -1,47 +1,44 @@
 [project]
 name = "fastapi-sqlalchemy-asyncpg"
-version = "0.22.0"
+version = "1.22.0"
 description = "A modern FastAPI application with SQLAlchemy 2.0 and AsyncPG for high-performance async database operations. Features include JWT authentication with Redis token storage, password hashing, connection pooling, data processing with Polars, Rich logging, task scheduling with APScheduler, and Shakespeare datasets integration."
 readme = "README.md"
-requires-python = ">=3.14"
+requires-python = "==3.14.0"
 dependencies = [
-    "fastapi[all]>=0.116.2",
-    "pydantic[email]>=2.12.0a1",
-    "pydantic-settings>=2.10.1",
+    "fastapi[all]==0.121.2",
+    "pydantic[email]==2.12.4",
+    "pydantic-settings==2.12.0",
     "sqlalchemy==2.0.44",
-    "uvicorn==0.38.0",
-    "asyncpg>=0.30.0",
-    "alembic>=1.16.5",
-    "httpx>=0.28.1",
-    "pytest>=8.4.2",
-    "pytest-cov>=7.0.0",
-    "uvloop>=0.21.0",
-    "httptools>=0.6.4",
-    "rich>=14.1.0",
-    "pyjwt>=2.10.1",
-    "redis>=6.4.0",
-    "bcrypt>=4.3.0",
-    "polars==1.35.2",
-    "python-multipart>=0.0.20",
-    "fastexcel>=0.15.1",
-    "inline-snapshot>=0.29.0",
-    "dirty-equals>=0.10.0",
-    "polyfactory>=2.22.2",
-    "granian>=2.5.4",
+    "uvicorn[standard]==0.38.0",
+    "asyncpg==0.30.0",
+    "alembic==1.17.2",
+    "httpx==0.28.1",
+    "pytest==9.0.1",
+    "pytest-cov==7.0.0",
+    "uvloop==0.22.1",
+    "httptools==0.7.1",
+    "rich==14.2.0",
+    "pyjwt==2.10.1",
+    "redis==7.0.1",
+    "bcrypt==5.0.0",
+    "polars[pyarrow]==1.35.2",
+    "python-multipart==0.0.20",
+    "fastexcel==0.16.0",
+    "inline-snapshot==0.31.1",
+    "dirty-equals==0.10.0",
+    "polyfactory==3.0.0",
+    "granian==2.5.7",
     "apscheduler[redis,sqlalchemy]>=4.0.0a6",
     "rotoger==0.2.1",
 ]
 
 [tool.uv]
 dev-dependencies = [
-    "ruff>=0.13.1",
-    "devtools[pygments]>=0.12.2",
-    "pyupgrade>=3.20.0",
-    "ipython>=9.5.0",
-    "sqlacodegen<=3.1.1",
-    "tryceratops>=2.4.1",
-    "locust>=2.40.5",
-    "sqlalchemy-utils>=0.41.1"
+    "ruff==0.14.5",
+    "devtools[pygments]==0.12.2",
+    "pyupgrade==3.21.1",
+    "ipython==9.7.0",
+    "tryceratops==2.4.1",
 ]
 
 
@@ -50,7 +47,7 @@ strict = true
 exclude = ["venv", ".venv", "alembic"]
 
 [tool.ruff]
-target-version = "py313"
+target-version = "py314"
 exclude = ["alembic"]
 
 [tool.ruff.lint]