From 63307633c23ed6ab54671d0607cce60e42005fb7 Mon Sep 17 00:00:00 2001 From: RockChinQ <1010553892@qq.com> Date: Fri, 29 Mar 2024 17:34:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20chatcmpl=E8=AF=B7=E6=B1=82=E6=97=B6?= =?UTF-8?q?=E4=B9=9F=E5=BF=BD=E7=95=A5=E7=A9=BA=E7=9A=84=20system=20prompt?= =?UTF-8?q?=20message=20(#745)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/provider/modelmgr/apis/anthropicmsgs.py | 2 +- pkg/provider/modelmgr/apis/chatcmpl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/provider/modelmgr/apis/anthropicmsgs.py b/pkg/provider/modelmgr/apis/anthropicmsgs.py index 71423e0a..42bd3856 100644 --- a/pkg/provider/modelmgr/apis/anthropicmsgs.py +++ b/pkg/provider/modelmgr/apis/anthropicmsgs.py @@ -37,7 +37,7 @@ class AnthropicMessages(api.LLMAPIRequester): args["model"] = query.use_model.name if query.use_model.model_name is None else query.use_model.model_name req_messages = [ # req_messages 仅用于类内，外部同步由 query.messages 进行 - m.dict(exclude_none=True) for m in query.prompt.messages + m.dict(exclude_none=True) for m in query.prompt.messages if m.content.strip() != "" ] + [m.dict(exclude_none=True) for m in query.messages] # 删除所有 role=system & content='' 的消息 diff --git a/pkg/provider/modelmgr/apis/chatcmpl.py b/pkg/provider/modelmgr/apis/chatcmpl.py index f637f16f..afdeb19d 100644 --- a/pkg/provider/modelmgr/apis/chatcmpl.py +++ b/pkg/provider/modelmgr/apis/chatcmpl.py @@ -93,7 +93,7 @@ class OpenAIChatCompletions(api.LLMAPIRequester): pending_tool_calls = [] req_messages = [ # req_messages 仅用于类内，外部同步由 query.messages 进行 - m.dict(exclude_none=True) for m in query.prompt.messages + m.dict(exclude_none=True) for m in query.prompt.messages if m.content.strip() != "" ] + [m.dict(exclude_none=True) for m in query.messages] # req_messages.append({"role": "user", "content": str(query.message_chain)})