diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..83d4141 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +services: + pg: + image: postgres + environment: + POSTGRES_DB: sipi + POSTGRES_USER: sys.sipidb + POSTGRES_PASSWORD: password + ports: + - "5432:5432" diff --git a/sipi-app/.env-template b/sipi-app/.env-template new file mode 100644 index 0000000..78846ae --- /dev/null +++ b/sipi-app/.env-template @@ -0,0 +1,2 @@ +SIPI_CONFIG__DB__URL=postgresql+asyncpg://username:password@localhost:5432/dbname +SIPI_CONFIG__DB__ECHO=0 \ No newline at end of file diff --git a/sipi-app/core/config.py b/sipi-app/core/config.py index ec244eb..d9cd3e6 100644 --- a/sipi-app/core/config.py +++ b/sipi-app/core/config.py @@ -25,20 +25,13 @@ class DatabaseConfig(BaseModel): pool_size: int = 50 max_overflow: int = 10 - naming_convention: dict[str, str] = { - "ix": "ix_%(column_0_label)s", - "uq": "uq_%(table_name)s_%(column_0_N_name)s", - "ck": "ck_%(table_name)s_%(constraint_name)s", - "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", - "pk": "pk_%(table_name)s", - } class Settings(BaseSettings): model_config = SettingsConfigDict( - env_file=(".env.template", ".env"), + env_file=('.env-template', '.env'), case_sensitive=False, - env_nested_delimiter="__", - env_prefix="APP_CONFIG__", + env_nested_delimiter='__', + env_prefix='SIPI_CONFIG__', ) run: RunConfig = RunConfig() api: ApiPrefix = ApiPrefix() @@ -46,3 +39,4 @@ class Settings(BaseSettings): settings = Settings() + diff --git a/sipi-app/main.py b/sipi-app/main.py index 654ba72..b677f2c 100644 --- a/sipi-app/main.py +++ b/sipi-app/main.py @@ -10,10 +10,7 @@ from fastapi import FastAPI @asynccontextmanager async def lifespan(app: FastAPI): - #startap yield - #shutdown - print('dispose engine') await db_helper.dispose() main_app = FastAPI(