简化marsho命令输出,将命令列表移入marsho.help命令

This commit is contained in:
Asankilp 2024-12-16 23:22:54 +08:00
parent 6b8b76edc4
commit 1df988d439
2 changed files with 20 additions and 11 deletions

View File

@ -64,6 +64,13 @@ marsho_cmd = on_alconna(
priority=10, priority=10,
block=True, block=True,
) )
marsho_help_cmd = on_alconna(
Alconna(
config.marshoai_default_name + ".help",
),
priority=10,
block=True,
)
marsho_at = on_message(rule=to_me() & at_enable, priority=11) marsho_at = on_message(rule=to_me() & at_enable, priority=11)
nickname_cmd = on_alconna( nickname_cmd = on_alconna(
Alconna( Alconna(
@ -208,6 +215,11 @@ async def refresh_data():
await refresh_data_cmd.finish("已刷新数据") await refresh_data_cmd.finish("已刷新数据")
@marsho_help_cmd.handle()
async def marsho_help():
await marsho_help_cmd.finish(metadata.usage)
@marsho_at.handle() @marsho_at.handle()
@marsho_cmd.handle() @marsho_cmd.handle()
async def marsho( async def marsho(
@ -225,8 +237,8 @@ async def marsho(
text = event.get_message() # type: ignore text = event.get_message() # type: ignore
if not text: if not text:
# 发送说明 # 发送说明
await UniMessage(metadata.usage + "\n当前使用的模型:" + model_name).send() # await UniMessage(metadata.usage + "\n当前使用的模型" + model_name).send()
await marsho_cmd.finish(INTRODUCTION) await marsho_cmd.finish(INTRODUCTION + "\n当前使用的模型:" + model_name)
try: try:
user_id = event.get_user_id() user_id = event.get_user_id()
nicknames = await get_nicknames() nicknames = await get_nicknames()

View File

@ -2,8 +2,7 @@ import re
from .config import config from .config import config
USAGE: str = f"""MarshoAI-NoneBot Beta by Asankilp USAGE: str = f"""用法:
用法
{config.marshoai_default_name} <聊天内容> : Marsho 进行对话当模型为 GPT-4o(-mini) 等时可以带上图片进行对话 {config.marshoai_default_name} <聊天内容> : Marsho 进行对话当模型为 GPT-4o(-mini) 等时可以带上图片进行对话
nickname [昵称] : 为自己设定昵称设置昵称后Marsho 会根据你的昵称进行回答使用'nickname reset'命令可清除自己设定的昵称 nickname [昵称] : 为自己设定昵称设置昵称后Marsho 会根据你的昵称进行回答使用'nickname reset'命令可清除自己设定的昵称
reset : 重置当前会话的上下文 需要加上命令前缀使用(默认为'/') reset : 重置当前会话的上下文 需要加上命令前缀使用(默认为'/')
@ -26,14 +25,12 @@ SUPPORT_IMAGE_MODELS: list = [
"llama-3.2-11b-vision-instruct", "llama-3.2-11b-vision-instruct",
] ]
REASONING_MODELS: list = ["o1-preview", "o1-mini"] REASONING_MODELS: list = ["o1-preview", "o1-mini"]
INTRODUCTION: str = """你好喵~我是一只可爱的猫娘AI名叫小棉~🐾! INTRODUCTION: str = f"""MarshoAI-NoneBot by LiteyukiStudio
我的代码在这里哦~ 你好喵~我是一只可爱的猫娘AI名叫小棉~🐾
https://github.com/LiteyukiStudio/nonebot-plugin-marshoai 我的主页在这里哦~
https://marsho.liteyuki.icu
也可以关注一下还在成长中的 Melobot 酱喵~ 使用{config.marshoai_default_name}.help命令获取使用说明"""
https://github.com/Meloland/melobot
我与 Melobot 酱贴贴的代码在这里喵~
https://github.com/LiteyukiStudio/marshoai-melo"""
# 正则匹配代码块 # 正则匹配代码块