mirror of
https://github.com/LiteyukiStudio/nonebot-plugin-marshoai.git
synced 2025-06-06 14:05:23 +00:00
修复流式请求思维链未包含在结构体问题
This commit is contained in:
parent
75d173bed7
commit
41cb287a84
@ -1,6 +1,6 @@
|
|||||||
<!--suppress LongLine -->
|
<!--suppress LongLine -->
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<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>
|
<a href="https://marsho.liteyuki.icu"><img src="https://marsho.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
|
||||||
<br>
|
<br>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ _谁不喜欢回复消息快又可爱的猫娘呢?_
|
|||||||
|
|
||||||
## 😼 使用
|
## 😼 使用
|
||||||
|
|
||||||
请查看[使用文档](https://marshoai-docs.pages.liteyuki.icu/start/use)
|
请查看[使用文档](https://marsho.liteyuki.icu/start/use)
|
||||||
|
|
||||||
## ❤ 鸣谢&版权说明
|
## ❤ 鸣谢&版权说明
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<!--suppress LongLine -->
|
<!--suppress LongLine -->
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<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>
|
<a href="https://marsho.liteyuki.icu"><img src="https://marsho.liteyuki.icu/marsho-full.svg" width="800" height="430" alt="MarshoLogo"></a>
|
||||||
<br>
|
<br>
|
||||||
</div>
|
</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!
|
- 🐾 Play! I like play with friends!
|
||||||
|
|
||||||
## 😼 Usage
|
## 😼 Usage
|
||||||
Please read [Documentation](https://marshoai-docs.pages.liteyuki.icu/start/install)
|
Please read [Documentation](https://marsho.liteyuki.icu/start/install)
|
||||||
|
|
||||||
## ❤ Thanks&Copyright
|
## ❤ Thanks&Copyright
|
||||||
This project uses the following code from other projects:
|
This project uses the following code from other projects:
|
||||||
|
@ -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.
|
MarshoTools is a feature added in `v0.5.0`, support loading external function library to provide Function Call for Marsho.
|
||||||
|
|
||||||
## 🧩 Marsho Plugin
|
## 🧩 Marsho Plugin
|
||||||
Marsho Plugin is a feature added in `v1.0.0`, replacing the old MarshoTools feature. [Documentation](https://marshoai-docs.pages.liteyuki.icu/dev/extension)
|
Marsho Plugin is a feature added in `v1.0.0`, replacing the old MarshoTools feature. [Documentation](https://marsho.liteyuki.icu/dev/extension)
|
||||||
|
|
||||||
## 👍 Praise list
|
## 👍 Praise list
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ GitHub Models API 的限制较多,不建议使用,建议通过修改`MARSHOA
|
|||||||
|
|
||||||
## 🧩 小棉插件
|
## 🧩 小棉插件
|
||||||
|
|
||||||
小棉插件是`v1.0.0`的新增功能,替代旧的小棉工具功能。[使用文档](https://marshoai-docs.pages.liteyuki.icu/dev/extension)
|
小棉插件是`v1.0.0`的新增功能,替代旧的小棉工具功能。[使用文档](https://marsho.liteyuki.icu/dev/extension)
|
||||||
|
|
||||||
## 👍 夸赞名单
|
## 👍 夸赞名单
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ OPENAI_NEW_MODELS: list = [
|
|||||||
INTRODUCTION: str = f"""MarshoAI-NoneBot by LiteyukiStudio
|
INTRODUCTION: str = f"""MarshoAI-NoneBot by LiteyukiStudio
|
||||||
你好喵~我是一只可爱的猫娘AI,名叫小棉~🐾!
|
你好喵~我是一只可爱的猫娘AI,名叫小棉~🐾!
|
||||||
我的主页在这里哦~↓↓↓
|
我的主页在这里哦~↓↓↓
|
||||||
https://marshoai-docs.pages.liteyuki.icu
|
https://marsho.liteyuki.icu
|
||||||
|
|
||||||
※ 使用 「{config.marshoai_default_name}.status」命令获取状态信息。
|
※ 使用 「{config.marshoai_default_name}.status」命令获取状态信息。
|
||||||
※ 使用「{config.marshoai_default_name}.help」命令获取使用说明。"""
|
※ 使用「{config.marshoai_default_name}.help」命令获取使用说明。"""
|
||||||
|
@ -210,10 +210,7 @@ class MarshoHandler:
|
|||||||
tools_list=tools_list,
|
tools_list=tools_list,
|
||||||
tool_message=tool_message,
|
tool_message=tool_message,
|
||||||
)
|
)
|
||||||
if isinstance(response, ChatCompletion):
|
choice = response.choices[0] # type: ignore
|
||||||
choice = response.choices[0]
|
|
||||||
else:
|
|
||||||
raise ValueError("Unexpected response type")
|
|
||||||
# Sprint(choice)
|
# Sprint(choice)
|
||||||
# 当tool_calls非空时,将finish_reason设置为TOOL_CALLS
|
# 当tool_calls非空时,将finish_reason设置为TOOL_CALLS
|
||||||
if choice.message.tool_calls is not None and config.marshoai_fix_toolcalls:
|
if choice.message.tool_calls is not None and config.marshoai_fix_toolcalls:
|
||||||
@ -311,6 +308,8 @@ class MarshoHandler:
|
|||||||
role="assistant",
|
role="assistant",
|
||||||
tool_calls=last_chunk.choices[0].delta.tool_calls, # type: ignore
|
tool_calls=last_chunk.choices[0].delta.tool_calls, # type: ignore
|
||||||
)
|
)
|
||||||
|
if reasoning_contents != "":
|
||||||
|
setattr(message, "reasoning_content", reasoning_contents)
|
||||||
choice = Choice(
|
choice = Choice(
|
||||||
finish_reason=last_chunk.choices[0].finish_reason, # type: ignore
|
finish_reason=last_chunk.choices[0].finish_reason, # type: ignore
|
||||||
index=last_chunk.choices[0].index,
|
index=last_chunk.choices[0].index,
|
||||||
|
@ -34,7 +34,7 @@ dependencies = [
|
|||||||
license = { text = "MIT, Mulan PSL v2" }
|
license = { text = "MIT, Mulan PSL v2" }
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
Homepage = "https://marshoai-docs.pages.liteyuki.icu/"
|
Homepage = "https://marsho.liteyuki.icu/"
|
||||||
|
|
||||||
|
|
||||||
[tool.nonebot]
|
[tool.nonebot]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user