Doiiars
Committed by GitHub

Merge pull request #160 from Misaki030112/fix/forum-env-config

fix(ForumEngine): Fixes the issue where the Host Agent LLM configuration was not read from environment variables.
@@ -12,7 +12,7 @@ import re @@ -12,7 +12,7 @@ import re
12 12
13 # 添加项目根目录到Python路径以导入config 13 # 添加项目根目录到Python路径以导入config
14 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) 14 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
15 -from config import FORUM_HOST_API_KEY, FORUM_HOST_BASE_URL, FORUM_HOST_MODEL_NAME 15 +from config import settings
16 16
17 # 添加utils目录到Python路径 17 # 添加utils目录到Python路径
18 current_dir = os.path.dirname(os.path.abspath(__file__)) 18 current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -21,7 +21,7 @@ utils_dir = os.path.join(root_dir, 'utils') @@ -21,7 +21,7 @@ utils_dir = os.path.join(root_dir, 'utils')
21 if utils_dir not in sys.path: 21 if utils_dir not in sys.path:
22 sys.path.append(utils_dir) 22 sys.path.append(utils_dir)
23 23
24 -from retry_helper import with_graceful_retry, SEARCH_API_RETRY_CONFIG 24 +from utils.retry_helper import with_graceful_retry, SEARCH_API_RETRY_CONFIG
25 25
26 26
27 class ForumHost: 27 class ForumHost:
@@ -38,18 +38,18 @@ class ForumHost: @@ -38,18 +38,18 @@ class ForumHost:
38 api_key: 硅基流动API密钥,如果不提供则从配置文件读取 38 api_key: 硅基流动API密钥,如果不提供则从配置文件读取
39 base_url: 接口基础地址,默认使用配置文件提供的SiliconFlow地址 39 base_url: 接口基础地址,默认使用配置文件提供的SiliconFlow地址
40 """ 40 """
41 - self.api_key = api_key or FORUM_HOST_API_KEY 41 + self.api_key = api_key or settings.FORUM_HOST_API_KEY
42 42
43 if not self.api_key: 43 if not self.api_key:
44 raise ValueError("未找到硅基流动API密钥,请在config.py中设置FORUM_HOST_API_KEY") 44 raise ValueError("未找到硅基流动API密钥,请在config.py中设置FORUM_HOST_API_KEY")
45 45
46 - self.base_url = base_url or FORUM_HOST_BASE_URL 46 + self.base_url = base_url or settings.FORUM_HOST_BASE_URL
47 47
48 self.client = OpenAI( 48 self.client = OpenAI(
49 api_key=self.api_key, 49 api_key=self.api_key,
50 base_url=self.base_url 50 base_url=self.base_url
51 ) 51 )
52 - self.model = model_name or FORUM_HOST_MODEL_NAME # Use configured model 52 + self.model = model_name or settings.FORUM_HOST_MODEL_NAME # Use configured model
53 53
54 # Track previous summaries to avoid duplicates 54 # Track previous summaries to avoid duplicates
55 self.previous_summaries = [] 55 self.previous_summaries = []