update config.py, update dependencies, refactor code

backend/config.py

@@ -1,6 +1,11 @@
-from dotenv import dotenv_values
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
-config = dotenv_values(".env")
 
-DATABASE_URL = config.get("DATABASE_URL")
-SECRET_KEY = config.get('SECRET_KEY')
+class Settings(BaseSettings):
+    model_config = SettingsConfigDict(env_file=('.env', '.env.prod'), env_file_encoding='utf-8')
+
+    DATABASE_URL: str
+    SECRET_KEY: str
+
+
+settings = Settings()

backend/db/database.py

@@ -1,9 +1,9 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import declarative_base, scoped_session, sessionmaker
 
-from config import DATABASE_URL
+from config import settings
 
-engine = create_engine(DATABASE_URL)
+engine = create_engine(settings.DATABASE_URL)
 
 SessionLocal = scoped_session(sessionmaker(bind=engine))
 

backend/db/dbapi.py

@@ -4,7 +4,7 @@
 from db.database import SessionLocal
 from db.models import ChatRoom, Message, User, Token
 from db.schemas import ChatRoomModel, MessageModel, UserModel, TokenModel
-from config import SECRET_KEY
+from config import settings
 
 
 class DatabaseService:
@@ -94,5 +94,5 @@ def fetch_token_by_username(session: scoped_session, name: str):
         return token
 
     def fetch_user_by_access_token(self, session, access_token):
-        decoded = jwt.decode(access_token, SECRET_KEY)
+        decoded = jwt.decode(access_token, settings.SECRET_KEY)
         return self.fetch_user_by_name(session, decoded['name'])

backend/security.py

@@ -1,6 +1,6 @@
 from passlib.context import CryptContext
 from jose import JWTError, jwt
-from config import SECRET_KEY
+from config import settings
 
 from db.dbapi import DatabaseService
 
@@ -28,11 +28,11 @@ def hash_password(password):
 
 
 def create_access_token(data: dict):
-    encoded_jwt = jwt.encode(data, SECRET_KEY, algorithm=ALGORITHM)
+    encoded_jwt = jwt.encode(data, settings.SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt
 
 
 def decode_access_token(token: str):
-    decoded = jwt.decode(token, key=SECRET_KEY, algorithms=ALGORITHM)
+    decoded = jwt.decode(token, key=settings.SECRET_KEY, algorithms=ALGORITHM)
     print(decoded)
     return decoded