From bb9ce52b111f965c1de8fd4d4c1772ea8972ad2d Mon Sep 17 00:00:00 2001
From: HanishKVC <hanishkvc@gmail.com>
Date: Tue, 14 May 2024 18:25:58 +0530
Subject: [PATCH] ChatON+: ValidateDump dumps All, wrapped in optional LDBUG_LN

GroupKV dump adds needed ":" seperator on its own, so calling
functions can just pass the tag string they want in the log without
worrying about any demarkation.
---
 common/chaton.hpp             | 4 ++--
 common/groupkv.hpp            | 4 ++--
 tests/test-chaton-groupkv.cpp | 2 +-
 tests/test-chaton-simpcfg.cpp | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/chaton.hpp b/common/chaton.hpp
index 94c91e9d8..ec0e48fd8 100644
--- a/common/chaton.hpp
+++ b/common/chaton.hpp
@@ -595,7 +595,7 @@ inline bool chaton_meta_load(const std::string &fname) {
         gCT.set_value(group, { K_SYSTEMUSER_1ST_USER_HAS_PREFIX }, userHasPrefix);
 
     }
-    LOGXLN("%s", gCT.dump("", "DBUG:ChatONMetaLoad:ChatTemplates:").c_str());
+    LOGXLN("%s", gCT.dump("", "DBUG:ChatONMetaLoad:ChatTemplates").c_str());
     return true;
 }
 
@@ -838,7 +838,7 @@ inline std::vector<llama_token> chaton_llama_tokenize_ex(
  * keys/fields are present wrt the specified template-standard/model-id or not.
  */
 inline bool _chaton_meta_validate_dump(std::string &tmpl) {
-    LOGXLN("\n\nINFO:%s:%s:\n%s", __func__, tmpl.c_str(), gCT.dump(tmpl, "INFO:ChatOnMetaValidateDump:").c_str());
+    LDBUG_LN("\n\nINFO:%s:%s:\n%s", __func__, tmpl.c_str(), gCT.dump("", "INFO:ChatOnMetaValidateDump").c_str());
     if (tmpl.empty()) {
         return true;
     }
diff --git a/common/groupkv.hpp b/common/groupkv.hpp
index b76edddfc..a4dd3d3aa 100644
--- a/common/groupkv.hpp
+++ b/common/groupkv.hpp
@@ -107,9 +107,9 @@ public:
                 LDBUG_LN("DBUG:GKV:%s:%s:%s:Skipping...", __func__, msgTag.c_str(), gm.first.c_str());
                 continue;
             }
-            ss << "\n" << msgTag << gm.first << ":\n";
+            ss << "\n" << msgTag + ":" << gm.first << ":\n";
             for(auto k: gm.second) {
-                ss << msgTag << "\t" << k.first << ":" << to_str(k.second) << "\n";
+                ss << msgTag + ":" << "\t" << k.first << ":" << to_str(k.second) << "\n";
             }
         }
         return ss.str();
diff --git a/tests/test-chaton-groupkv.cpp b/tests/test-chaton-groupkv.cpp
index fd984f760..93e277f5c 100644
--- a/tests/test-chaton-groupkv.cpp
+++ b/tests/test-chaton-groupkv.cpp
@@ -19,7 +19,7 @@ static void gkv_inited() {
     }};
 
     std::cout << "**** gkv inited **** " << std::endl;
-    std::cout << gkv.dump("", "INFO:GKV:Inited:") << std::endl;
+    std::cout << gkv.dump("", "INFO:GKV:Inited") << std::endl;
 
 }
 
diff --git a/tests/test-chaton-simpcfg.cpp b/tests/test-chaton-simpcfg.cpp
index 9d7ffc3d5..634e5d5c2 100644
--- a/tests/test-chaton-simpcfg.cpp
+++ b/tests/test-chaton-simpcfg.cpp
@@ -116,7 +116,7 @@ static void sc_inited() {
     }};
 
     std::cout << "**** sc inited **** " << std::endl;
-    std::cout << sc.dump("") << std::endl;
+    std::cout << sc.dump("", "INFO:SC:Inited") << std::endl;
 
 }
 
@@ -125,7 +125,7 @@ static void sc_set(const std::string &fname) {
     std::cout << "**** sc set **** " << std::endl;
     SimpCfg sc = {{}};
     sc.load(fname);
-    std::cout << sc.dump("", "INFO:SC:Set:AfterLoad:") << std::endl;
+    std::cout << sc.dump("", "INFO:SC:Set:AfterLoad") << std::endl;
 
     sc.get_bool("testme", {"key101b"}, false);
     sc.get_string("testme", {"key101s"}, "Not found");
@@ -137,7 +137,7 @@ static void sc_set(const std::string &fname) {
     sc.set_int64("testme", {"key201i"}, 987654);
     sc.set_double("testme", {"key201d"}, 9988.7766);
 
-    std::cout << sc.dump("testme", "INFO:SC:Set:AfterSet:") << std::endl;
+    std::cout << sc.dump("testme", "INFO:SC:Set:AfterSet") << std::endl;
     sc.get_bool("testme", {"key201b"}, false);
     sc.get_string("testme", {"key201s"}, "Not found");
     sc.get_int64("testme", {"key201i"}, 123456);