eden/test-litestar-addressbook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove settings deprecations

Browse Source
This commit is contained in:
Eden Kirin
2023-09-21 09:18:22 +02:00
parent ec306b38fe
commit 400e4d393e
4 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.template
View File

@ -50,10 +50,6 @@ EMAIL_RECIPIENT=someone@somewhere.com
EMAIL_SENDER=root@localhost EMAIL_SENDER=root@localhost
# Tests # Tests
TESTS_DB_HOST=localhost
TESTS_DB_PORT=5432
TESTS_DB_NAME=test_db-name
TESTS_DB_USER=db-user
TESTS_DB_PASSWORD=db-password TESTS_DB_PASSWORD=db-password
TESTS_DROP_DATABASE_BEFORE_TESTS=True TESTS_DROP_DATABASE_BEFORE_TESTS=True
TESTS_DROP_DATABASE_AFTER_TESTS=True TESTS_DROP_DATABASE_AFTER_TESTS=True

34
app/lib/settings.py
View File

@ -15,22 +15,16 @@ __all__ = [
"ServerSettings", "ServerSettings",
] ]
from pydantic import Extra from pydantic_settings import BaseSettings, SettingsConfigDict
from pydantic_settings import BaseSettings
from const import ROOT_DIR from const import ROOT_DIR
class BaseEnvSettings(BaseSettings): class BaseEnvSettings(BaseSettings):
class Config: model_config = SettingsConfigDict(case_sensitive=True, extra="ignore", env_file_encoding="utf-8")
env_file_encoding = "utf-8"
extra = Extra.ignore
class AppSettings(BaseEnvSettings): class AppSettings(BaseEnvSettings):
class Config:
case_sensitive = True
BUILD_NUMBER: str = "0" BUILD_NUMBER: str = "0"
DEBUG: bool = False DEBUG: bool = False
ENVIRONMENT: str = "local" ENVIRONMENT: str = "local"
@ -43,9 +37,7 @@ class AppSettings(BaseEnvSettings):
class APISettings(BaseEnvSettings): class APISettings(BaseEnvSettings):
class Config: model_config = SettingsConfigDict(env_prefix="API_")
env_prefix = "API_"
case_sensitive = True
CACHE_EXPIRATION: int = 60 CACHE_EXPIRATION: int = 60
DB_SESSION_DEPENDENCY_KEY: str = "db_session" DB_SESSION_DEPENDENCY_KEY: str = "db_session"
@ -57,9 +49,7 @@ class APISettings(BaseEnvSettings):
class OpenAPISettings(BaseEnvSettings): class OpenAPISettings(BaseEnvSettings):
class Config: model_config = SettingsConfigDict(env_prefix="OPENAPI_")
env_prefix = "OPENAPI_"
case_sensitive = True
TITLE: Optional[str] = "My Litestar App" TITLE: Optional[str] = "My Litestar App"
VERSION: str = "0.1.0" VERSION: str = "0.1.0"
@ -68,9 +58,7 @@ class OpenAPISettings(BaseEnvSettings):
class DatabaseSettings(BaseEnvSettings): class DatabaseSettings(BaseEnvSettings):
class Config: model_config = SettingsConfigDict(env_prefix="DB_")
env_prefix = "DB_"
case_sensitive = True
ECHO: bool = False ECHO: bool = False
ECHO_POOL: Union[bool, Literal["debug"]] = False ECHO_POOL: Union[bool, Literal["debug"]] = False
@ -87,9 +75,7 @@ class DatabaseSettings(BaseEnvSettings):
class TestingSettings(BaseEnvSettings): class TestingSettings(BaseEnvSettings):
class Config: model_config = SettingsConfigDict(env_prefix="TESTS_")
env_prefix = "TESTS_"
case_sensitive = True
DB_TEMPLATE_NAME: str = "db-template-name" DB_TEMPLATE_NAME: str = "db-template-name"
DROP_DATABASE_BEFORE_TESTS: bool = True DROP_DATABASE_BEFORE_TESTS: bool = True
@ -97,9 +83,7 @@ class TestingSettings(BaseEnvSettings):
class ServerSettings(BaseEnvSettings): class ServerSettings(BaseEnvSettings):
class Config: model_config = SettingsConfigDict(env_prefix="UVICORN_")
env_prefix = "UVICORN_"
case_sensitive = True
HOST: str = "localhost" HOST: str = "localhost"
LOG_LEVEL: str = "info" LOG_LEVEL: str = "info"
@ -109,9 +93,7 @@ class ServerSettings(BaseEnvSettings):
class EmailSettings(BaseEnvSettings): class EmailSettings(BaseEnvSettings):
class Config: model_config = SettingsConfigDict(env_prefix="EMAIL_")
env_prefix = "EMAIL_"
case_sensitive = True
if "pytest" in sys.modules: if "pytest" in sys.modules:

2
main.py
View File

@ -32,7 +32,7 @@ app = create_app()
if __name__ == "__main__": if __name__ == "__main__":
uvicorn.run( uvicorn.run(
app, app="main:app",
host=settings.server.HOST, host=settings.server.HOST,
log_level=settings.server.LOG_LEVEL, log_level=settings.server.LOG_LEVEL,
port=settings.server.PORT, port=settings.server.PORT,

11
settings_test.py
View File

@ -1,11 +0,0 @@
import logging
POSTGRES_HOST: str = "localhost"
POSTGRES_PORT: int = 5432
POSTGRES_TEST_USER = "addressbook"
POSTGRES_TEST_PASSWORD = "addressbook"
LOG_PATH = "/tmp/addressbook-log"
MIN_LOG_LEVEL: int = logging.INFO
DROP_TEMPLATE_DATABASE_BEFORE_TESTS: bool = False
FLYWAY_BINARY_PATH: str = "/usr/bin/flyway"