1
0
forked from bot/app

fix: 插件列表显示错误问题

This commit is contained in:
2024-03-23 19:55:12 +08:00
parent ca0bfe0181
commit de0c073c26
24 changed files with 145 additions and 63 deletions

1
src/utils/__init__.py Normal file
View File

@ -0,0 +1 @@
from .log import logger

View File

@ -7,7 +7,7 @@ from collections.abc import Iterable
import nonebot
from pydantic import BaseModel
from typing_extensions import Any
from typing import Any
BaseIterable = list | tuple | set | dict

View File

@ -5,7 +5,7 @@
import json
import locale
import os
from typing_extensions import Any
from typing import Any
import nonebot

88
src/utils/log.py Normal file
View File

@ -0,0 +1,88 @@
import sys
import logging
from typing import TYPE_CHECKING
import loguru
if TYPE_CHECKING:
# avoid sphinx autodoc resolve annotation failed
# because loguru module do not have `Logger` class actually
from loguru import Logger, Record
# logger = logging.getLogger("nonebot")
logger: "Logger" = loguru.logger
"""NoneBot 日志记录器对象。
默认信息:
- 格式: `[%(asctime)s %(name)s] %(levelname)s: %(message)s`
- 等级: `INFO` ,根据 `config.log_level` 配置改变
- 输出: 输出至 stdout
用法:
```python
from nonebot.log import logger
```
"""
# default_handler = logging.StreamHandler(sys.stdout)
# default_handler.setFormatter(
# logging.Formatter("[%(asctime)s %(name)s] %(levelname)s: %(message)s"))
# logger.addHandler(default_handler)
class LoguruHandler(logging.Handler): # pragma: no cover
"""logging 与 loguru 之间的桥梁,将 logging 的日志转发到 loguru。"""
def emit(self, record: logging.LogRecord):
try:
level = logger.level(record.levelname).name
except ValueError:
level = record.levelno
frame, depth = sys._getframe(6), 6
while frame and frame.f_code.co_filename == logging.__file__:
frame = frame.f_back
depth += 1
logger.opt(depth=depth, exception=record.exc_info).log(
level, record.getMessage()
)
def default_filter(record: "Record"):
"""默认的日志过滤器,根据 `config.log_level` 配置改变日志等级。"""
log_level = record["extra"].get("nonebot_log_level", "INFO")
levelno = logger.level(log_level).no if isinstance(log_level, str) else log_level
return record["level"].no >= levelno
default_format: str = (
"<g>{time:MM-DD HH:mm:ss}</g> "
"<lvl>[{level.icon}]</lvl> "
"<c><{name}></c> "
"{message}"
)
"""默认日志格式"""
logger.remove()
logger_id = logger.add(
sys.stdout,
level=0,
diagnose=False,
filter=default_filter,
format=default_format,
)
logger.level("DEBUG", color="<cyan>", icon="DEBU")
logger.level("INFO", color="<white>", icon="INFO")
logger.level("SUCCESS", color="<green>", icon="✅SUCC")
logger.level("WARNING", color="<yellow>", icon="WARN")
logger.level("ERROR", color="<red>", icon="ERRO")
"""默认日志处理器 id"""
__autodoc__ = {
"logger_id": False
}

View File

@ -1,20 +1,20 @@
import nonebot
from nonebot.adapters.onebot import v11, v12
from typing_extensions import Any
from typing import Any
from .tools import de_escape, encode_url
from .typing import T_Bot, T_MessageEvent
from .ly_typing import T_Bot, T_MessageEvent
async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None, session_id: str | int = None, event: T_MessageEvent = None, **kwargs) -> dict[str, Any]:
async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None, session_id: str | int = None, event: T_MessageEvent = None, **kwargs) -> dict[
str, Any]:
formatted_md = de_escape(markdown).replace("\n", r"\n").replace("\"", r'\\\"')
if event is not None and message_type is None:
message_type = event.message_type
session_id = event.user_id if event.message_type == "private" else event.group_id
try:
forward_data = await bot.call_api(
api="send_private_forward_msg",
user_id=bot.self_id,
forward_id = await bot.call_api(
api="send_forward_msg",
messages=[
v11.MessageSegment(
type="node",
@ -27,7 +27,7 @@ async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None,
"data": {
"content": '{"content":"%s"}' % formatted_md
}
}
},
]
},
)
@ -41,15 +41,14 @@ async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None,
v11.MessageSegment(
type="longmsg",
data={
"id": forward_data["forward_id"]
"id": forward_id
}
),
],
**kwargs
)
except Exception as e:
nonebot.logger.warning("send_markdown error, send as plane text: %s" % e)
nonebot.logger.warning("send_markdown error, send as plain text: %s" % e.__repr__())
if isinstance(bot, v11.Bot):
data = await bot.send_msg(
message_type=message_type,

View File

@ -1,6 +1,6 @@
from nonebot.adapters.onebot import v11
from src.utils.typing import T_GroupMessageEvent, T_MessageEvent
from src.utils.ly_typing import T_GroupMessageEvent, T_MessageEvent
GROUP_ADMIN = v11.GROUP_ADMIN
GROUP_OWNER = v11.GROUP_OWNER

View File

@ -2,7 +2,7 @@ import os
import nonebot
import yaml
from typing_extensions import Any
from typing import Any
from src.utils.data import LiteModel