From c4ced870cdf2fe6fe2a405c99fd9bd26d3595e74 Mon Sep 17 00:00:00 2001
From: Jakub Miazek <the@grillazz.com>
Date: Sun, 17 Sep 2023 15:22:08 +0200
Subject: [PATCH 1/2] drop redundant lru cache

---
 app/config.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/config.py b/app/config.py
index df92c86..9bb7fee 100644
--- a/app/config.py
+++ b/app/config.py
@@ -1,5 +1,4 @@
 import os
-from functools import lru_cache
 
 from pydantic import PostgresDsn, RedisDsn
 from pydantic_settings import BaseSettings
@@ -12,9 +11,4 @@ class Settings(BaseSettings):
     jwt_expire: int = os.getenv("JWT_EXPIRE")
 
 
-@lru_cache
-def get_settings():
-    return Settings()
-
-
-settings = get_settings()
+settings = Settings()

From 5469121dfe91c4890c49363b27fc4066cc958a7d Mon Sep 17 00:00:00 2001
From: Jakub Miazek <the@grillazz.com>
Date: Sun, 17 Sep 2023 16:01:19 +0200
Subject: [PATCH 2/2] fix imports

---
 app/database.py      | 3 +--
 app/models/user.py   | 3 ---
 app/redis.py         | 5 +----
 app/services/auth.py | 4 +---
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/database.py b/app/database.py
index 2c6698a..262a998 100644
--- a/app/database.py
+++ b/app/database.py
@@ -3,10 +3,9 @@ from collections.abc import AsyncGenerator
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.ext.asyncio import async_sessionmaker
 
-from app import config
+from app.config import settings as global_settings
 from app.utils.logging import AppLogger
 
-global_settings = config.get_settings()
 logger = AppLogger.__call__().get_logger()
 
 engine = create_async_engine(
diff --git a/app/models/user.py b/app/models/user.py
index c22cd9c..6a1b106 100644
--- a/app/models/user.py
+++ b/app/models/user.py
@@ -8,11 +8,8 @@ from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import mapped_column, Mapped
 
-from app import config
 from app.models.base import Base
 
-global_settings = config.get_settings()
-
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 
diff --git a/app/redis.py b/app/redis.py
index a755713..f70b1ad 100644
--- a/app/redis.py
+++ b/app/redis.py
@@ -1,9 +1,6 @@
 import redis.asyncio as redis
 
-from app import config
-
-
-global_settings = config.get_settings()
+from app.config import settings as global_settings
 
 
 async def get_redis():
diff --git a/app/services/auth.py b/app/services/auth.py
index 9af470b..e8cf692 100644
--- a/app/services/auth.py
+++ b/app/services/auth.py
@@ -1,14 +1,12 @@
 import time
 import jwt
 
-from app import config
+from app.config import settings as global_settings
 from app.models.user import User
 
 from fastapi import Request, HTTPException
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 
-global_settings = config.get_settings()
-
 
 async def verify_jwt(request: Request, token: str) -> bool:
     _payload = await request.app.state.redis.get(token)