Fix/Loading .env from the current working directory (#695)

Co-authored-by: alcholiclg <ligongshengzju@foxmail.com>

Author: alcholiclg

ms_agent/tools/search/search_request.py

@@ -85,7 +85,7 @@ def get_rewrite_prompt(self) -> str:
             f'\n现在，基于以上所有原则和范例，为用户的原始输入"{self.user_prompt}"生成最终的搜索请求。'
             f'\n1. 将你构建的、最优的英文查询语句填入query参数。'
             f'\n2. num_results参数的值必须在1到25之间，请选择一个适合问题复杂程度的值，比如10。'
-            f'\n3. 必须严格按照以下JSON格式模板返回结果: {self.get_args_template()}')
+            f'\n3. 必须符合以下arguments格式: {self.get_args_template()}')
 
     def create_request(self,
                        search_request_d: Dict[str, Any]) -> ArxivSearchRequest:

ms_agent/tools/search_engine.py

@@ -1,6 +1,7 @@
 import os
 from typing import Any, Dict
 
+from dotenv import load_dotenv
 from ms_agent.config.env import Env
 from ms_agent.tools.exa import ExaSearch
 from ms_agent.tools.search.arxiv import ArxivSearch
@@ -30,6 +31,11 @@ def load_base_config(file_path: str) -> Dict[str, Any]:
     import yaml
     with open(file_path, 'r') as file:
         config = yaml.safe_load(file)
+
+    # Load environment variables from .env file if it exists
+    if not load_dotenv(os.path.join(os.getcwd(), '.env')):
+        Env.load_env()
+
     return process_dict(config)
 
 
@@ -69,8 +75,6 @@ def replace_env_vars(value: str) -> str:
     if not isinstance(value, str):
         return value
 
-    Env.load_env()
-
     if value.startswith('$'):
         env_var = value[1:]
         return os.getenv(env_var, None)

projects/deep_research/README.md

@@ -60,7 +60,7 @@ pip install -r requirements/research.txt
 
 1. If you're using Exa or SerpApi, make sure your .env file includes the following configuration settings:
 ```bash
-cp .env.example ../../.env
+cp .env.example .env
 
 # Then, edit the `.env` file to include your API keys:
 EXA_API_KEY=xxx