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

ChatOn: Wrap getting begin in try-catch,

Browse source 
so that even if a role doesnt contain begin, the logic will work
fine.
This commit is contained in:
HanishKVC 2024-04-23 15:01:41 +05:30
parent d70fca7a45
commit 724ff38345
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/chaton.hpp
View file

@ -92,7 +92,12 @@ inline bool chaton_meta_load(std::string &fname) {
// NOTE: This currently doesnt return about which parts of the tagged message contain tags and which parts the user message // NOTE: This currently doesnt return about which parts of the tagged message contain tags and which parts the user message
inline std::string chaton_tmpl_apply_single(const std::string &tmpl, const std::string &role, const std::string &content) { inline std::string chaton_tmpl_apply_single(const std::string &tmpl, const std::string &role, const std::string &content) {
std::stringstream ss; std::stringstream ss;
std::string begin = conMeta[tmpl][role][K_BEGIN]; std::string begin = "";
try {
begin = conMeta[tmpl][role][K_BEGIN];
} catch (json::exception &err) {
}
std::string prefix = conMeta[tmpl][role][K_PREFIX]; std::string prefix = conMeta[tmpl][role][K_PREFIX];
std::string suffix = conMeta[tmpl][role][K_SUFFIX]; std::string suffix = conMeta[tmpl][role][K_SUFFIX];
ss << begin << prefix << content << suffix; ss << begin << prefix << content << suffix;
@ -114,7 +119,12 @@ inline std::string chaton_tmpl_apply(const std::string &tmpl, const std::vector<
for(const auto msg: msgs) { for(const auto msg: msgs) {
auto role = msg.role; auto role = msg.role;
auto content = msg.content; auto content = msg.content;
auto begin = conMeta[tmpl][role][K_BEGIN]; std::string begin = "";
try {
begin = conMeta[tmpl][role][K_BEGIN];
} catch (json::exception &err) {
}
auto prefix = conMeta[tmpl][role][K_PREFIX]; auto prefix = conMeta[tmpl][role][K_PREFIX];
if (role == K_SYSTEM) { if (role == K_SYSTEM) {
cntSystem += 1; cntSystem += 1;