From 5d76f08d37ea2c4c586715e0199b8bd56114f7d9 Mon Sep 17 00:00:00 2001 From: HanishKVC Date: Wed, 24 Apr 2024 22:50:29 +0530 Subject: [PATCH] ChatON: Need to explicitly specify string to use c_str --- common/chaton.hpp | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/common/chaton.hpp b/common/chaton.hpp index c8ff21c06..9c5a9b6e7 100644 --- a/common/chaton.hpp +++ b/common/chaton.hpp @@ -346,20 +346,35 @@ inline void _chaton_meta_dump(std::string &tmpl) { } LOGXLN("\n\nINFO:%s:ChatOn Meta\n%s", __func__, theJson.dump(4).c_str()); if (!tmpl.empty()) { - LOGXLN("INFO:%s:%s:%s", __func__, "global->begin", conMeta[tmpl][K_GLOBAL][K_BEGIN].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "global->end", conMeta[tmpl][K_GLOBAL][K_END].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "system->begin", conMeta[tmpl][K_SYSTEM][K_BEGIN].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "system->prefix", conMeta[tmpl][K_SYSTEM][K_PREFIX].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "system->suffix", conMeta[tmpl][K_SYSTEM][K_SUFFIX].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "system->end", conMeta[tmpl][K_SYSTEM][K_END].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "user->begin", conMeta[tmpl][K_USER][K_BEGIN].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "user->prefix", conMeta[tmpl][K_USER][K_PREFIX].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "user->suffix", conMeta[tmpl][K_USER][K_SUFFIX].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "user->end", conMeta[tmpl][K_USER][K_END].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "assistant->begin", conMeta[tmpl][K_ASSISTANT][K_BEGIN].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "assistant->prefix", conMeta[tmpl][K_ASSISTANT][K_PREFIX].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "assistant->suffix", conMeta[tmpl][K_ASSISTANT][K_SUFFIX].c_str()); - LOGXLN("INFO:%s:%s:%s", __func__, "assistant->end", conMeta[tmpl][K_ASSISTANT][K_END].c_str()); + std::string globalBegin = conMeta[tmpl][K_GLOBAL][K_BEGIN]; + std::string globalEnd = conMeta[tmpl][K_GLOBAL][K_END]; + std::string systemBegin = conMeta[tmpl][K_SYSTEM][K_BEGIN]; + std::string systemPrefix = conMeta[tmpl][K_SYSTEM][K_PREFIX]; + std::string systemSuffix = conMeta[tmpl][K_SYSTEM][K_SUFFIX]; + std::string systemEnd = conMeta[tmpl][K_SYSTEM][K_END]; + std::string userBegin = conMeta[tmpl][K_USER][K_BEGIN]; + std::string userPrefix = conMeta[tmpl][K_USER][K_PREFIX]; + std::string userSuffix = conMeta[tmpl][K_USER][K_SUFFIX]; + std::string userEnd = conMeta[tmpl][K_USER][K_END]; + std::string assistantBegin = conMeta[tmpl][K_ASSISTANT][K_BEGIN]; + std::string assistantPrefix = conMeta[tmpl][K_ASSISTANT][K_PREFIX]; + std::string assistantSuffix = conMeta[tmpl][K_ASSISTANT][K_SUFFIX]; + std::string assistantEnd = conMeta[tmpl][K_ASSISTANT][K_END]; + + LOGXLN("INFO:%s:%s:%s", __func__, "global->begin", globalBegin.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "global->end", globalEnd.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "system->begin", systemBegin.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "system->prefix", systemPrefix.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "system->suffix", systemSuffix.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "system->end", systemEnd.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "user->begin", userBegin.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "user->prefix", userPrefix.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "user->suffix", userSuffix.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "user->end", userEnd.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "assistant->begin", assistantBegin.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "assistant->prefix", assistantPrefix.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "assistant->suffix", assistantSuffix.c_str()); + LOGXLN("INFO:%s:%s:%s", __func__, "assistant->end", assistantEnd.c_str()); LOGXLN("INFO:%s:%s:%s", __func__, K_REVERSE_PROMPT, chaton_tmpl_kv(tmpl, K_REVERSE_PROMPT).c_str()); LOGXLN("INFO:%s:%s:%d", __func__, K_SYSTEMUSER_SYSTEM_HAS_SUFFIX, chaton_tmpl_kv_bool(tmpl, K_SYSTEMUSER_SYSTEM_HAS_SUFFIX)); LOGXLN("INFO:%s:%s:%d", __func__, K_SYSTEMUSER_SYSTEM_HAS_END, chaton_tmpl_kv_bool(tmpl, K_SYSTEMUSER_SYSTEM_HAS_END));