Skip to content

Commit

Permalink
feat: add RIVEN_SETTINGS_FILENAME env (#993)
Browse files Browse the repository at this point in the history
  • Loading branch information
AyushSehrawat authored Feb 8, 2025
1 parent 4b64e0f commit 2eb98ca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
7 changes: 3 additions & 4 deletions src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import uvicorn
from dotenv import load_dotenv
load_dotenv() # import required here to support RIVEN_SETTINGS_FILENAME

from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from loguru import logger
Expand All @@ -19,9 +21,6 @@
from program.utils.cli import handle_args
from routers import app_router

load_dotenv()


class LoguruMiddleware(BaseHTTPMiddleware):
async def dispatch(self, request: Request, call_next):
start_time = time.time()
Expand Down Expand Up @@ -110,4 +109,4 @@ def signal_handler(signum, frame):
logger.exception(traceback.format_exc())
finally:
logger.critical("Server has been stopped")
sys.exit(0)
sys.exit(0)
5 changes: 3 additions & 2 deletions src/program/settings/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ class SettingsManager:

def __init__(self):
self.observers = []
self.filename = "settings.json"
self.filename = os.environ.get("RIVEN_SETTINGS_FILENAME", "settings.json")
self.settings_file = data_dir_path / self.filename

Observable.set_notify_observers(self.notify_observers)

if not self.settings_file.exists():
logger.info(f"Settings filename: {self.filename}")
self.settings = AppModel()
self.settings = AppModel.model_validate(
self.check_environment(json.loads(self.settings.model_dump_json()), "RIVEN")
Expand Down Expand Up @@ -96,4 +97,4 @@ def format_validation_error(e: ValidationError) -> str:
return "\n".join(messages)


settings_manager = SettingsManager()
settings_manager = SettingsManager()

0 comments on commit 2eb98ca

Please sign in to comment.