From f1e563927e690ccc78698b4c189d6cbc46a17bf4 Mon Sep 17 00:00:00 2001 From: jsdio Date: Wed, 20 Sep 2023 14:14:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fastapi_app/lib/app/app.py | 2 -- src/fastapi_app/lib/app/settings.py | 10 +++++----- src/fastapi_app/poetry.lock | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/fastapi_app/lib/app/app.py b/src/fastapi_app/lib/app/app.py index e48026e..af2c2b6 100644 --- a/src/fastapi_app/lib/app/app.py +++ b/src/fastapi_app/lib/app/app.py @@ -3,8 +3,6 @@ import logging.config as logging_config import fastapi -import lib.api.v1.handlers as api_handlers - from .logger import LOGGING from .settings import get_settings diff --git a/src/fastapi_app/lib/app/settings.py b/src/fastapi_app/lib/app/settings.py index dc91b87..207bdf1 100644 --- a/src/fastapi_app/lib/app/settings.py +++ b/src/fastapi_app/lib/app/settings.py @@ -1,7 +1,7 @@ import functools +import pydantic import pydantic_settings -from pydantic import Field, field_validator class DbSettings(pydantic_settings.BaseSettings): @@ -23,12 +23,12 @@ class ApiSettings(pydantic_settings.BaseSettings): class Settings(pydantic_settings.BaseSettings): debug: str = "false" - db: DbSettings = Field(default_factory=DbSettings) - api: ApiSettings = Field(default_factory=ApiSettings) + db: DbSettings = pydantic.Field(default_factory=lambda: DbSettings()) + api: ApiSettings = pydantic.Field(default_factory=lambda: ApiSettings()) - jwt_secret_key: str + jwt_secret_key: str = pydantic.Field(default=...) - @field_validator("debug") + @pydantic.field_validator("debug") @classmethod def validate_debug(cls, v: str) -> bool: return v.lower() == "true" diff --git a/src/fastapi_app/poetry.lock b/src/fastapi_app/poetry.lock index 24ea8bb..45fff5c 100644 --- a/src/fastapi_app/poetry.lock +++ b/src/fastapi_app/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "alembic" @@ -1092,7 +1092,7 @@ files = [ ] [package.dependencies] -greenlet = {version = "!=0.4.17", markers = "platform_machine == \"win32\" or platform_machine == \"WIN32\" or platform_machine == \"AMD64\" or platform_machine == \"amd64\" or platform_machine == \"x86_64\" or platform_machine == \"ppc64le\" or platform_machine == \"aarch64\""} +greenlet = {version = "!=0.4.17", markers = "platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\""} typing-extensions = ">=4.2.0" [package.extras]