Skip to content

Commit 923063c

Browse files
SunsetWolfyou-n-g
andauthored
fix: fix_dotenv_error (#257)
* fix_dotenv_error * format with isort * Update rdagent/app/cli.py --------- Co-authored-by: you-n-g <[email protected]>
1 parent c097585 commit 923063c

File tree

5 files changed

+7
-24
lines changed

5 files changed

+7
-24
lines changed

rdagent/app/cli.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55
- make rdagent a nice entry and
66
- autoamtically load dotenv
77
"""
8+
from dotenv import load_dotenv
9+
10+
load_dotenv(".env")
11+
# 1) Make sure it is at the beginning of the script so that it will load dotenv before initializing BaseSettings.
12+
# 2) The ".env" argument is necessary to make sure it loads `.env` from the current directory.
13+
814
import subprocess
915
from importlib.resources import path as rpath
1016

1117
import fire
12-
from dotenv import load_dotenv
1318

1419
from rdagent.app.data_mining.model import main as med_model
1520
from rdagent.app.general_model.general_model import (
@@ -20,8 +25,6 @@
2025
from rdagent.app.qlib_rd_loop.model import main as fin_model
2126
from rdagent.app.utils.info import collect_info
2227

23-
load_dotenv()
24-
2528

2629
def ui(port=80, log_dir="", debug=False):
2730
"""

rdagent/app/general_model/general_model.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
from dotenv import load_dotenv
2-
3-
from rdagent.scenarios.general_model.scenario import GeneralModelScenario
4-
5-
load_dotenv(override=True)
6-
71
import fire
82

93
from rdagent.components.coder.model_coder.task_loader import (
@@ -13,6 +7,7 @@
137
extract_first_page_screenshot_from_pdf,
148
)
159
from rdagent.log import rdagent_logger as logger
10+
from rdagent.scenarios.general_model.scenario import GeneralModelScenario
1611
from rdagent.scenarios.qlib.developer.model_coder import QlibModelCoSTEER
1712

1813

rdagent/components/benchmark/conf.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
from pathlib import Path
33
from typing import Optional
44

5-
from dotenv import load_dotenv
65
from pydantic_settings import BaseSettings
76

8-
# Load environment variables
9-
load_dotenv(verbose=True, override=True)
10-
11-
127
DIRNAME = Path("./")
138

149

rdagent/components/runner/conf.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22

33
from pathlib import Path
44

5-
from dotenv import load_dotenv
6-
from pydantic_settings import BaseSettings
7-
8-
# make sure that env variable is loaded while calling Config()
9-
load_dotenv(verbose=True, override=True)
10-
115
from pydantic_settings import BaseSettings
126

137

rdagent/core/conf.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
from pathlib import Path
44

5-
from dotenv import load_dotenv
65
from pydantic_settings import BaseSettings
76

87
# TODO: use pydantic for other modules in Qlib
98
# from pydantic_settings import BaseSettings
109

11-
# make sure that env variable is loaded while calling Config()
12-
load_dotenv(verbose=True, override=True)
13-
1410

1511
class RDAgentSettings(BaseSettings):
1612
# TODO: (xiao) I think LLMSetting may be a better name.

0 commit comments

Comments
 (0)