Try instantiating in config again

Author: StephenBrown2

{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/endpoints/login.py

@@ -7,7 +7,7 @@
 from app import crud
 from app.api.utils.db import get_db
 from app.api.utils.security import get_current_user
-from app.core.config import Settings
+from app.core.config import settings
 from app.core.jwt import create_access_token
 from app.core.security import get_password_hash
 from app.models.user import User as DBUser
@@ -20,7 +20,6 @@
     verify_password_reset_token,
 )
 
-settings = Settings()
 router = APIRouter()
 
 

{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/endpoints/users.py

@@ -8,12 +8,11 @@
 from app import crud
 from app.api.utils.db import get_db
 from app.api.utils.security import get_current_active_superuser, get_current_active_user
-from app.core.config import Settings
+from app.core.config import settings
 from app.models.user import User as DBUser
 from app.schemas.user import User, UserCreate, UserUpdate
 from app.utils import send_new_account_email
 
-settings = Settings()
 router = APIRouter()
 
 

{{cookiecutter.project_slug}}/backend/app/app/api/utils/security.py

@@ -7,12 +7,11 @@
 
 from app import crud
 from app.api.utils.db import get_db
-from app.core.config import Settings
+from app.core.config import settings
 from app.core.jwt import ALGORITHM
 from app.models.user import User
 from app.schemas.token import TokenPayload
 
-settings = Settings()
 reusable_oauth2 = OAuth2PasswordBearer(tokenUrl=f"{settings.API_V1_STR}/login/access-token")
 
 

{{cookiecutter.project_slug}}/backend/app/app/core/config.py

@@ -88,3 +88,5 @@ def get_emails_enabled(cls, v, values):
 
     class Config:
         case_sensitive = True
+
+settings = Settings()

{{cookiecutter.project_slug}}/backend/app/app/core/jwt.py

@@ -2,9 +2,8 @@
 
 import jwt
 
-from app.core.config import Settings
+from app.core.config import settings
 
-settings = Settings()
 ALGORITHM = "HS256"
 access_token_jwt_subject = "access"
 

{{cookiecutter.project_slug}}/backend/app/app/db/init_db.py

@@ -1,14 +1,12 @@
 from app import crud
-from app.core.config import Settings
+from app.core.config import settings
 from app.schemas.user import UserCreate
 
 # make sure all SQL Alchemy models are imported before initializing DB
 # otherwise, SQL Alchemy might fail to initialize properly relationships
 # for more details: https://github.com./tiangolo/full-stack-fastapi-postgresql/issues/28
 from app.db import base
 
-settings = Settings()
-
 def init_db(db_session):
     # Tables should be created with Alembic migrations
     # But if you don't want to use migrations, create

{{cookiecutter.project_slug}}/backend/app/app/db/session.py

@@ -1,9 +1,8 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-from app.core.config import Settings
+from app.core.config import settings
 
-settings = Settings()
 engine = create_engine(settings.SQLALCHEMY_DATABASE_URI, pool_pre_ping=True)
 db_session = scoped_session(
     sessionmaker(autocommit=False, autoflush=False, bind=engine)

{{cookiecutter.project_slug}}/backend/app/app/main.py

@@ -3,11 +3,9 @@
 from starlette.requests import Request
 
 from app.api.api_v1.api import api_router
-from app.core.config import Settings
+from app.core.config import settings
 from app.db.session import Session
 
-settings = Settings()
-
 app = FastAPI(title=settings.PROJECT_NAME, openapi_url=f"{settings.API_V1_STR}/openapi.json")
 
 # Set all CORS enabled origins

{{cookiecutter.project_slug}}/backend/app/app/tests/api/api_v1/test_celery.py

@@ -1,11 +1,10 @@
 import requests
 
-from app.core.config import Settings
+from app.core.config import settings
 from app.tests.utils.utils import get_server_api
 
 
 def test_celery_worker_test(superuser_token_headers):
-    settings = Settings()
     server_api = get_server_api()
     data = {"msg": "test"}
     r = requests.post(

{{cookiecutter.project_slug}}/backend/app/app/tests/api/api_v1/test_items.py

@@ -1,12 +1,10 @@
 import requests
 
-from app.core.config import Settings
+from app.core.config import settings
 from app.tests.utils.item import create_random_item
 from app.tests.utils.utils import get_server_api
 from app.tests.utils.user import create_random_user
 
-settings = Settings()
-
 def test_create_item(superuser_token_headers):
     server_api = get_server_api()
     data = {"title": "Foo", "description": "Fighters"}

{{cookiecutter.project_slug}}/backend/app/app/tests/api/api_v1/test_login.py

@@ -1,10 +1,8 @@
 import requests
 
-from app.core.config import Settings
+from app.core.config import settings
 from app.tests.utils.utils import get_server_api
 
-settings = Settings()
-
 def test_get_access_token():
     server_api = get_server_api()
     login_data = {

{{cookiecutter.project_slug}}/backend/app/app/tests/api/api_v1/test_users.py

@@ -1,13 +1,11 @@
 import requests
 
 from app import crud
-from app.core.config import Settings
+from app.core.config import settings
 from app.db.session import db_session
 from app.schemas.user import UserCreate
 from app.tests.utils.utils import get_server_api, random_lower_string
 
-settings = Settings()
-
 def test_get_users_superuser_me(superuser_token_headers):
     server_api = get_server_api()
     r = requests.get(

{{cookiecutter.project_slug}}/backend/app/app/tests/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 
-from app.core.config import Settings
+from app.core.config import settings
 from app.tests.utils.utils import get_server_api, get_superuser_token_headers
 from app.tests.utils.user import authentication_token_from_email
 
@@ -16,5 +16,4 @@ def superuser_token_headers():
 
 @pytest.fixture(scope="module")
 def normal_user_token_headers():
-    settings = Settings()
     return authentication_token_from_email(settings.EMAIL_TEST_USER)

{{cookiecutter.project_slug}}/backend/app/app/tests/utils/user.py

@@ -1,14 +1,13 @@
 import requests
 
 from app import crud
-from app.core.config import Settings
+from app.core.config import settings
 from app.db.session import db_session
 from app.schemas.user import UserCreate, UserUpdate
 from app.tests.utils.utils import get_server_api, random_lower_string
 
 
 def user_authentication_headers(server_api, email, password):
-    settings = Settings()
     data = {"username": email, "password": password}
 
     r = requests.post(f"{server_api}{settings.API_V1_STR}/login/access-token", data=data)

{{cookiecutter.project_slug}}/backend/app/app/tests/utils/utils.py

@@ -3,9 +3,7 @@
 
 import requests
 
-from app.core.config import Settings
-
-settings = Settings()
+from app.core.config import settings
 
 def random_lower_string():
     return "".join(random.choices(string.ascii_lowercase, k=32))

{{cookiecutter.project_slug}}/backend/app/app/utils.py

@@ -8,9 +8,7 @@
 from emails.template import JinjaTemplate
 from jwt.exceptions import InvalidTokenError
 
-from app.core.config import Settings
-
-settings = Settings()
+from app.core.config import settings
 
 password_reset_jwt_subject = "preset"
 

{{cookiecutter.project_slug}}/backend/app/app/worker.py

@@ -1,9 +1,8 @@
 from raven import Client
 
-from app.core.config import Settings
+from app.core.config import settings
 from app.core.celery_app import celery_app
 
-settings = Settings()
 client_sentry = Client(settings.SENTRY_DSN)