feat: add database schema support and update dependencies

Author: getmarkus

.trunk/trunk.yaml

@@ -17,16 +17,16 @@ runtimes:
 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
 lint:
   disabled:
-    - git-diff-check
     - bandit
+    - git-diff-check
   enabled:
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].368
+    - [email protected].369
     - [email protected]
     - [email protected]
-    - prettier@3.4.2
+    - prettier@3.5.0
     - [email protected]
     - [email protected]
     - [email protected]

README.md

@@ -1,15 +1,20 @@
+# my personal python template playground
+
 Simple python template I am experimenting with around a set of overlapping concepts with a Fastapi implementation:
-* DDD
-* Clean architecture
-* Ports/Adapters
-* Vertical slice
 
-``` bash
-dotenv run fastapi dev main.py
-dotenv run pytest
+- DDD
+- Clean architecture
+- Ports/Adapters
+- Vertical slice
+
+```bash
+uv run fastapi dev main.py
+uv run pytest
+
+atlas schema inspect -u "sqlite://issues.db" --format "{{ sql . }}" > migrate.sql
 ```
 
-``` mermaid
+```mermaid
 graph TD;
     analyze_endpoint["/issues/{issue_number}/analyze (POST)"] -->|Depends| configure_repository
     analyze_endpoint -->|Depends| configure_unit_of_work
@@ -35,4 +40,4 @@ graph TD;
     UnitOfWork_rollback -.-> UnitOfWorkProtocol
     UnitOfWork_enter -.-> UnitOfWorkProtocol
     UnitOfWork_exit -.-> UnitOfWorkProtocol
-```
+```

app/domain/aggregate_root.py

@@ -4,6 +4,8 @@
 
 from sqlmodel import SQLModel
 
+from config import settings
+
 
 class BaseCommand(Protocol):
     command_id: str
@@ -19,6 +21,9 @@ class BaseEvent(Protocol):
 
 
 class AggregateRoot(SQLModel, abc.ABC):
+    # This sets the database schema in which to create tables for all subclasses of BaseModel
+    # __tablename__ = "sometable"
+    __table_args__ = {"schema": settings.database_schema}
     version: int = 0
 
     # or handle()

app/resource_adapters/persistence/sqlmodel/database.py

@@ -38,7 +38,7 @@ def get_engine(database_url: str | None = None) -> Engine:
     _engine = create_engine(database_url, **engine_args)
 
     # Enable WAL mode if configured
-    if settings.sqlite_wal_mode and database_url.startswith("sqlite"):
+    if settings.sqlite_wal_mode:
         with _engine.connect() as conn:
             # https://www.sqlite.org/pragma.html
             conn.execute(text("PRAGMA journal_mode=WAL"))
@@ -48,6 +48,14 @@ def get_engine(database_url: str | None = None) -> Engine:
     # Initialize database if using SQLModel
     if settings.model_config == "sqlmodel" and not settings.migrate_database:
         logger.info("Creating database tables...")
+
+        if settings.database_schema:
+            SQLModel.metadata.schema = settings.database_schema
+            # if not conn.dialect.has_schema(conn, db_schema):
+            # logger.warning(f"Schema '{db_schema}' not found in database. Creating...")
+            # conn.execute(sa.schema.CreateSchema(db_schema))
+            # conn.commit()
+
         SQLModel.metadata.create_all(_engine)
         logger.info("Database tables created successfully")
 

app/tests/conftest.py

@@ -49,8 +49,7 @@ async def test_lifespan(app: FastAPI):
 app = create_app(lifespan_handler=test_lifespan)
 
 
-@pytest.fixture(name="session", autouse=True)
-@pytest.mark.env("testing")
+@pytest.fixture(name="session")
 def test_session():
     """Session fixture for testing environment using test database."""
     with Session(get_engine()) as session:
@@ -60,16 +59,6 @@ def test_session():
         session.commit()
 
 
-@pytest.fixture(name="session", autouse=True)
-@pytest.mark.env("development")
-def dev_session():
-    """Session fixture for development environment."""
-    with Session(get_engine()) as session:
-        yield session
-        # In development, we might want to keep the data
-        # or handle cleanup differently
-
-
 @pytest.fixture(name="client")
 def client_fixture():
     with TestClient(app) as client:

pyproject.toml

@@ -6,6 +6,7 @@ authors = [{ name = "Chris Markus", email = "[email protected]" }]
 requires-python = "~=3.12"
 readme = "README.md"
 dependencies = [
+  "atlas-provider-sqlalchemy>=0.2.4",
   "dependency-injector>=4.45.0",
   "dynaconf>=3.2.7",
   "fastapi[standard]>=0.115.6",

settings.test.toml

@@ -2,12 +2,13 @@
 [default]
 # sqlite:///./test.db sqlite://
 database_url = "sqlite://"
+database_schema = ""
 # in-memory, sqlmodel
 model_config = "sqlmodel"
-env_smoke_test = "configured"
-backend_cors_origins = ["http://testserver"]
 migrate_database = false
 sqlite_wal_mode = false
+env_smoke_test = "configured"
+backend_cors_origins = ["http://testserver"]
 
 # You can still use environment-specific overrides in test settings
 [development]

settings.toml

@@ -1,11 +1,13 @@
 [default]
 project_name = "python-template"
+# dialect+driver://username:password@host:port/database
 database_url = "sqlite:///./issues.db"
+database_schema = ""
 migrate_database = false
+sqlite_wal_mode = false
 # in-memory, sqlmodel
 model_config = "sqlmodel"
 env_smoke_test = ""
-sqlite_wal_mode = false
 
 # CORS Settings
 backend_cors_origins = []