chore: 用户体验优化(报错信息&log)+ ruff的修改
This commit is contained in:
96
bot.py
96
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():
|
||||
# 彩蛋
|
||||
@@ -76,7 +63,7 @@ def init_env():
|
||||
|
||||
# 首先加载基础环境变量.env
|
||||
if os.path.exists(".env"):
|
||||
load_dotenv(".env",override=True)
|
||||
load_dotenv(".env", override=True)
|
||||
logger.success("成功加载基础环境变量配置")
|
||||
|
||||
|
||||
@@ -90,10 +77,7 @@ def load_env():
|
||||
logger.success("加载开发环境变量配置")
|
||||
load_dotenv(".env.dev", override=True) # override=True 允许覆盖已存在的环境变量
|
||||
|
||||
fn_map = {
|
||||
"prod": prod,
|
||||
"dev": dev
|
||||
}
|
||||
fn_map = {"prod": prod, "dev": dev}
|
||||
|
||||
env = os.getenv("ENVIRONMENT")
|
||||
logger.info(f"[load_env] 当前的 ENVIRONMENT 变量值:{env}")
|
||||
@@ -109,28 +93,53 @@ def load_env():
|
||||
logger.error(f"ENVIRONMENT 配置错误,请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在")
|
||||
RuntimeError(f"ENVIRONMENT 配置错误,请检查 .env 文件中的 ENVIRONMENT 变量及对应 .env.{env} 是否存在")
|
||||
|
||||
def load_logger():
|
||||
logger.remove() # 移除默认配置
|
||||
if os.getenv("ENVIRONMENT") == "dev":
|
||||
logger.add(
|
||||
sys.stderr,
|
||||
format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> <fg #777777>|</> <level>{level: <7}</level> <fg "
|
||||
"#777777>|</> <cyan>{name:.<8}</cyan>:<cyan>{function:.<8}</cyan>:<cyan>{line: >4}</cyan> <fg "
|
||||
"#777777>-</> <level>{message}</level>",
|
||||
colorize=True,
|
||||
level=os.getenv("LOG_LEVEL", "DEBUG"), # 根据环境设置日志级别,默认为DEBUG
|
||||
)
|
||||
else:
|
||||
logger.add(
|
||||
sys.stderr,
|
||||
format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> <fg #777777>|</> <level>{level: <7}</level> <fg "
|
||||
"#777777>|</> <cyan>{name:.<8}</cyan>:<cyan>{function:.<8}</cyan>:<cyan>{line: >4}</cyan> <fg "
|
||||
"#777777>-</> <level>{message}</level>",
|
||||
colorize=True,
|
||||
level=os.getenv("LOG_LEVEL", "INFO"), # 根据环境设置日志级别,默认为INFO
|
||||
filter=lambda record: "nonebot" not in record["name"]
|
||||
)
|
||||
|
||||
def load_logger():
|
||||
logger.remove()
|
||||
|
||||
# 配置日志基础路径
|
||||
log_path = os.path.join(os.getcwd(), "logs")
|
||||
if not os.path.exists(log_path):
|
||||
os.makedirs(log_path)
|
||||
|
||||
current_env = os.getenv("ENV", "dev")
|
||||
|
||||
# 公共配置参数
|
||||
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
|
||||
)
|
||||
log_format = (
|
||||
"<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> "
|
||||
"<fg #777777>|</> <level>{level: <7}</level> "
|
||||
"<fg #777777>|</> <cyan>{name:.<8}</cyan>:<cyan>{function:.<8}</cyan>:<cyan>{line: >4}</cyan> "
|
||||
"<fg #777777>-</> <level>{message}</level>"
|
||||
)
|
||||
|
||||
# 日志文件储存至/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 +169,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(
|
||||
f"provider 内容:{config}\n"
|
||||
f"env_config 内容:{env_config}"
|
||||
)
|
||||
logger.error(f"provider 内容:{config}\nenv_config 内容:{env_config}")
|
||||
raise ValueError(f"请检查 '{provider_name}' 提供商配置是否丢失 BASE_URL 或 KEY 环境变量")
|
||||
|
||||
|
||||
@@ -192,7 +198,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 +208,7 @@ async def uvicorn_main():
|
||||
def raw_main():
|
||||
# 利用 TZ 环境变量设定程序工作的时区
|
||||
# 仅保证行为一致,不依赖 localtime(),实际对生产环境几乎没有作用
|
||||
if platform.system().lower() != 'windows':
|
||||
if platform.system().lower() != "windows":
|
||||
time.tzset()
|
||||
|
||||
easter_egg()
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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=
|
||||
|
||||
Reference in New Issue
Block a user