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

ChatON: Add alertAssistantAtEnd flag & logic wrt MultiMsgs Apply

Browse source 
While sending the current chat session along with new user query
to the model, many models expect that a tag be added at the end
to indicate that user is expecting the model to respond, this
flags allows for the same.
This commit is contained in:
HanishKVC 2024-04-26 06:55:41 +05:30
parent ea3a0f19cc
commit e62699f923
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/chaton.hpp
View file

@ -303,7 +303,8 @@ inline bool chaton_tmpl_apply_ex(
const std::vector<llama_chat_message> &msgs, const std::vector<llama_chat_message> &msgs,
std::string &tagged, std::string &tagged,
std::string &types, std::string &types,
std::vector<int> &lens std::vector<int> &lens,
bool alertAssistantAtEnd
) { ) {
ChatParts cp = {}; ChatParts cp = {};
std::stringstream ss; std::stringstream ss;
@ -364,6 +365,11 @@ inline bool chaton_tmpl_apply_ex(
cp.add_part(ChatParts::S, end); cp.add_part(ChatParts::S, end);
} }
} }
if (alertAssistantAtEnd) {
auto assistantBeginPrefix = chaton_tmpl_role_kv(tmpl, K_ASSISTANT, {K_BEGIN, K_PREFIX});
ss << assistantBeginPrefix;
cp.add_part(ChatParts::S, assistantBeginPrefix);
}
auto globalEnd = chaton_tmpl_role_kv(tmpl, K_GLOBAL, {K_END}); auto globalEnd = chaton_tmpl_role_kv(tmpl, K_GLOBAL, {K_END});
ss << globalEnd; ss << globalEnd;
cp.add_part(ChatParts::S, globalEnd); cp.add_part(ChatParts::S, globalEnd);
@ -384,11 +390,15 @@ inline bool chaton_tmpl_apply_ex(
// global-begin + [[role-begin] + [role-prefix] + msg + role-suffix] + global-end // global-begin + [[role-begin] + [role-prefix] + msg + role-suffix] + global-end
// if there is a combination of system-user messages, // if there is a combination of system-user messages,
// then 1st user message will have user-prefix only if systemuser-1st-user-has-prefix is true // then 1st user message will have user-prefix only if systemuser-1st-user-has-prefix is true
inline std::string chaton_tmpl_apply(const std::string &tmpl, const std::vector<llama_chat_message> &msgs) { inline std::string chaton_tmpl_apply(
const std::string &tmpl,
const std::vector<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;
chaton_tmpl_apply_ex(tmpl, msgs, tagged, types, lens); chaton_tmpl_apply_ex(tmpl, msgs, tagged, types, lens, alertAssistantAtEnd);
return tagged; return tagged;
} }