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

ChatOn+GroupKV: Cleanup a bit, including using debug logging

Browse source
This commit is contained in:
HanishKVC 2024-05-14 21:15:02 +05:30
parent bb9ce52b11
commit bd5c39e0f0
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
common/chaton.hpp
View file

@ -311,9 +311,9 @@ public:
* Check if the specified chat-template exists or not. * Check if the specified chat-template exists or not.
* NOTE: This doesnt cross check, if the template inturn contains all the required fields or not. * NOTE: This doesnt cross check, if the template inturn contains all the required fields or not.
*/ */
bool tmpl_exists(const std::string &tmpl) { bool tmpl_exists(const std::string &tmpl, const std::string &msgTag="") {
if (!group_exists(tmpl)) { if (!group_exists(tmpl)) {
LOG_TEELN("WARN:CT:%s: tmpl[%s] not found...", __func__, tmpl.c_str()); LOG_TEELN("WARN:CT:%s:%s:Specified template-id [%s] not found...", __func__, msgTag.c_str(), tmpl.c_str());
return false; return false;
} }
return true; return true;
@ -327,8 +327,7 @@ public:
*/ */
bool tmpl_basiccheck(const std::string &tmpl, std::stringstream &ss, const std::string &msgTag) { bool tmpl_basiccheck(const std::string &tmpl, std::stringstream &ss, const std::string &msgTag) {
if (!tmpl_exists(tmpl)) { if (!tmpl_exists(tmpl, msgTag)) {
LOGXLN("ERRR:CT:%s:Specified template-id [%s] not found", msgTag.c_str(), tmpl.c_str());
return false; return false;
} }
@ -507,8 +506,8 @@ public:
} }
LDBUG_LN("DBUG:CT:%s", cp.dump("INFO:ChatOnTmplApplyEx").c_str()); LDBUG_LN("DBUG:CT:%s", cp.dump("INFO:ChatOnTmplApplyEx").c_str());
tagged = cp.str(); tagged = cp.str();
LOGLN("DBUG:CT:%s:%s:%s", __func__, tmpl.c_str(), tagged.c_str()); LDBUG_LN("DBUG:CT:%s:%s:%s", __func__, tmpl.c_str(), tagged.c_str());
LOGLN("DBUG:CT:%s:%s:CntSys[%d]:CntUsr[%d]:CntOthers[%d]", __func__, tmpl.c_str(), cntSystem, cntUser, cntOthers); LDBUG_LN("DBUG:CT:%s:CntSys[%d]:CntUsr[%d]:CntOthers[%d]", __func__, cntSystem, cntUser, cntOthers);
types = cp.get_partstypes(); types = cp.get_partstypes();
lens = cp.get_partslens(); lens = cp.get_partslens();
return true; return true;
@ -595,7 +594,7 @@ inline bool chaton_meta_load(const std::string &fname) {
gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, userHasPrefix); gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, userHasPrefix);
} }
LOGXLN("%s", gCT.dump("", "DBUG:ChatONMetaLoad:ChatTemplates").c_str()); LDBUG_LN("%s", gCT.dump("", "DBUG:ChatONMetaLoad:ChatTemplates").c_str());
return true; return true;
} }
@ -782,7 +781,7 @@ inline std::vector<llama_token> chaton_llama_tokenize(
const std::string & text, const std::string & text,
bool add_special, bool add_special,
bool parse_special) { bool parse_special) {
LOGLN("DBUG:%s:%s:special[add:%d, parse:%d]", __func__, text.c_str(), add_special, parse_special); LDBUG_LN("DBUG:%s:%s:special[add:%d, parse:%d]", __func__, text.c_str(), add_special, parse_special);
if (model == nullptr) { if (model == nullptr) {
LOG_TEELN("ERRR:%s:Model NOT Provided:%s:special[add:%d, parse:%d]", __func__, text.c_str(), add_special, parse_special); LOG_TEELN("ERRR:%s:Model NOT Provided:%s:special[add:%d, parse:%d]", __func__, text.c_str(), add_special, parse_special);
return std::vector<llama_token>{}; return std::vector<llama_token>{};
@ -831,11 +830,12 @@ inline std::vector<llama_token> chaton_llama_tokenize_ex(
/** /**
* Dump the full loaded chaton templates data * Validate specified chaton-template-id and inturn dump the contents
* Additionally if a chaton-template-id is specified * related to that specific chat-handshake-template-standard.
* dump contents related to that specific chat-handshake-template-standard * ALERT: If no template-id is specified, it is ignored with a warning.
* NOTE: It uses the exception raising get_value to check if all the required * NOTE: It optionally dumps the full loaded chaton templates data
* keys/fields are present wrt the specified template-standard/model-id or not. * NOTE: It uses tmpl_basiccheck, which raises exception, if all the required
* keys/fields are not present wrt the specified template-standard/model-id.
*/ */
inline bool _chaton_meta_validate_dump(std::string &tmpl) { inline bool _chaton_meta_validate_dump(std::string &tmpl) {
LDBUG_LN("\n\nINFO:%s:%s:\n%s", __func__, tmpl.c_str(), gCT.dump("", "INFO:ChatOnMetaValidateDump").c_str()); LDBUG_LN("\n\nINFO:%s:%s:\n%s", __func__, tmpl.c_str(), gCT.dump("", "INFO:ChatOnMetaValidateDump").c_str());

6
common/groupkv.hpp
View file

@ -18,11 +18,11 @@
#include <sstream> #include <sstream>
#define GKV_DEBUG #define GKV_DEBUGLOG_ON
#include "log.h" #include "log.h"
#define LINFO_LN LOG_TEELN #define LINFO_LN LOG_TEELN
#ifdef GKV_DEBUG #ifdef GKV_DEBUGLOG_ON
#define LDBUG LOG #define LDBUG LOG
#define LDBUG_LN LOGLN #define LDBUG_LN LOGLN
#else #else
@ -115,6 +115,7 @@ public:
return ss.str(); return ss.str();
} }
// If the specified key is missing, an exception will be thrown.
template<typename SupportedDataType> template<typename SupportedDataType>
SupportedDataType get_value(const std::string &group, const MultiPart &keyParts) { SupportedDataType get_value(const std::string &group, const MultiPart &keyParts) {
auto key = joiner(keyParts); auto key = joiner(keyParts);
@ -128,6 +129,7 @@ public:
return std::get<SupportedDataType>(value); return std::get<SupportedDataType>(value);
} }
// If the specified key is missing, then the provided default value will be returned.
template<typename SupportedDataType> template<typename SupportedDataType>
SupportedDataType get_value(const std::string &group, const MultiPart &keyParts, const SupportedDataType &defaultValue, const std::string &callerName="") { SupportedDataType get_value(const std::string &group, const MultiPart &keyParts, const SupportedDataType &defaultValue, const std::string &callerName="") {
try { try {