mirror of
https://github.com/LiteyukiStudio/nonebot-plugin-marshoai.git
synced 2025-12-24 08:06:40 +00:00
Compare commits
22 Commits
feat/strea
...
feat/react
| Author | SHA1 | Date | |
|---|---|---|---|
| f9f15c1662 | |||
| b21ff56f43 | |||
| 454dd16cbd | |||
| 3a1a0c39fd | |||
| c9d2ef7885 | |||
|
|
ff6369c1a5 | ||
|
|
c00cb19e9e | ||
| e4490334fa | |||
| fce3152e17 | |||
| 9878114376 | |||
| 21b695f2d4 | |||
| 02d465112f | |||
| d95928cab7 | |||
| 41cb287a84 | |||
| a0f2b52e59 | |||
| 75d173bed7 | |||
| f39f5cc1be | |||
| 70fd176904 | |||
| 57ea4fc10b | |||
| a1ddf40610 | |||
| dc294a257d | |||
|
|
6f085b36c6 |
10
.github/workflows/docs-build.yml
vendored
10
.github/workflows/docs-build.yml
vendored
@@ -1,9 +1,6 @@
|
||||
name: Deploy VitePress site to Liteyuki PaaS
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
on: ["push", "pull_request_target"]
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -28,7 +25,7 @@ jobs:
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: '3.11'
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Setup API markdown
|
||||
run: |-
|
||||
@@ -52,11 +49,10 @@ jobs:
|
||||
run: |-
|
||||
pnpm run docs:build
|
||||
|
||||
|
||||
- name: "发布"
|
||||
run: |
|
||||
npx -p "@getmeli/cli" meli upload docs/.vitepress/dist \
|
||||
--url "https://meli.liteyuki.icu" \
|
||||
--url "https://pages.liteyuki.icu" \
|
||||
--site "$MELI_SITE" \
|
||||
--token "$MELI_TOKEN" \
|
||||
--release "$GITHUB_SHA"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!--suppress LongLine -->
|
||||
<div align="center">
|
||||
<a href="https://marsho.liteyuki.icu"><img src="https://marsho.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
|
||||
<a href="https://marshoai-docs.pages.liteyuki.icu"><img src="https://marshoai-docs.pages.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
|
||||
<br>
|
||||
</div>
|
||||
|
||||
@@ -48,7 +48,7 @@ _谁不喜欢回复消息快又可爱的猫娘呢?_
|
||||
|
||||
## 😼 使用
|
||||
|
||||
请查看[使用文档](https://marsho.liteyuki.icu/start/use)
|
||||
请查看[使用文档](https://marshoai-docs.pages.liteyuki.icu/start/use.html)
|
||||
|
||||
## ❤ 鸣谢&版权说明
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!--suppress LongLine -->
|
||||
<div align="center">
|
||||
<a href="https://marsho.liteyuki.icu"><img src="https://marsho.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
|
||||
<a href="https://marshoai-docs.pages.liteyuki.icu"><img src="https://marshoai-docs.pages.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
|
||||
<br>
|
||||
</div>
|
||||
|
||||
@@ -48,7 +48,7 @@ Plugin internally installed the catgirl character of Marsho, is able to have a c
|
||||
- 🐾 Play! I like play with friends!
|
||||
|
||||
## 😼 Usage
|
||||
Please read [Documentation](https://marsho.liteyuki.icu/start/install)
|
||||
Please read [Documentation](https://marshoai-docs.pages.liteyuki.icu/start/use.html)
|
||||
|
||||
## ❤ Thanks&Copyright
|
||||
This project uses the following code from other projects:
|
||||
|
||||
@@ -8,12 +8,13 @@ import { generateSidebar } from 'vitepress-sidebar'
|
||||
// https://vitepress.dev/reference/site-config
|
||||
export default defineConfig({
|
||||
head: [
|
||||
["script", { src: "https://cdn.liteyuki.icu/js/liteyuki_footer.js" }],
|
||||
['link', { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }],
|
||||
],
|
||||
rewrites: {
|
||||
[`${defaultLang}/:rest*`]: ":rest*",
|
||||
},
|
||||
cleanUrls: true,
|
||||
cleanUrls: false,
|
||||
themeConfig: {
|
||||
// https://vitepress.dev/reference/default-theme-config
|
||||
logo: {
|
||||
|
||||
@@ -65,7 +65,7 @@ When nonebot linked to OneBot v11 adapter, can recieve double click and response
|
||||
MarshoTools is a feature added in `v0.5.0`, support loading external function library to provide Function Call for Marsho.
|
||||
|
||||
## 🧩 Marsho Plugin
|
||||
Marsho Plugin is a feature added in `v1.0.0`, replacing the old MarshoTools feature. [Documentation](https://marsho.liteyuki.icu/dev/extension)
|
||||
Marsho Plugin is a feature added in `v1.0.0`, replacing the old MarshoTools feature. [Documentation](https://marshoai-docs.pages.liteyuki.icu/dev/extension)
|
||||
|
||||
## 👍 Praise list
|
||||
|
||||
@@ -147,4 +147,5 @@ Add options in the `.env` file from the diagram below in nonebot2 project.
|
||||
| MARSHOAI_ENABLE_RICHTEXT_PARSE | `bool` | `true` | Turn on auto parse rich text feature(including image, LaTeX equation) |
|
||||
| MARSHOAI_SINGLE_LATEX_PARSE | `bool` | `false`| Render single-line equation or not |
|
||||
| MARSHOAI_FIX_TOOLCALLS | `bool` | `true` | Fix tool calls or not |
|
||||
| MARSHOAI_SEND_THINKING | `bool` | `true` | Send thinking chain or not |
|
||||
| MARSHOAI_SEND_THINKING | `bool` | `true` | Send thinking chain or not |
|
||||
| MARSHOAI_STREAM | `bool` | `false`| 是否通过流式方式请求 API **开启此项后暂无法使用函数调用,无法在 Bot 用户侧聊天界面呈现出流式效果** |
|
||||
|
||||
@@ -68,7 +68,7 @@ GitHub Models API 的限制较多,不建议使用,建议通过修改`MARSHOA
|
||||
|
||||
## 🧩 小棉插件
|
||||
|
||||
小棉插件是`v1.0.0`的新增功能,替代旧的小棉工具功能。[使用文档](https://marsho.liteyuki.icu/dev/extension)
|
||||
小棉插件是`v1.0.0`的新增功能,替代旧的小棉工具功能。[使用文档](https://marshoai-docs.pages.liteyuki.icu/dev/extension)
|
||||
|
||||
## 👍 夸赞名单
|
||||
|
||||
@@ -149,6 +149,8 @@ GitHub Models API 的限制较多,不建议使用,建议通过修改`MARSHOA
|
||||
| MARSHOAI_SINGLE_LATEX_PARSE | `bool` | `false` | 单行公式是否渲染(当消息富文本解析启用时可用)(如果单行也渲……只能说不好看) |
|
||||
| MARSHOAI_FIX_TOOLCALLS | `bool` | `true` | 是否修复工具调用(部分模型须关闭,使用 vLLM 部署的模型时须关闭) |
|
||||
| MARSHOAI_SEND_THINKING | `bool` | `true` | 是否发送思维链(部分模型不支持) |
|
||||
| MARSHOAI_STREAM | `bool` | `false`| 是否通过流式方式请求 API **开启此项后暂无法使用函数调用,无法在 Bot 用户侧聊天界面呈现出流式效果** |
|
||||
|
||||
|
||||
#### 开发及调试选项
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ class ConfigModel(BaseModel):
|
||||
marshoai_enable_sysasuser_prompt: bool = False
|
||||
marshoai_additional_prompt: str = ""
|
||||
marshoai_poke_suffix: str = "揉了揉你的猫耳"
|
||||
marshoai_stream: bool = False
|
||||
marshoai_enable_richtext_parse: bool = True
|
||||
"""
|
||||
是否启用自动消息富文本解析 即若包含图片链接则发送图片、若包含LaTeX公式则发送公式图。
|
||||
|
||||
@@ -37,7 +37,7 @@ OPENAI_NEW_MODELS: list = [
|
||||
INTRODUCTION: str = f"""MarshoAI-NoneBot by LiteyukiStudio
|
||||
你好喵~我是一只可爱的猫娘AI,名叫小棉~🐾!
|
||||
我的主页在这里哦~↓↓↓
|
||||
https://marsho.liteyuki.icu
|
||||
https://marshoai-docs.pages.liteyuki.icu
|
||||
|
||||
※ 使用 「{config.marshoai_default_name}.status」命令获取状态信息。
|
||||
※ 使用「{config.marshoai_default_name}.help」命令获取使用说明。"""
|
||||
|
||||
@@ -17,9 +17,9 @@ from nonebot.matcher import (
|
||||
current_event,
|
||||
current_matcher,
|
||||
)
|
||||
from nonebot_plugin_alconna.uniseg import UniMessage, UniMsg
|
||||
from openai import AsyncOpenAI
|
||||
from openai.types.chat import ChatCompletion, ChatCompletionMessage
|
||||
from nonebot_plugin_alconna.uniseg import UniMessage, UniMsg, get_message_id, get_target
|
||||
from openai import AsyncOpenAI, AsyncStream
|
||||
from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletionMessage
|
||||
|
||||
from .config import config
|
||||
from .constants import SUPPORT_IMAGE_MODELS
|
||||
@@ -35,6 +35,7 @@ from .util import (
|
||||
make_chat_openai,
|
||||
parse_richtext,
|
||||
)
|
||||
from .utils.request import process_chat_stream
|
||||
|
||||
|
||||
class MarshoHandler:
|
||||
@@ -49,8 +50,8 @@ class MarshoHandler:
|
||||
self.event: Event = current_event.get()
|
||||
# self.state: T_State = current_handler.get().state
|
||||
self.matcher: Matcher = current_matcher.get()
|
||||
self.message_id: str = UniMessage.get_message_id(self.event)
|
||||
self.target = UniMessage.get_target(self.event)
|
||||
self.message_id: str = get_message_id(self.event)
|
||||
self.target = get_target(self.event)
|
||||
|
||||
async def process_user_input(
|
||||
self, user_input: UniMsg, model_name: str
|
||||
@@ -94,14 +95,15 @@ class MarshoHandler:
|
||||
self,
|
||||
user_message: Union[str, list],
|
||||
model_name: str,
|
||||
tools_list: list,
|
||||
tools_list: list | None,
|
||||
tool_message: Optional[list] = None,
|
||||
) -> ChatCompletion:
|
||||
stream: bool = False,
|
||||
) -> Union[ChatCompletion, AsyncStream[ChatCompletionChunk]]:
|
||||
"""
|
||||
处理单条聊天
|
||||
"""
|
||||
|
||||
context_msg = get_prompt(model_name) + (
|
||||
context_msg = await get_prompt(model_name) + (
|
||||
self.context.build(self.target.id, self.target.private)
|
||||
)
|
||||
response = await make_chat_openai(
|
||||
@@ -109,20 +111,24 @@ class MarshoHandler:
|
||||
msg=context_msg + [UserMessage(content=user_message).as_dict()] + (tool_message if tool_message else []), # type: ignore
|
||||
model_name=model_name,
|
||||
tools=tools_list if tools_list else None,
|
||||
stream=stream,
|
||||
)
|
||||
return response
|
||||
|
||||
async def handle_function_call(
|
||||
self,
|
||||
completion: ChatCompletion,
|
||||
completion: Union[ChatCompletion],
|
||||
user_message: Union[str, list],
|
||||
model_name: str,
|
||||
tools_list: list,
|
||||
tools_list: list | None = None,
|
||||
):
|
||||
# function call
|
||||
# 需要获取额外信息,调用函数工具
|
||||
tool_msg = []
|
||||
choice = completion.choices[0]
|
||||
if isinstance(completion, ChatCompletion):
|
||||
choice = completion.choices[0]
|
||||
else:
|
||||
raise ValueError("Unexpected completion type")
|
||||
# await UniMessage(str(response)).send()
|
||||
tool_calls = choice.message.tool_calls
|
||||
# try:
|
||||
@@ -182,7 +188,7 @@ class MarshoHandler:
|
||||
self,
|
||||
user_message: Union[str, list],
|
||||
model_name: str,
|
||||
tools_list: list,
|
||||
tools_list: list | None = None,
|
||||
stream: bool = False,
|
||||
tool_message: Optional[list] = None,
|
||||
) -> Optional[Tuple[UserMessage, ChatCompletionMessage]]:
|
||||
@@ -191,14 +197,20 @@ class MarshoHandler:
|
||||
"""
|
||||
global target_list
|
||||
if stream:
|
||||
raise NotImplementedError
|
||||
response = await self.handle_single_chat(
|
||||
user_message=user_message,
|
||||
model_name=model_name,
|
||||
tools_list=tools_list,
|
||||
tool_message=tool_message,
|
||||
)
|
||||
choice = response.choices[0]
|
||||
response = await self.handle_stream_request(
|
||||
user_message=user_message,
|
||||
model_name=model_name,
|
||||
tools_list=tools_list,
|
||||
tools_message=tool_message,
|
||||
)
|
||||
else:
|
||||
response = await self.handle_single_chat( # type: ignore
|
||||
user_message=user_message,
|
||||
model_name=model_name,
|
||||
tools_list=tools_list,
|
||||
tool_message=tool_message,
|
||||
)
|
||||
choice = response.choices[0] # type: ignore
|
||||
# Sprint(choice)
|
||||
# 当tool_calls非空时,将finish_reason设置为TOOL_CALLS
|
||||
if choice.message.tool_calls is not None and config.marshoai_fix_toolcalls:
|
||||
@@ -240,3 +252,26 @@ class MarshoHandler:
|
||||
else:
|
||||
await UniMessage(f"意外的完成原因:{choice.finish_reason}").send()
|
||||
return None
|
||||
|
||||
async def handle_stream_request(
|
||||
self,
|
||||
user_message: Union[str, list],
|
||||
model_name: str,
|
||||
tools_list: list | None = None,
|
||||
tools_message: Optional[list] = None,
|
||||
) -> ChatCompletion:
|
||||
"""
|
||||
处理流式请求
|
||||
"""
|
||||
response = await self.handle_single_chat(
|
||||
user_message=user_message,
|
||||
model_name=model_name,
|
||||
tools_list=None, # TODO:让流式调用支持工具调用
|
||||
tool_message=tools_message,
|
||||
stream=True,
|
||||
)
|
||||
|
||||
if isinstance(response, AsyncStream):
|
||||
return await process_chat_stream(response)
|
||||
else:
|
||||
raise TypeError("Unexpected response type for stream request")
|
||||
|
||||
@@ -15,7 +15,14 @@ from nonebot.params import CommandArg
|
||||
from nonebot.permission import SUPERUSER
|
||||
from nonebot.rule import to_me
|
||||
from nonebot.typing import T_State
|
||||
from nonebot_plugin_alconna import MsgTarget, UniMessage, UniMsg, on_alconna
|
||||
from nonebot_plugin_alconna import (
|
||||
Emoji,
|
||||
MsgTarget,
|
||||
UniMessage,
|
||||
UniMsg,
|
||||
message_reaction,
|
||||
on_alconna,
|
||||
)
|
||||
|
||||
from .config import config
|
||||
from .constants import INTRODUCTION, SUPPORT_IMAGE_MODELS
|
||||
@@ -25,6 +32,7 @@ from .instances import client, context, model_name, target_list, tools
|
||||
from .metadata import metadata
|
||||
from .plugin.func_call.caller import get_function_calls
|
||||
from .util import *
|
||||
from .utils.request import process_chat_stream
|
||||
|
||||
|
||||
async def at_enable():
|
||||
@@ -226,6 +234,7 @@ async def marsho(
|
||||
if not text:
|
||||
# 发送说明
|
||||
# await UniMessage(metadata.usage + "\n当前使用的模型:" + model_name).send()
|
||||
await message_reaction(Emoji("38"))
|
||||
await marsho_cmd.finish(INTRODUCTION)
|
||||
backup_context = await get_backup_context(target.id, target.private)
|
||||
if backup_context:
|
||||
@@ -256,8 +265,11 @@ async def marsho(
|
||||
map(lambda v: v.data(), get_function_calls().values())
|
||||
)
|
||||
logger.info(f"正在获取回答,模型:{model_name}")
|
||||
await message_reaction(Emoji("66"))
|
||||
# logger.info(f"上下文:{context_msg}")
|
||||
response = await handler.handle_common_chat(usermsg, model_name, tools_lists)
|
||||
response = await handler.handle_common_chat(
|
||||
usermsg, model_name, tools_lists, config.marshoai_stream
|
||||
)
|
||||
# await UniMessage(str(response)).send()
|
||||
if response is not None:
|
||||
context_user, context_assistant = response
|
||||
@@ -280,20 +292,24 @@ with contextlib.suppress(ImportError): # 优化先不做()
|
||||
async def poke(event: Event):
|
||||
|
||||
user_nickname = await get_nickname_by_user_id(event.get_user_id())
|
||||
usermsg = await get_prompt(model_name) + [
|
||||
UserMessage(content=f"*{user_nickname}{config.marshoai_poke_suffix}"),
|
||||
]
|
||||
try:
|
||||
if config.marshoai_poke_suffix != "":
|
||||
logger.info(f"收到戳一戳,用户昵称:{user_nickname}")
|
||||
response = await make_chat_openai(
|
||||
|
||||
pre_response = await make_chat_openai(
|
||||
client=client,
|
||||
model_name=model_name,
|
||||
msg=get_prompt(model_name)
|
||||
+ [
|
||||
UserMessage(
|
||||
content=f"*{user_nickname}{config.marshoai_poke_suffix}"
|
||||
),
|
||||
],
|
||||
msg=usermsg,
|
||||
stream=config.marshoai_stream,
|
||||
)
|
||||
choice = response.choices[0]
|
||||
if isinstance(pre_response, AsyncStream):
|
||||
response = await process_chat_stream(pre_response)
|
||||
else:
|
||||
response = pre_response
|
||||
choice = response.choices[0] # type: ignore
|
||||
if choice.finish_reason == CompletionsFinishReason.STOPPED:
|
||||
content = extract_content_and_think(choice.message)[0]
|
||||
await UniMessage(" " + str(content)).send(at_sender=True)
|
||||
|
||||
@@ -5,7 +5,7 @@ from .constants import USAGE
|
||||
|
||||
metadata = PluginMetadata(
|
||||
name="Marsho AI 插件",
|
||||
description="接入 Azure API 或其他 API 的 AI 聊天插件,支持图片处理,外部函数调用,兼容包括 DeepSeek-R1 在内的多个模型",
|
||||
description="接入 Azure API 或其他 API 的 AI 聊天插件,支持图片处理,外部函数调用,兼容包括 DeepSeek-R1, QwQ-32B 在内的多个模型",
|
||||
usage=USAGE,
|
||||
type="application",
|
||||
config=ConfigModel,
|
||||
|
||||
@@ -2,8 +2,9 @@ import base64
|
||||
import json
|
||||
import mimetypes
|
||||
import re
|
||||
import ssl
|
||||
import uuid
|
||||
from typing import Any, Dict, List, Optional
|
||||
from typing import Any, Dict, List, Optional, Union
|
||||
|
||||
import aiofiles # type: ignore
|
||||
import httpx
|
||||
@@ -15,9 +16,9 @@ from nonebot.log import logger
|
||||
from nonebot_plugin_alconna import Image as ImageMsg
|
||||
from nonebot_plugin_alconna import Text as TextMsg
|
||||
from nonebot_plugin_alconna import UniMessage
|
||||
from openai import AsyncOpenAI, NotGiven
|
||||
from openai.types.chat import ChatCompletion, ChatCompletionMessage
|
||||
from zhDateTime import DateTime
|
||||
from openai import AsyncOpenAI, AsyncStream, NotGiven
|
||||
from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletionMessage
|
||||
from zhDateTime import DateTime # type: ignore
|
||||
|
||||
from ._types import DeveloperMessage
|
||||
from .cache.decos import *
|
||||
@@ -58,6 +59,8 @@ _praises_init_data = {
|
||||
"""
|
||||
初始夸赞名单之数据
|
||||
"""
|
||||
_ssl_context = ssl.create_default_context()
|
||||
_ssl_context.set_ciphers("DEFAULT")
|
||||
|
||||
|
||||
async def get_image_raw_and_type(
|
||||
@@ -74,7 +77,7 @@ async def get_image_raw_and_type(
|
||||
tuple[bytes, str]: 图片二进制数据, 图片MIME格式
|
||||
"""
|
||||
|
||||
async with httpx.AsyncClient() as client:
|
||||
async with httpx.AsyncClient(verify=_ssl_context) as client:
|
||||
response = await client.get(url, headers=_browser_headers, timeout=timeout)
|
||||
if response.status_code == 200:
|
||||
# 获取图片数据
|
||||
@@ -98,9 +101,7 @@ async def get_image_b64(url: str, timeout: int = 10) -> Optional[str]:
|
||||
return: 图片base64编码
|
||||
"""
|
||||
|
||||
if data_type := await get_image_raw_and_type(
|
||||
url.replace("https://", "http://"), timeout
|
||||
):
|
||||
if data_type := await get_image_raw_and_type(url, timeout):
|
||||
# image_format = content_type.split("/")[1] if content_type else "jpeg"
|
||||
base64_image = base64.b64encode(data_type[0]).decode("utf-8")
|
||||
data_url = "data:{};base64,{}".format(data_type[1], base64_image)
|
||||
@@ -109,35 +110,13 @@ async def get_image_b64(url: str, timeout: int = 10) -> Optional[str]:
|
||||
return None
|
||||
|
||||
|
||||
async def make_chat(
|
||||
client: ChatCompletionsClient,
|
||||
msg: list,
|
||||
model_name: str,
|
||||
tools: Optional[list] = None,
|
||||
):
|
||||
"""
|
||||
调用ai获取回复
|
||||
|
||||
参数:
|
||||
client: 用于与AI模型进行通信
|
||||
msg: 消息内容
|
||||
model_name: 指定AI模型名
|
||||
tools: 工具列表
|
||||
"""
|
||||
return await client.complete(
|
||||
messages=msg,
|
||||
model=model_name,
|
||||
tools=tools,
|
||||
**config.marshoai_model_args,
|
||||
)
|
||||
|
||||
|
||||
async def make_chat_openai(
|
||||
client: AsyncOpenAI,
|
||||
msg: list,
|
||||
model_name: str,
|
||||
tools: Optional[list] = None,
|
||||
) -> ChatCompletion:
|
||||
stream: bool = False,
|
||||
) -> Union[ChatCompletion, AsyncStream[ChatCompletionChunk]]:
|
||||
"""
|
||||
使用 Openai SDK 调用ai获取回复
|
||||
|
||||
@@ -152,20 +131,21 @@ async def make_chat_openai(
|
||||
model=model_name,
|
||||
tools=tools or NOT_GIVEN,
|
||||
timeout=config.marshoai_timeout,
|
||||
stream=stream,
|
||||
**config.marshoai_model_args,
|
||||
)
|
||||
|
||||
|
||||
@from_cache("praises")
|
||||
def get_praises():
|
||||
async def get_praises():
|
||||
praises_file = store.get_plugin_data_file(
|
||||
"praises.json"
|
||||
) # 夸赞名单文件使用localstore存储
|
||||
if not praises_file.exists():
|
||||
with open(praises_file, "w", encoding="utf-8") as f:
|
||||
json.dump(_praises_init_data, f, ensure_ascii=False, indent=4)
|
||||
with open(praises_file, "r", encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
async with aiofiles.open(praises_file, "w", encoding="utf-8") as f:
|
||||
await f.write(json.dumps(_praises_init_data, ensure_ascii=False, indent=4))
|
||||
async with aiofiles.open(praises_file, "r", encoding="utf-8") as f:
|
||||
data = json.loads(await f.read())
|
||||
praises_json = data
|
||||
return praises_json
|
||||
|
||||
@@ -181,8 +161,8 @@ async def refresh_praises_json():
|
||||
return data
|
||||
|
||||
|
||||
def build_praises() -> str:
|
||||
praises = get_praises()
|
||||
async def build_praises() -> str:
|
||||
praises = await get_praises()
|
||||
result = ["你喜欢以下几个人物,他们有各自的优点:"]
|
||||
for item in praises["like"]:
|
||||
result.append(f"名字:{item['name']},优点:{item['advantages']}")
|
||||
@@ -234,8 +214,8 @@ async def set_nickname(user_id: str, name: str):
|
||||
data[user_id] = name
|
||||
if name == "" and user_id in data:
|
||||
del data[user_id]
|
||||
with open(filename, "w", encoding="utf-8") as f:
|
||||
json.dump(data, f, ensure_ascii=False, indent=4)
|
||||
async with aiofiles.open(filename, "w", encoding="utf-8") as f:
|
||||
await f.write(json.dumps(data, ensure_ascii=False, indent=4))
|
||||
return data
|
||||
|
||||
|
||||
@@ -258,11 +238,11 @@ async def refresh_nickname_json():
|
||||
logger.error("刷新 nickname_json 表错误:无法载入 nickname.json 文件")
|
||||
|
||||
|
||||
def get_prompt(model: str) -> List[Dict[str, Any]]:
|
||||
async def get_prompt(model: str) -> List[Dict[str, Any]]:
|
||||
"""获取系统提示词"""
|
||||
prompts = config.marshoai_additional_prompt
|
||||
if config.marshoai_enable_praises:
|
||||
praises_prompt = build_praises()
|
||||
praises_prompt = await build_praises()
|
||||
prompts += praises_prompt
|
||||
|
||||
if config.marshoai_enable_time_prompt:
|
||||
|
||||
71
nonebot_plugin_marshoai/utils/request.py
Normal file
71
nonebot_plugin_marshoai/utils/request.py
Normal file
@@ -0,0 +1,71 @@
|
||||
from nonebot.log import logger
|
||||
from openai import AsyncStream
|
||||
from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletionMessage
|
||||
from openai.types.chat.chat_completion import Choice
|
||||
|
||||
|
||||
async def process_chat_stream(
|
||||
stream: AsyncStream[ChatCompletionChunk],
|
||||
) -> ChatCompletion:
|
||||
reasoning_contents = ""
|
||||
answer_contents = ""
|
||||
last_chunk = None
|
||||
is_first_token_appeared = False
|
||||
is_answering = False
|
||||
async for chunk in stream:
|
||||
last_chunk = chunk
|
||||
# print(chunk)
|
||||
if not is_first_token_appeared:
|
||||
logger.debug(f"{chunk.id}: 第一个 token 已出现")
|
||||
is_first_token_appeared = True
|
||||
if not chunk.choices:
|
||||
logger.info("Usage:", chunk.usage)
|
||||
else:
|
||||
delta = chunk.choices[0].delta
|
||||
if (
|
||||
hasattr(delta, "reasoning_content")
|
||||
and delta.reasoning_content is not None
|
||||
):
|
||||
reasoning_contents += delta.reasoning_content
|
||||
else:
|
||||
if not is_answering:
|
||||
logger.debug(
|
||||
f"{chunk.id}: 思维链已输出完毕或无 reasoning_content 字段输出"
|
||||
)
|
||||
is_answering = True
|
||||
if delta.content is not None:
|
||||
answer_contents += delta.content
|
||||
# print(last_chunk)
|
||||
# 创建新的 ChatCompletion 对象
|
||||
if last_chunk and last_chunk.choices:
|
||||
message = ChatCompletionMessage(
|
||||
content=answer_contents,
|
||||
role="assistant",
|
||||
tool_calls=last_chunk.choices[0].delta.tool_calls, # type: ignore
|
||||
)
|
||||
if reasoning_contents != "":
|
||||
setattr(message, "reasoning_content", reasoning_contents)
|
||||
choice = Choice(
|
||||
finish_reason=last_chunk.choices[0].finish_reason, # type: ignore
|
||||
index=last_chunk.choices[0].index,
|
||||
message=message,
|
||||
)
|
||||
return ChatCompletion(
|
||||
id=last_chunk.id,
|
||||
choices=[choice],
|
||||
created=last_chunk.created,
|
||||
model=last_chunk.model,
|
||||
system_fingerprint=last_chunk.system_fingerprint,
|
||||
object="chat.completion",
|
||||
usage=last_chunk.usage,
|
||||
)
|
||||
else:
|
||||
return ChatCompletion(
|
||||
id="",
|
||||
choices=[],
|
||||
created=0,
|
||||
model="",
|
||||
system_fingerprint="",
|
||||
object="chat.completion",
|
||||
usage=None,
|
||||
)
|
||||
8
pdm.lock
generated
8
pdm.lock
generated
@@ -5,7 +5,7 @@
|
||||
groups = ["default", "dev", "test"]
|
||||
strategy = ["inherit_metadata"]
|
||||
lock_version = "4.5.0"
|
||||
content_hash = "sha256:d7ab3d9ca825de512d4f87ec846f7fddcf3d5796a7c9562e60c8c7d39c058817"
|
||||
content_hash = "sha256:9dd3edfe69c332deac360af2685358e82c5dac0870900668534fc6f1d34040f8"
|
||||
|
||||
[[metadata.targets]]
|
||||
requires_python = "~=3.10"
|
||||
@@ -1485,7 +1485,7 @@ files = [
|
||||
|
||||
[[package]]
|
||||
name = "nonebot-plugin-alconna"
|
||||
version = "0.54.1"
|
||||
version = "0.57.0"
|
||||
requires_python = ">=3.9"
|
||||
summary = "Alconna Adapter for Nonebot"
|
||||
groups = ["default"]
|
||||
@@ -1499,8 +1499,8 @@ dependencies = [
|
||||
"tarina<0.7,>=0.6.8",
|
||||
]
|
||||
files = [
|
||||
{file = "nonebot_plugin_alconna-0.54.1-py3-none-any.whl", hash = "sha256:4edb4b081cd64ce37717c7a92d31aadd2cf287a5a0adc2ac86ed82d9bcad5048"},
|
||||
{file = "nonebot_plugin_alconna-0.54.1.tar.gz", hash = "sha256:66fae03120b8eff25bb0027d65f149e399aa6f73c7585ebdd388d1904cecdeee"},
|
||||
{file = "nonebot_plugin_alconna-0.57.0-py3-none-any.whl", hash = "sha256:6c4bcce1a9aa176244b4c011b19b1cea00269c4c6794cd4e90d8dd7990ec3ec9"},
|
||||
{file = "nonebot_plugin_alconna-0.57.0.tar.gz", hash = "sha256:7a9a4bf373f3f6836611dbde1a0917b84441a534dd6f2b20dae3ba6fff142858"},
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -10,7 +10,7 @@ authors = [
|
||||
]
|
||||
dependencies = [
|
||||
"nonebot2>=2.4.0",
|
||||
"nonebot-plugin-alconna>=0.48.0",
|
||||
"nonebot-plugin-alconna>=0.57.0",
|
||||
"nonebot-plugin-localstore>=0.7.1",
|
||||
"zhDatetime>=2.0.0",
|
||||
"aiohttp>=3.9",
|
||||
@@ -34,7 +34,7 @@ dependencies = [
|
||||
license = { text = "MIT, Mulan PSL v2" }
|
||||
|
||||
[project.urls]
|
||||
Homepage = "https://marsho.liteyuki.icu/"
|
||||
Homepage = "https://marshoai-docs.pages.liteyuki.icu/"
|
||||
|
||||
|
||||
[tool.nonebot]
|
||||
|
||||
Reference in New Issue
Block a user