fix(config): .env and .yaml (#321)

Author: floritange

veadk/config.py

@@ -15,7 +15,7 @@
 import os
 from typing import Any
 
-from dotenv import find_dotenv, load_dotenv
+from dotenv import find_dotenv, load_dotenv, dotenv_values
 from pydantic import BaseModel, Field
 
 from veadk.configs.auth_configs import VeIdentityConfig
@@ -39,10 +39,14 @@
 
 logger = get_logger(__name__)
 
-if load_dotenv(find_dotenv(usecwd=True)):
-    logger.info(f"Find `.env` file in {find_dotenv(usecwd=True)}, load envs.")
+env_file_path = os.path.join(os.getcwd(), ".env")
+if os.path.isfile(env_file_path):
+    load_dotenv(env_file_path)
+    env_from_dotenv = dotenv_values(env_file_path)
+    logger.info(f"Find `.env` file in {env_file_path}, load envs.")
 else:
-    logger.info("No env file found.")
+    env_from_dotenv = {}
+    logger.info("No `.env` file found.")
 
 
 class VeADKConfig(BaseModel):
@@ -97,11 +101,13 @@ def getenv(
 
 config_yaml_path = find_dotenv(filename="config.yaml", usecwd=True)
 
-veadk_environments = {}
+veadk_environments = dict(env_from_dotenv)
 
 if config_yaml_path:
     logger.info(f"Find `config.yaml` file in {config_yaml_path}")
-    config_dict, _veadk_environments = set_envs(config_yaml_path=config_yaml_path)
+    config_dict, _veadk_environments = set_envs(
+        config_yaml_path=config_yaml_path, env_from_dotenv=env_from_dotenv
+    )
     veadk_environments.update(_veadk_environments)
 else:
     logger.warning("No `config.yaml` file found.")

veadk/utils/misc.py

@@ -128,7 +128,7 @@ def getenv(
         )
 
 
-def set_envs(config_yaml_path: str) -> tuple[dict, dict]:
+def set_envs(config_yaml_path: str, env_from_dotenv: dict = None) -> tuple[dict, dict]:
     from veadk.utils.logger import get_logger
 
     logger = get_logger(__name__)
@@ -138,15 +138,14 @@ def set_envs(config_yaml_path: str) -> tuple[dict, dict]:
 
     flatten_config_dict = flatten_dict(config_dict)
 
-    veadk_environments = {}
+    veadk_environments = dict(env_from_dotenv)
     for k, v in flatten_config_dict.items():
         k = k.upper()
 
-        if k in os.environ:
+        if k in env_from_dotenv:
             logger.info(
-                f"Environment variable {k} has been set, value in `config.yaml` will be ignored."
+                f"Environment variable {k} has been set in .env, value in `config.yaml` will be ignored."
             )
-            veadk_environments[k] = os.environ[k]
             continue
         veadk_environments[k] = str(v)
         os.environ[k] = str(v)