Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug

bot.py

@@ -17,19 +17,6 @@ env_mask = {key: os.getenv(key) for key in os.environ}
 
 uvicorn_server = None
 
-# 配置日志
-log_path = os.path.join(os.getcwd(), "logs")
-if not os.path.exists(log_path):
-    os.makedirs(log_path)
-
-# 添加文件日志，启用rotation和retention
-logger.add(
-    os.path.join(log_path, "maimbot_{time:YYYY-MM-DD}.log"),
-    rotation="00:00",  # 每天0点创建新文件
-    retention="30 days",  # 保留30天的日志
-    level="INFO",
-    encoding="utf-8"
-)
 
 def easter_egg():
     # 彩蛋
@@ -90,10 +77,7 @@ def load_env():
         logger.success("加载开发环境变量配置")
         load_dotenv(".env.dev", override=True)  # override=True 允许覆盖已存在的环境变量
 
-    fn_map = {
+    fn_map = {"prod": prod, "dev": dev}
-        "prod": prod,
-        "dev": dev
-    }
 
     env = os.getenv("ENVIRONMENT")
     logger.info(f"[load_env] 当前的 ENVIRONMENT 变量值：{env}")
@@ -109,28 +93,45 @@ def load_env():
         logger.error(f"ENVIRONMENT 配置错误，请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在")
         RuntimeError(f"ENVIRONMENT 配置错误，请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在")
 
+
 def load_logger():
-    logger.remove()  # 移除默认配置
+    logger.remove()
-    if os.getenv("ENVIRONMENT") == "dev":
+
-        logger.add(
+    # 配置日志基础路径
-            sys.stderr,
+    log_path = os.path.join(os.getcwd(), "logs")
-            format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> <fg #777777>|</> <level>{level: <7}</level> <fg "
+    if not os.path.exists(log_path):
-                   "#777777>|</> <cyan>{name:.<8}</cyan>:<cyan>{function:.<8}</cyan>:<cyan>{line: >4}</cyan> <fg "
+        os.makedirs(log_path)
-                   "#777777>-</> <level>{message}</level>",
+
-            colorize=True,
+    current_env = os.getenv("ENV", "dev")
-            level=os.getenv("LOG_LEVEL", "DEBUG"),  # 根据环境设置日志级别，默认为DEBUG
+
+    # 公共配置参数
+    log_level = os.getenv("LOG_LEVEL", "INFO" if current_env == "prod" else "DEBUG")
+    log_filter = lambda record: (
+        ("nonebot" not in record["name"] or record["level"].no >= logger.level("ERROR").no)
+        if current_env == "prod"
+        else True
     )
-    else:
+    log_format = (
-        logger.add(
+        "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> "
-            sys.stderr,
+        "<fg #777777>|</> <level>{level: <7}</level> "
-            format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> <fg #777777>|</> <level>{level: <7}</level> <fg "
+        "<fg #777777>|</> <cyan>{name:.<8}</cyan>:<cyan>{function:.<8}</cyan>:<cyan>{line: >4}</cyan> "
-                "#777777>|</> <cyan>{name:.<8}</cyan>:<cyan>{function:.<8}</cyan>:<cyan>{line: >4}</cyan> <fg "
+        "<fg #777777>-</> <level>{message}</level>"
-                "#777777>-</> <level>{message}</level>",
-            colorize=True,
-            level=os.getenv("LOG_LEVEL", "INFO"),  # 根据环境设置日志级别，默认为INFO
-            filter=lambda record: "nonebot" not in record["name"]
     )
 
+    # 日志文件储存至/logs
+    logger.add(
+        os.path.join(log_path, "maimbot_{time:YYYY-MM-DD}.log"),
+        rotation="00:00",
+        retention="30 days",
+        format=log_format,
+        colorize=False,
+        level=log_level,
+        filter=log_filter,
+        encoding="utf-8",
+    )
+
+    # 终端输出
+    logger.add(sys.stderr, format=log_format, colorize=True, level=log_level, filter=log_filter)
 
 
 def scan_provider(env_config: dict):
@@ -160,10 +161,7 @@ def scan_provider(env_config: dict):
     # 检查每个 provider 是否同时存在 url 和 key
     for provider_name, config in provider.items():
         if config["url"] is None or config["key"] is None:
-            logger.error(
+            logger.error(f"provider 内容：{config}\nenv_config 内容：{env_config}")
-                f"provider 内容：{config}\n"
-                f"env_config 内容：{env_config}"
-            )
             raise ValueError(f"请检查 '{provider_name}' 提供商配置是否丢失 BASE_URL 或 KEY 环境变量")
 
 
@@ -192,7 +190,7 @@ async def uvicorn_main():
         reload=os.getenv("ENVIRONMENT") == "dev",
         timeout_graceful_shutdown=5,
         log_config=None,
-        access_log=False
+        access_log=False,
     )
     server = uvicorn.Server(config)
     uvicorn_server = server
@@ -202,7 +200,7 @@ async def uvicorn_main():
 def raw_main():
     # 利用 TZ 环境变量设定程序工作的时区
     # 仅保证行为一致，不依赖 localtime()，实际对生产环境几乎没有作用
-    if platform.system().lower() != 'windows':
+    if platform.system().lower() != "windows":
         time.tzset()
 
     easter_egg()

src/common/database.py

@@ -22,9 +22,7 @@ def __create_database_instance():
 
     if username and password:
         # 如果有用户名和密码，使用认证连接
-        return MongoClient(
+        return MongoClient(host, port, username=username, password=password, authSource=auth_source)
-            host, port, username=username, password=password, authSource=auth_source
-        )
 
     # 否则使用无认证连接
     return MongoClient(host, port)

src/plugins/models/utils_model.py

@@ -132,7 +132,7 @@ class LLM_request:
         # 常见Error Code Mapping
         error_code_mapping = {
             400: "参数不正确",
-            401: "API key 错误，认证失败",
+            401: "API key 错误，认证失败，请检查/config/bot_config.toml和.env.prod中的配置是否正确哦~",
             402: "账号余额不足",
             403: "需要实名,或余额不足",
             404: "Not Found",

template.env

@@ -23,7 +23,7 @@ CHAT_ANY_WHERE_BASE_URL=https://api.chatanywhere.tech/v1
 SILICONFLOW_BASE_URL=https://api.siliconflow.cn/v1/
 DEEP_SEEK_BASE_URL=https://api.deepseek.com/v1
 
-#定义你要用的api的base_url
+#定义你要用的api的key(需要去对应网站申请哦)
 DEEP_SEEK_KEY=
 CHAT_ANY_WHERE_KEY=
 SILICONFLOW_KEY=