Project update

README.md

@@ -13,6 +13,13 @@ $ docker-compose up -d --build
 $ docker-compose exec web alembic upgrade head
 ```
 
+## Want to make a migration?
+
+```sh
+$ docker-compose exec web alembic revision --autogenerate
+$ docker-compose exec web alembic upgrade head
+```
+
 Sanity check: [http://localhost:8004/ping](http://localhost:8004/ping)
 
 Add a song:

docker-compose.yml

@@ -10,7 +10,11 @@ services:
     ports:
       - 8004:8000
     environment:
-      - DATABASE_URL=postgresql+asyncpg://postgres:postgres@db:5432/foo
+      - DATABASE_HOST=db
+      - DATABASE_USER=postgres
+      - DATABASE_PASSWORD=postgres
+      - DATABASE_NAME=foo
+      - DATABASE_PORT=5432
     depends_on:
       - db
 

project/app/db.py

@@ -1,15 +1,11 @@
-import os
-
-from sqlmodel import SQLModel
-
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
+from sqlmodel import SQLModel, create_engine
 from sqlalchemy.orm import sessionmaker
+from sqlmodel.ext.asyncio.session import AsyncSession, AsyncEngine
+from app.settings import Settings
 
+settings = Settings()
 
-DATABASE_URL = os.environ.get("DATABASE_URL")
-
-engine = create_async_engine(DATABASE_URL, echo=True, future=True)
-
+engine = AsyncEngine(create_engine(settings.ASYNC_DATABASE_URI, echo=True, future=True))
 
 async def init_db():
     async with engine.begin() as conn:

project/app/main.py

@@ -1,6 +1,6 @@
 from fastapi import Depends, FastAPI
-from sqlalchemy.future import select
-from sqlalchemy.ext.asyncio import AsyncSession
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
 
 from app.db import get_session
 from app.models import Song, SongCreate

project/app/models.py

@@ -10,7 +10,7 @@ class SongBase(SQLModel):
 
 
 class Song(SongBase, table=True):
-    id: int = Field(default=None, primary_key=True)
+    id: int = Field(default=None, nullable=False, primary_key=True)
 
 
 class SongCreate(SongBase):

project/app/settings.py

@@ -0,0 +1,30 @@
+import os
+from pydantic import BaseSettings, PostgresDsn, validator
+from typing import Optional, Dict, Any, Union
+
+class Settings(BaseSettings):    
+    DATABASE_USER: str = os.environ.get("DATABASE_USER")
+    DATABASE_PASSWORD: str = os.environ.get("DATABASE_PASSWORD")
+    DATABASE_HOST: str = os.environ.get("DATABASE_HOST")
+    DATABASE_PORT: Union[int, str] = os.environ.get("DATABASE_PORT")
+    DATABASE_NAME: str = os.environ.get("DATABASE_NAME")
+    ASYNC_DATABASE_URI: Optional[
+        Any
+    ] = f"postgresql+asyncpg://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+
+    @validator("ASYNC_DATABASE_URI", pre=True)
+    def assemble_db_connection(cls, v: Optional[str], values: Dict[str, Any]) -> Any:
+        if isinstance(v, str):
+            return v
+        return PostgresDsn.build(
+            scheme="postgresql+asyncpg",
+            user=values.get("DATABASE_USER"),
+            password=values.get("DATABASE_PASSWORD"),
+            host=values.get("DATABASE_HOST"),
+            port=values.get("DATABASE_PORT"),
+            path=f"/{values.get('DATABASE_NAME') or ''}",
+        )
+
+    class Config:
+        case_sensitive = True
+        env_file = os.path.expanduser("~/.env")

project/migrations/env.py

@@ -1,15 +1,16 @@
 import asyncio
 from logging.config import fileConfig
 
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-from sqlalchemy.ext.asyncio import AsyncEngine
-from sqlmodel import SQLModel
+from sqlmodel import SQLModel, create_engine
+from sqlmodel.ext.asyncio.session import AsyncEngine
 
 from alembic import context
 
-from app.models import Song
+from app.models import Song # All models that needs to be migrated should be added
+from app.settings import Settings
 
+
+settings = Settings()
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
@@ -41,8 +42,8 @@ def run_migrations_offline():
     Calls to context.execute() here emit the given string to the
     script output.
 
-    """
-    url = config.get_main_option("sqlalchemy.url")
+    """    
+    url = settings.ASYNC_DATABASE_URI
     context.configure(
         url=url,
         target_metadata=target_metadata,
@@ -68,14 +69,7 @@ async def run_migrations_online():
     and associate a connection with the context.
 
     """
-    connectable = AsyncEngine(
-        engine_from_config(
-            config.get_section(config.config_ini_section),
-            prefix="sqlalchemy.",
-            poolclass=pool.NullPool,
-            future=True,
-        )
-    )
+    connectable = AsyncEngine(create_engine(settings.ASYNC_DATABASE_URI, echo=True, future=True))
 
     async with connectable.connect() as connection:
         await connection.run_sync(do_run_migrations)