59
59
#include " log.h"
60
60
#include " llama.h"
61
61
62
+ #define LOGXLN LOG_TEELN
62
63
63
64
const auto K_SYSTEM = " system" ;
64
65
const auto K_USER = " user" ;
@@ -89,7 +90,7 @@ inline std::string chaton_tmpl_apply_single(const std::string &tmpl, const std::
89
90
std::stringstream ss;
90
91
ss << conMeta[tmpl][role][K_PREFIX] << content << conMeta[tmpl][role][K_SUFFIX];
91
92
std::string taggedStr = ss.str ();
92
- LOG_TEELN (" DBUG:%s:%s:%s:%s" , __func__, tmpl.c_str (), role.c_str (), taggedStr.c_str ());
93
+ LOGLN (" DBUG:%s:%s:%s:%s" , __func__, tmpl.c_str (), role.c_str (), taggedStr.c_str ());
93
94
return taggedStr;
94
95
}
95
96
@@ -127,25 +128,26 @@ inline std::string chaton_tmpl_apply(const std::string &tmpl, const std::vector<
127
128
}
128
129
ss << conMeta[tmpl][K_GLOBAL][K_END];
129
130
std::string taggedMsgs = ss.str ();
130
- LOG_TEELN (" DBUG:%s:%s:%s" , __func__, tmpl.c_str (), taggedMsgs.c_str ());
131
+ LOGLN (" DBUG:%s:%s:%s" , __func__, tmpl.c_str (), taggedMsgs.c_str ());
132
+ LOGLN (" DBUG:%s:%s:CntSys[%d]:CntUsr[%d]:CntOthers[%d]" , __func__, tmpl.c_str (), cntSystem, cntUser, cntOthers);
131
133
return taggedMsgs;
132
134
}
133
135
134
136
inline std::string chaton_tmpl_role_kv (const std::string &tmpl, const std::string &role, const std::string &key) {
135
137
std::string got = conMeta[tmpl][role][key];
136
- LOG_TEELN (" DBUG:%s:%s:%s:%s:%s" , __func__, tmpl.c_str (), role.c_str (), key.c_str (), got.c_str ());
138
+ LOGLN (" DBUG:%s:%s:%s:%s:%s" , __func__, tmpl.c_str (), role.c_str (), key.c_str (), got.c_str ());
137
139
return got;
138
140
}
139
141
140
142
inline std::string chaton_tmpl_kv (const std::string &tmpl, const std::string &key) {
141
143
std::string got = conMeta[tmpl][key];
142
- LOG_TEELN (" DBUG:%s:%s:%s:%s" , __func__, tmpl.c_str (), key.c_str (), got.c_str ());
144
+ LOGLN (" DBUG:%s:%s:%s:%s" , __func__, tmpl.c_str (), key.c_str (), got.c_str ());
143
145
return got;
144
146
}
145
147
146
148
inline bool chaton_tmpl_kv_bool (const std::string &tmpl, const std::string &key) {
147
149
bool got = conMeta[tmpl][key];
148
- LOG_TEELN (" DBUG:%s:%s:%s:%d" , __func__, tmpl.c_str (), key.c_str (), got);
150
+ LOGLN (" DBUG:%s:%s:%s:%d" , __func__, tmpl.c_str (), key.c_str (), got);
149
151
return got;
150
152
}
151
153
@@ -162,18 +164,18 @@ inline void _chaton_meta_dump(std::string &tmpl) {
162
164
} else {
163
165
theJson = conMeta[tmpl];
164
166
}
165
- LOG_TEELN (" \n\n INFO:%s:ChatOn Meta\n %s" , __func__, theJson.dump (4 ).c_str ());
167
+ LOGXLN (" \n\n INFO:%s:ChatOn Meta\n %s" , __func__, theJson.dump (4 ).c_str ());
166
168
if (!tmpl.empty ()) {
167
- LOG (" INFO:%s:%s:%s" , __func__, " global->begin" , chaton_tmpl_role_kv (tmpl, K_GLOBAL, K_BEGIN).c_str ());
168
- LOG (" INFO:%s:%s:%s" , __func__, " global->end" , chaton_tmpl_role_kv (tmpl, K_GLOBAL, K_END).c_str ());
169
- LOG (" INFO:%s:%s:%s" , __func__, " system->prefix" , chaton_tmpl_role_kv (tmpl, K_SYSTEM, K_PREFIX).c_str ());
170
- LOG (" INFO:%s:%s:%s" , __func__, " system->suffix" , chaton_tmpl_role_kv (tmpl, K_SYSTEM, K_SUFFIX).c_str ());
171
- LOG (" INFO:%s:%s:%s" , __func__, " user->prefix" , chaton_tmpl_role_kv (tmpl, K_USER, K_PREFIX).c_str ());
172
- LOG (" INFO:%s:%s:%s" , __func__, " user->suffix" , chaton_tmpl_role_kv (tmpl, K_USER, K_SUFFIX).c_str ());
173
- LOG (" INFO:%s:%s:%s" , __func__, " assistant->prefix" , chaton_tmpl_role_kv (tmpl, K_ASSISTANT, K_PREFIX).c_str ());
174
- LOG (" INFO:%s:%s:%s" , __func__, " assistant->suffix" , chaton_tmpl_role_kv (tmpl, K_ASSISTANT, K_SUFFIX).c_str ());
175
- LOG (" INFO:%s:%s:%s" , __func__, K_REVERSE_PROMPT, chaton_tmpl_kv (tmpl, K_REVERSE_PROMPT).c_str ());
176
- LOG (" INFO:%s:%s:%d" , __func__, K_SYSTEMUSER_1ST_USER_HAS_PREFIX, chaton_tmpl_kv_bool (tmpl, K_SYSTEMUSER_1ST_USER_HAS_PREFIX));
169
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " global->begin" , chaton_tmpl_role_kv (tmpl, K_GLOBAL, K_BEGIN).c_str ());
170
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " global->end" , chaton_tmpl_role_kv (tmpl, K_GLOBAL, K_END).c_str ());
171
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " system->prefix" , chaton_tmpl_role_kv (tmpl, K_SYSTEM, K_PREFIX).c_str ());
172
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " system->suffix" , chaton_tmpl_role_kv (tmpl, K_SYSTEM, K_SUFFIX).c_str ());
173
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " user->prefix" , chaton_tmpl_role_kv (tmpl, K_USER, K_PREFIX).c_str ());
174
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " user->suffix" , chaton_tmpl_role_kv (tmpl, K_USER, K_SUFFIX).c_str ());
175
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " assistant->prefix" , chaton_tmpl_role_kv (tmpl, K_ASSISTANT, K_PREFIX).c_str ());
176
+ LOGXLN (" INFO:%s:%s:%s" , __func__, " assistant->suffix" , chaton_tmpl_role_kv (tmpl, K_ASSISTANT, K_SUFFIX).c_str ());
177
+ LOGXLN (" INFO:%s:%s:%s" , __func__, K_REVERSE_PROMPT, chaton_tmpl_kv (tmpl, K_REVERSE_PROMPT).c_str ());
178
+ LOGXLN (" INFO:%s:%s:%d" , __func__, K_SYSTEMUSER_1ST_USER_HAS_PREFIX, chaton_tmpl_kv_bool (tmpl, K_SYSTEMUSER_1ST_USER_HAS_PREFIX));
177
179
}
178
180
}
179
181
0 commit comments