userIdc2024 commited on
Commit
fa22261
·
verified ·
1 Parent(s): bdfb253

Update src/core/setting.py

Browse files
Files changed (1) hide show
  1. src/core/setting.py +6 -4
src/core/setting.py CHANGED
@@ -6,10 +6,12 @@ from pydantic import BaseModel, ConfigDict
6
  from pydantic_settings import BaseSettings
7
 
8
  def load_env_config():
9
- if GlobalConfig().APP_ENV == "dev":
10
- return dotenv_values()
11
- else:
12
- return dict(os.environ)
 
 
13
 
14
 
15
  def get_config() -> Dict[str, Any]:
 
6
  from pydantic_settings import BaseSettings
7
 
8
  def load_env_config():
9
+ # Try to load from .env file first, then fall back to environment variables
10
+ env_file_config = dotenv_values()
11
+ env_vars = dict(os.environ)
12
+
13
+ # Merge .env file values with environment variables (env vars take precedence)
14
+ return {**env_file_config, **env_vars}
15
 
16
 
17
  def get_config() -> Dict[str, Any]: