From db2ffabb1878c5558cfb2c9be2de71834fcee329 Mon Sep 17 00:00:00 2001 From: HanishKVC Date: Sun, 12 May 2024 18:24:02 +0530 Subject: [PATCH] ChatON: use templated json_get when loading bool key-value fields With this now even loading chaton_meta.json file will generate more informative exception, so that user can know which field is missing, if any. --- common/chaton.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/chaton.hpp b/common/chaton.hpp index 8b0a3c5b4..60209266b 100644 --- a/common/chaton.hpp +++ b/common/chaton.hpp @@ -375,14 +375,14 @@ inline bool chaton_meta_load(const std::string &fname) { std::string reversePrompt = json_get(curTmpl, { K_REVERSE_PROMPT }, group); gCT.set_value(group, { K_REVERSE_PROMPT }, reversePrompt); - bool systemHasSuffix = curTmpl[K_SYSTEMUSER_SYSTEM_HAS_SUFFIX]; + bool systemHasSuffix = json_get(curTmpl, { K_SYSTEMUSER_SYSTEM_HAS_SUFFIX }, group); gCT.set_value(group, { K_SYSTEMUSER_SYSTEM_HAS_SUFFIX }, systemHasSuffix); - bool systemHasEnd = curTmpl[K_SYSTEMUSER_SYSTEM_HAS_END]; + bool systemHasEnd = json_get(curTmpl, { K_SYSTEMUSER_SYSTEM_HAS_END }, group); gCT.set_value(group, { K_SYSTEMUSER_SYSTEM_HAS_END }, systemHasEnd); - bool userHasBegin = curTmpl[K_SYSTEMUSER_1ST_USER_HAS_BEGIN]; + bool userHasBegin = json_get(curTmpl, { K_SYSTEMUSER_1ST_USER_HAS_BEGIN }, group); gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_BEGIN }, userHasBegin); - bool userHasPrefix = curTmpl[K_SYSTEMUSER_1ST_USER_HAS_PREFIX]; + bool userHasPrefix = json_get(curTmpl, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, group); gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, userHasPrefix); }