feat: 添加启动绑定地址解析功能，支持从配置文件和环境变量迁移

Author: DrSmoothl

bot.py

@@ -30,7 +30,7 @@
     load_dotenv(str(env_path), override=True)
 else:
     print("[WIP] no .env file found, and templates is not ready yet.")
-    raise
+    print("[WIP] continue startup, use environment and existing config values.")
     # try:
     #     if template_env_path.exists():
     #         shutil.copyfile(template_env_path, env_path)

dashboard/src/routes/config/modelProvider/ProviderForm.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { Check, ChevronsUpDown, Copy, Eye, EyeOff } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
@@ -42,8 +42,16 @@ export function ProviderForm({
   const [localProvider, setLocalProvider] = useState<APIProvider | null>(editingProvider)
   const { toast } = useToast()
 
-  // 同步外部状态到本地
-  if (editingProvider !== localProvider && open) {
+  // 当弹窗打开时，根据当前编辑对象同步一次本地编辑状态
+  useEffect(() => {
+    if (!open) {
+      setLocalProvider(null)
+      setFormErrors({})
+      setShowApiKey(false)
+      setSelectedTemplate('custom')
+      return
+    }
+
     setLocalProvider(editingProvider)
     setFormErrors({})
     setShowApiKey(false)
@@ -57,7 +65,7 @@ export function ProviderForm({
     } else {
       setSelectedTemplate('custom')
     }
-  }
+  }, [open, editingProvider, editingIndex])
 
   const isUsingTemplate = useMemo(() => selectedTemplate !== 'custom', [selectedTemplate])
 

pytests/config_test/test_startup_bindings.py

@@ -0,0 +1,104 @@
+from pathlib import Path
+from types import SimpleNamespace
+import sys
+
+from src.config.legacy_migration import migrate_legacy_bind_env_to_bot_config_dict
+from src.config.startup_bindings import (
+    BindAddress,
+    get_startup_main_bind_address,
+    get_startup_webui_bind_address,
+    resolve_main_bind_address,
+    resolve_webui_bind_address,
+)
+
+
+def test_startup_bindings_use_defaults_when_config_file_missing(tmp_path: Path):
+    missing_path = tmp_path / "missing_bot_config.toml"
+
+    assert get_startup_main_bind_address(missing_path) == BindAddress(host="127.0.0.1", port=8080)
+    assert get_startup_webui_bind_address(missing_path) == BindAddress(host="127.0.0.1", port=8001)
+
+
+def test_startup_bindings_can_read_addresses_from_bot_config(tmp_path: Path):
+    config_path = tmp_path / "bot_config.toml"
+    config_path.write_text(
+        """
+[inner]
+version = "8.3.1"
+
+[maim_message]
+ws_server_host = "0.0.0.0"
+ws_server_port = 22345
+
+[webui]
+host = "192.168.1.9"
+port = 18001
+""".strip(),
+        encoding="utf-8",
+    )
+
+    assert get_startup_main_bind_address(config_path) == BindAddress(host="0.0.0.0", port=22345)
+    assert get_startup_webui_bind_address(config_path) == BindAddress(host="192.168.1.9", port=18001)
+
+
+def test_resolve_bindings_prefer_initialized_global_config(monkeypatch):
+    fake_config_module = SimpleNamespace(
+        global_config=SimpleNamespace(
+            maim_message=SimpleNamespace(ws_server_host="10.0.0.2", ws_server_port=32000),
+            webui=SimpleNamespace(host="10.0.0.3", port=32001),
+        )
+    )
+
+    monkeypatch.setitem(sys.modules, "src.config.config", fake_config_module)
+
+    assert resolve_main_bind_address() == BindAddress(host="10.0.0.2", port=32000)
+    assert resolve_webui_bind_address() == BindAddress(host="10.0.0.3", port=32001)
+
+
+def test_legacy_env_bindings_are_migrated_when_fields_missing_or_default(monkeypatch):
+    monkeypatch.setenv("HOST", "0.0.0.0")
+    monkeypatch.setenv("PORT", "22345")
+    monkeypatch.setenv("WEBUI_HOST", "192.168.1.8")
+    monkeypatch.setenv("WEBUI_PORT", "19001")
+
+    payload = {
+        "maim_message": {
+            "ws_server_host": "127.0.0.1",
+            "ws_server_port": 8080,
+        },
+        "webui": {},
+    }
+
+    result = migrate_legacy_bind_env_to_bot_config_dict(payload)
+
+    assert result.migrated is True
+    assert payload["maim_message"]["ws_server_host"] == "0.0.0.0"
+    assert payload["maim_message"]["ws_server_port"] == 22345
+    assert payload["webui"]["host"] == "192.168.1.8"
+    assert payload["webui"]["port"] == 19001
+
+
+def test_legacy_env_bindings_do_not_override_explicit_config(monkeypatch):
+    monkeypatch.setenv("HOST", "0.0.0.0")
+    monkeypatch.setenv("PORT", "22345")
+    monkeypatch.setenv("WEBUI_HOST", "192.168.1.8")
+    monkeypatch.setenv("WEBUI_PORT", "19001")
+
+    payload = {
+        "maim_message": {
+            "ws_server_host": "10.1.1.1",
+            "ws_server_port": 30000,
+        },
+        "webui": {
+            "host": "10.1.1.2",
+            "port": 30001,
+        },
+    }
+
+    result = migrate_legacy_bind_env_to_bot_config_dict(payload)
+
+    assert result.migrated is False
+    assert payload["maim_message"]["ws_server_host"] == "10.1.1.1"
+    assert payload["maim_message"]["ws_server_port"] == 30000
+    assert payload["webui"]["host"] == "10.1.1.2"
+    assert payload["webui"]["port"] == 30001

src/chat/emoji_system/emoji_manager.py

@@ -480,8 +480,20 @@ def register_emoji_to_db(self, emoji: MaiEmoji) -> bool:
             logger.error(f"[注册表情包] 表情包文件不存在: {emoji.full_path}")
             return False
 
-        # 将表情包移动到已注册目录
         target_path = EMOJI_REGISTERED_DIR / emoji.file_name
+
+        # 先查库，避免重复记录导致文件被误移动后无法回收
+        original_path = emoji.full_path
+        try:
+            with get_db_session() as session:
+                statement = select(Images).filter_by(image_hash=emoji.file_hash, image_type=ImageType.EMOJI).limit(1)
+                existing_record = session.exec(statement).first()
+                if existing_record and not existing_record.no_file_flag:
+                    logger.warning(f"[注册表情包] 数据库中已存在表情包记录: {emoji.file_hash}")
+                    return False
+        except Exception as e:
+            logger.error(f"[注册表情包] 查询数据库时出错: {e}")
+            return False
         try:
             emoji.full_path.replace(target_path)
             emoji.full_path = target_path
@@ -490,6 +502,7 @@ def register_emoji_to_db(self, emoji: MaiEmoji) -> bool:
             return False
 
         # 注册到数据库
+        restore_file = False
         try:
             with get_db_session() as session:
                 statement = select(Images).filter_by(image_hash=emoji.file_hash, image_type=ImageType.EMOJI).limit(1)
@@ -509,6 +522,7 @@ def register_emoji_to_db(self, emoji: MaiEmoji) -> bool:
                         )
                     else:
                         logger.warning(f"[注册表情包] 数据库中已存在表情包记录: {emoji.file_hash}")
+                        restore_file = True
                         return False
                 else:
                     image_record = emoji.to_db_instance()
@@ -521,7 +535,15 @@ def register_emoji_to_db(self, emoji: MaiEmoji) -> bool:
                     logger.info(f"[注册表情包] 成功注册表情包到数据库, ID: {record_id}, 路径: {emoji.full_path}")
         except Exception as e:
             logger.error(f"[注册表情包] 注册到数据库时出错: {e}")
+            restore_file = True
             return False
+        finally:
+            if restore_file:
+                try:
+                    emoji.full_path.replace(original_path)
+                    emoji.full_path = original_path
+                except Exception as e:
+                    logger.error(f"[注册表情包] 回滚文件移动失败: {e}")
         return True
 
     def delete_emoji(self, emoji: MaiEmoji, no_desc: bool = False) -> bool:
@@ -1045,7 +1067,13 @@ async def register_emoji_by_filename(self, filename: Path | str) -> bool:
             logger.error(f"[注册表情包] 创建表情包对象时出错: {e}")
             return False
 
-        # 0. 先验证数据库中是否已经存在相同哈希的表情包，避免重复构建
+        calc_success = await target_emoji.calculate_hash_format()
+        if not calc_success:
+            logger.error(f"[注册表情包] 计算表情包哈希值和格式失败: {file_full_path}")
+            return False
+        file_full_path = target_emoji.full_path  # 更新为可能修正后的路径
+
+        # 2. 先验证数据库中是否已经存在相同哈希的表情包，避免重复构建
         try:
             with get_db_session_manual() as session:
                 statement = (
@@ -1068,13 +1096,7 @@ async def register_emoji_by_filename(self, filename: Path | str) -> bool:
             logger.error(f"[注册表情包] 查询数据库时出错: {e}")
             return False
 
-        # 1. 计算哈希值和格式
-        calc_success = await target_emoji.calculate_hash_format()
-        if not calc_success:
-            logger.error(f"[注册表情包] 计算表情包哈希值和格式失败: {file_full_path}")
-            return False
-        file_full_path = target_emoji.full_path  # 更新为可能修正后的路径
-        # 2. 检查是否已经存在过
+        # 3. 检查内存缓存是否已经存在
         if existing_emoji := self.get_emoji_by_hash(target_emoji.file_hash):
             logger.warning(f"[注册表情包] 表情包已存在，跳过注册: {existing_emoji.file_name}")
             return False

src/common/message_server/api.py

@@ -1,11 +1,10 @@
-from maim_message import MessageServer
-
+from importlib import metadata
 import traceback
-import importlib.metadata
+
+from maim_message import MessageServer
 
 from src.common.logger import adopt_library_logger, get_logger
 from src.common.utils.port_checker import assert_port_available
-from src.config.config import global_config
 from .server import get_global_server
 
 global_api = None
@@ -14,10 +13,12 @@
 
 def get_global_api() -> MessageServer:  # sourcery skip: extract-method
     """获取全局MessageServer实例"""
+    from src.config.config import global_config
+
     global global_api
     if global_api is None:
         # 检查maim_message版本
-        maim_message_version = importlib.metadata.version("maim_message")
+        maim_message_version = metadata.version("maim_message")
         version_int = [int(x) for x in maim_message_version.split(".")]
         if version_int < [0, 6, 2]:
             raise RuntimeError("maim_message 版本过低，请升级到 0.6.2 或更高版本。")

src/common/message_server/server.py

@@ -1,12 +1,14 @@
+from typing import Optional
+
 import asyncio
 
-from fastapi import FastAPI, APIRouter
+from fastapi import APIRouter, FastAPI
 from rich.traceback import install
-from typing import Optional
 from uvicorn import Config, Server as UvicornServer
 
 from src.common.logger import get_logger
 from src.common.utils.port_checker import assert_port_available, is_port_conflict_error, log_port_conflict
+from src.config.startup_bindings import resolve_main_bind_address
 
 install(extra_lines=3)
 
@@ -21,7 +23,7 @@ def __init__(self, host: Optional[str] = None, port: Optional[int] = None, app_n
         self._server: Optional[UvicornServer] = None
         self.set_address(host, port)
 
-    def register_router(self, router: APIRouter, prefix: str = ""): 
+    def register_router(self, router: APIRouter, prefix: str = ""):
         """注册路由
 
         APIRouter 用于对相关的路由端点进行分组和模块化管理：
@@ -121,11 +123,8 @@ def get_app(self) -> FastAPI:
 
 def get_global_server() -> Server:
     """获取全局服务器实例"""
-    from src.config.config import global_config
-
     global global_server
     if global_server is None:
-        global_server = Server(
-            host=global_config.maim_message.ws_server_host, port=global_config.maim_message.ws_server_port
-        )
+        bind_address = resolve_main_bind_address()
+        global_server = Server(host=bind_address.host, port=bind_address.port)
     return global_server

src/config/config.py

@@ -12,7 +12,7 @@
 from .config_base import AttributeData, ConfigBase, Field
 from .config_utils import compare_versions, output_config_changes, recursive_parse_item_to_table
 from .file_watcher import FileChange, FileWatcher
-from .legacy_migration import try_migrate_legacy_bot_config_dict
+from .legacy_migration import migrate_legacy_bind_env_to_bot_config_dict, try_migrate_legacy_bot_config_dict
 from .model_configs import APIProvider, ModelInfo, ModelTaskConfig
 from .official_configs import (
     BotConfig,
@@ -55,7 +55,7 @@
 BOT_CONFIG_PATH: Path = (CONFIG_DIR / "bot_config.toml").resolve().absolute()
 MODEL_CONFIG_PATH: Path = (CONFIG_DIR / "model_config.toml").resolve().absolute()
 MMC_VERSION: str = "1.0.0"
-CONFIG_VERSION: str = "8.3.0"
+CONFIG_VERSION: str = "8.3.1"
 MODEL_CONFIG_VERSION: str = "1.13.1"
 
 logger = get_logger("config")
@@ -472,6 +472,11 @@ def load_config_from_file(
     old_ver: str = inner_version
     config_data.remove("inner")  # 移除 inner 部分，避免干扰后续处理
     config_data = config_data.unwrap()  # 转换为普通字典，方便后续处理
+    if config_path.name == "bot_config.toml" and config_class.__name__ == "Config":
+        env_migration = migrate_legacy_bind_env_to_bot_config_dict(config_data)
+        if env_migration.migrated:
+            logger.warning(f"检测到旧版环境变量绑定配置，已迁移到主配置: {env_migration.reason}")
+        config_data = env_migration.data
     # 保留一份“干净”的原始数据副本，避免第一次 from_dict 过程中对 dict 的就地修改
     original_data: dict[str, Any] = copy.deepcopy(config_data)
     try: