restart groceror work

Author: lordlabakdas

.gitignore

@@ -14,4 +14,5 @@ venv/
 __pycache__
 .idea
 .ruff_cache
-firebaseconfig.json
+firebaseconfig.json
+.config.yml

config.py

@@ -1,10 +1,7 @@
-import os
 from dataclasses import dataclass
 
-from dotenv import load_dotenv
 from pydantic import BaseModel
-
-load_dotenv()
+import yaml
 
 
 class LogConfig(BaseModel):
@@ -35,22 +32,21 @@ class LogConfig(BaseModel):
         LOGGER_NAME: {"handlers": ["default"], "level": LOG_LEVEL},
     }
 
+CONFIG = yaml.safe_load(open(".config.yml"))
 
 @dataclass
 class DBConfig(object):
     """Database configuration to be set for the server"""
-
-    DB_USER = os.getenv("DB_USER")
-    DB_PASSWORD = os.getenv("DB_PASSWORD")
-    DB_HOST = os.getenv("DB_HOST")
-    DB_PORT = os.getenv("DB_PORT")
-    DB_NAME = os.getenv("DB_NAME")
+    DB_USER = CONFIG.get("groceror").get("db").get("DB_USER")
+    DB_PASSWORD = CONFIG.get("groceror").get("db").get("DB_PASSWORD")
+    DB_HOST = CONFIG.get("groceror").get("db").get("DB_HOST")
+    DB_PORT = CONFIG.get("groceror").get("db").get("DB_PORT")
+    DB_NAME = CONFIG.get("groceror").get("db").get("DB_USER")
     DB_URL = f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
 
 
 @dataclass
 class JWTConfig(object):
     """JWT related configuration"""
-
-    JWT_ALGORITHM = os.getenv("JWT_ALGORITHM")
-    JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY")
+    JWT_ALGORITHM = CONFIG.get("groceror").get("JWT_ALGORITHM")
+    JWT_SECRET_KEY = CONFIG.get("groceror").get("JWT_SECRET_KEY")

main.py

@@ -38,9 +38,8 @@
     allow_headers=["*"],
 )
 
-
-cred = credentials.Certificate("firebase_service_account.json")
-firebase_admin.initialize_app(cred)
+#cred = credentials.Certificate("firebase_service_account.json")
+#firebase_admin.initialize_app(cred)
 
 
 @app.get("/")

requirements.txt

@@ -1,6 +1,5 @@
 fastapi==0.92.0
 uvicorn==0.20.0
-ruff==0.0.253
 sqlmodel==0.0.8
 black==23.1.0
 isort==5.12.0
@@ -11,4 +10,6 @@ firebase-admin==6.1.0
 psycopg2==2.9.5
 passlib==1.7.4
 bcrypt==4.0.1
-ruff ==0.0.272
+ruff ==0.0.272
+loguru==0.7.2
+pyyaml==6.0.1