diff --git a/media_manager/config.py b/media_manager/config.py index 208b324..e056605 100644 --- a/media_manager/config.py +++ b/media_manager/config.py @@ -1,4 +1,3 @@ -import logging import os from pathlib import Path from typing import Type, Tuple @@ -18,16 +17,12 @@ from media_manager.metadataProvider.config import MetadataProviderConfig from media_manager.notification.config import NotificationConfig from media_manager.torrent.config import TorrentConfig -log = logging.getLogger(__name__) config_path = os.getenv("CONFIG_FILE") if config_path is None: - log.info("No CONFIG_FILE environment variable set, using default config file path.") config_path = Path(__file__).parent.parent / "data" / "config.toml" else: config_path = Path(config_path) -print("SERVAS CONFIG PATH: ", config_path) -log.info("Using config file path: %s", config_path) class BasicConfig(BaseSettings): @@ -44,8 +39,7 @@ class BasicConfig(BaseSettings): class AllEncompassingConfig(BaseSettings): model_config = SettingsConfigDict( - toml_file=config_path, - case_sensitive=False, + toml_file=config_path, case_sensitive=False, env_nested_delimiter="_" ) """ This class is used to load all configurations from the environment variables. @@ -68,4 +62,10 @@ class AllEncompassingConfig(BaseSettings): dotenv_settings: PydanticBaseSettingsSource, file_secret_settings: PydanticBaseSettingsSource, ) -> Tuple[PydanticBaseSettingsSource, ...]: - return (TomlConfigSettingsSource(settings_cls),) + return ( + init_settings, + env_settings, + dotenv_settings, + TomlConfigSettingsSource(settings_cls), + file_secret_settings, + ) diff --git a/media_manager/database/config.py b/media_manager/database/config.py index 21f1b55..e183890 100644 --- a/media_manager/database/config.py +++ b/media_manager/database/config.py @@ -2,7 +2,7 @@ from pydantic_settings import BaseSettings class DbConfig(BaseSettings): - host: str + host: str = "localhost" port: int = 5432 user: str = "MediaManager" password: str = "MediaManager"