feat: scope Session dependency to function (#28)

Author: hadrien

.github/workflows/ci.yml

@@ -4,32 +4,31 @@ on:
   push:
 
 jobs:
-
   Tests:
     strategy:
       matrix:
-        tox_env: [default, sqlmodel]
+        tox_env: [fastapi-pre121, fastapi-post121, sqlmodel]
     runs-on: ubuntu-latest
     steps:
-    - name: 📥 checkout
-      uses: actions/checkout@v4
-    - name: 🔧 setup tox-uv
-      uses: ./.github/tox-uv
-    - name: 🧪 tox -e ${{ matrix.tox_env }}
-      run: uv run tox -e ${{ matrix.tox_env }}
-    - name:  "🐔 codecov: upload test coverage"
-      uses: codecov/codecov-action@v4.2.0
-      with:
-        flags: ${{ matrix.tox_env }}
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: 📥 checkout
+        uses: actions/checkout@v4
+      - name: 🔧 setup tox-uv
+        uses: ./.github/tox-uv
+      - name: 🧪 tox -e ${{ matrix.tox_env }}
+        run: uv run tox -e ${{ matrix.tox_env }}
+      - name: "🐔 codecov: upload test coverage"
+        uses: codecov/codecov-action@v4.2.0
+        with:
+          flags: ${{ matrix.tox_env }}
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   Ruff:
     runs-on: ubuntu-latest
     steps:
-    - name: 📥 checkout
-      uses: actions/checkout@v4
-    - name: 🔧 setup uv
-      uses: ./.github/uv
-    - name: 🐶 ruff
-      run: uv run ruff check
+      - name: 📥 checkout
+        uses: actions/checkout@v4
+      - name: 🔧 setup uv
+        uses: ./.github/uv
+      - name: 🐶 ruff
+        run: uv run ruff check

pyproject.toml

@@ -70,6 +70,7 @@ dev = [
     "aiosqlite>=0.20.0",
     "python-semantic-release>=9.8.8",
     "twine>=5.1.1",
+    "pdbpp>=0.11.7",
 ]
 
 [tool.uv.sources]
@@ -100,15 +101,26 @@ mode = "init"
 changelog_file = "./docs/changelog.md"
 
 [tool.tox]
-legacy_tox_ini = """
-[tox]
-envlist = { default, sqlmodel }
-
-[testenv]
-passenv = CI
-runner = uv-venv-lock-runner
-commands =
-    pytest --cov fastsqla --cov-report=term-missing --cov-report=xml
-extras:
-    sqlmodel: sqlmodel
-"""
+envlist = ["sqlmodel", "fastapi-pre121", "fastapi-post121"]
+
+[tool.tox.env_run_base]
+runner = "uv-venv-runner"
+commands = [
+    [
+        "pytest",
+        "--cov",
+        "fastsqla",
+        "--cov-report=term-missing",
+        "--cov-report=xml",
+    ],
+]
+allowlist_externals = ["pytest", "pip"]
+
+[tool.tox.env.sqlmodel]
+extras = ["sqlmodel"]
+
+[tool.tox.env.fastapi-pre121]
+commands_pre = [["pip", "install", "-U", "fastapi<0.121"]]
+
+[tool.tox.env.fastapi-post121]
+commands_pre = [["pip", "install", "-U", "fastapi>=0.121"]]

src/fastsqla.py

@@ -4,7 +4,8 @@
 from contextlib import _AsyncGeneratorContextManager, asynccontextmanager
 from typing import Annotated, Generic, TypeVar, TypedDict
 
-from fastapi import Depends, FastAPI, Query
+from fastapi import Depends as BaseDepends
+from fastapi import FastAPI, Query
 from pydantic import BaseModel, Field
 from sqlalchemy import Result, Select, func, select
 from sqlalchemy.ext.asyncio import (
@@ -44,6 +45,15 @@
 logger = get_logger(__name__)
 
 
+def Depends(*args, **kwargs):
+    "Allow backward compatibility with fastapi<0.121"
+    try:
+        return BaseDepends(*args, **kwargs)
+    except TypeError:
+        kwargs.pop("scope")
+        return BaseDepends(*args, **kwargs)
+
+
 class Base(DeclarativeBase, DeferredReflection):
     """Inherit from `Base` to declare an `SQLAlchemy` model.
 
@@ -252,7 +262,7 @@ async def new_session() -> AsyncGenerator[AsyncSession, None]:
         yield session
 
 
-Session = Annotated[AsyncSession, Depends(new_session)]
+Session = Annotated[AsyncSession, Depends(new_session, scope="function")]
 """Dependency used exclusively in endpoints to get an `SQLAlchemy` or `SQLModel` session.
 
 `Session` is a [`FastAPI` dependency](https://fastapi.tiangolo.com/tutorial/dependencies/)