Spaces:
Sleeping
Sleeping
yu commited on
Commit ·
9fcc2b0
1
Parent(s): d2d27ed
fix: 修复 get_account_id 函数定义顺序导致的启动错误
Browse files- 将 get_account_id 移到 load_multi_account_config 之前
- 避免模块加载时 NameError
main.py
CHANGED
|
@@ -442,6 +442,10 @@ def load_accounts_from_source() -> list:
|
|
| 442 |
logger.error(f"[CONFIG] ACCOUNTS_CONFIG JSON 解析失败: {str(e)}")
|
| 443 |
raise ValueError(f"ACCOUNTS_CONFIG 格式错误: {str(e)}")
|
| 444 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 445 |
# ---------- 多账户配置加载 ----------
|
| 446 |
def load_multi_account_config() -> MultiAccountManager:
|
| 447 |
"""从文件或环境变量加载多账户配置"""
|
|
@@ -489,10 +493,6 @@ def reload_accounts():
|
|
| 489 |
multi_account_mgr = load_multi_account_config()
|
| 490 |
logger.info(f"[CONFIG] 配置已重载,当前账户数: {len(multi_account_mgr.accounts)}")
|
| 491 |
|
| 492 |
-
def get_account_id(acc: dict, index: int) -> str:
|
| 493 |
-
"""获取账户ID(有显式ID则使用,否则生成默认ID)"""
|
| 494 |
-
return acc.get("id", f"account_{index}")
|
| 495 |
-
|
| 496 |
def update_accounts_config(accounts_data: list):
|
| 497 |
"""更新账户配置(保存到文件并重新加载)"""
|
| 498 |
save_accounts_to_file(accounts_data)
|
|
|
|
| 442 |
logger.error(f"[CONFIG] ACCOUNTS_CONFIG JSON 解析失败: {str(e)}")
|
| 443 |
raise ValueError(f"ACCOUNTS_CONFIG 格式错误: {str(e)}")
|
| 444 |
|
| 445 |
+
def get_account_id(acc: dict, index: int) -> str:
|
| 446 |
+
"""获取账户ID(有显式ID则使用,否则生成默认ID)"""
|
| 447 |
+
return acc.get("id", f"account_{index}")
|
| 448 |
+
|
| 449 |
# ---------- 多账户配置加载 ----------
|
| 450 |
def load_multi_account_config() -> MultiAccountManager:
|
| 451 |
"""从文件或环境变量加载多账户配置"""
|
|
|
|
| 493 |
multi_account_mgr = load_multi_account_config()
|
| 494 |
logger.info(f"[CONFIG] 配置已重载,当前账户数: {len(multi_account_mgr.accounts)}")
|
| 495 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 496 |
def update_accounts_config(accounts_data: list):
|
| 497 |
"""更新账户配置(保存到文件并重新加载)"""
|
| 498 |
save_accounts_to_file(accounts_data)
|