Merge pull request #223 from tikikun/main

tikikun · web-flow · commit 554b1c388f1c · 2023-12-01T08:36:20.000+07:00
hotfix: important change to fix the issue of template formatting for upcoming release
diff --git a/controllers/llamaCPP.cc b/controllers/llamaCPP.cc
@@ -191,7 +191,7 @@ void llamaCPP::chatCompletion(
         role = input_role;
       }
       std::string content = message["content"].asString();
-      formatted_output += role + content + "\n";
+      formatted_output += role + content;
     }
     formatted_output += ai_prompt;
 
@@ -205,7 +205,11 @@ void llamaCPP::chatCompletion(
   }
 
   bool is_streamed = data["stream"];
-
+  // Enable full message debugging
+  #ifdef DEBUG
+  LOG_INFO << "Current completion text";
+  LOG_INFO << formatted_output ;
+  #endif
   const int task_id = llama.request_completion(data, false, false);
   LOG_INFO << "Resolved request for task_id:" << task_id;
 

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ void llamaCPP::chatCompletion(`
`191`	`191`	`role = input_role;`
`192`	`192`	`}`
`193`	`193`	`std::string content = message["content"].asString();`
`194`		`- formatted_output += role + content + "\n";`
	`194`	`+ formatted_output += role + content;`
`195`	`195`	`}`
`196`	`196`	`formatted_output += ai_prompt;`
`197`	`197`
`@@ -205,7 +205,11 @@ void llamaCPP::chatCompletion(`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`bool is_streamed = data["stream"];`
`208`		`-`
	`208`	`+ // Enable full message debugging`
	`209`	`+ #ifdef DEBUG`
	`210`	`+ LOG_INFO << "Current completion text";`
	`211`	`+ LOG_INFO << formatted_output ;`
	`212`	`+ #endif`
`209`	`213`	`const int task_id = llama.request_completion(data, false, false);`
`210`	`214`	`LOG_INFO << "Resolved request for task_id:" << task_id;`
`211`	`215`