vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ChatON:Reposition alertAssistantAtEnd flag for consistency

Browse source
This commit is contained in:
HanishKVC 2024-05-07 11:49:43 +05:30
parent 0852f3b7ec
commit b3a56545d6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/chaton.hpp
View file

@ -446,10 +446,10 @@ inline size_t chat_tmpl_apply_single_capi(
inline bool chaton_tmpl_apply_ex( inline bool chaton_tmpl_apply_ex(
const std::string &tmpl, const std::string &tmpl,
const std::vector<const llama_chat_message *> &msgs, const std::vector<const llama_chat_message *> &msgs,
bool alertAssistantAtEnd,
std::string &tagged, std::string &tagged,
std::string &types, std::string &types,
std::vector<int> &lens, std::vector<int> &lens
bool alertAssistantAtEnd
) { ) {
if (!chaton_tmpl_exists(tmpl)) { if (!chaton_tmpl_exists(tmpl)) {
return false; return false;
@ -528,7 +528,7 @@ inline int32_t chaton_tmpl_apply(
) { ) {
std::string types; std::string types;
std::vector<int> lens; std::vector<int> lens;
if (!chaton_tmpl_apply_ex(tmpl, msgs, tagged, types, lens, alertAssistantAtEnd)) { if (!chaton_tmpl_apply_ex(tmpl, msgs, alertAssistantAtEnd, tagged, types, lens)) {
return -1; return -1;
} }
return tagged.size(); return tagged.size();
@ -608,7 +608,7 @@ inline int32_t chaton_tmpl_apply_ex_capi(
std::string taggedMsgs; std::string taggedMsgs;
std::string types; std::string types;
std::vector<int> lens; std::vector<int> lens;
if (!chaton_tmpl_apply_ex(tmpl, vMsgs, taggedMsgs, types, lens, alertAssistantAtEnd)) { if (!chaton_tmpl_apply_ex(tmpl, vMsgs, alertAssistantAtEnd, taggedMsgs, types, lens)) {
return -1; return -1;
} }
int32_t taggedLength = taggedMsgs.size(); int32_t taggedLength = taggedMsgs.size();