niansa/discord_llama
1
0
Fork 0
mirror of https://gitlab.com/niansa/discord_llama.git synced 2025-03-06 20:48:25 +01:00
Code Releases Activity

Added option to not emit extra linebreaks in instruct mode

Browse source
This commit is contained in:
niansa/tuxifan 2023-05-17 12:37:03 +02:00
parent dc37d6d763
commit 37bbb2535a
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.cpp
View file

@ -59,6 +59,8 @@ void Configuration::Model::fill(const Configuration& cfg, std::unordered_map<std
no_translate = parse_bool(value);
} else if (key == "no_instruct_prompt") {
no_instruct_prompt = parse_bool(value);
} else if (key == "no_extra_linebreaks") {
no_extra_linebreaks = parse_bool(value);
} else if (!ignore_extra) {
throw Exception("Error: Failed to parse model configuration file: Unknown key: "+key);
}

3
config.hpp
View file

@ -43,7 +43,8 @@ public:
bot_prompt;
bool emits_eos = false,
no_translate = false,
no_instruct_prompt = false;
no_instruct_prompt = false,
no_extra_linebreaks = false;
enum class InstructModePolicy {
Allow = 0b11,
Force = 0b10,

3
example_models/mpt-7b-chat.txt
View file

@ -1,6 +1,7 @@
filename ggml-mpt-7b-chat.bin
instruct_mode_policy force
user_prompt <|im_start|>user
bot_prompt <|im_end|>
bot_prompt <|im_end|><|im_start|>assistant
emits_eos true
no_instruct_prompt true
no_extra_linebreaks true

18
main.cpp
View file

@ -273,9 +273,9 @@ private:
prompt = sstr.str();
// Append instruct prompt
using namespace fmt::literals;
if (prompt.back() != '\n') prompt.push_back('\n');
if (prompt.back() != '\n' && !model_config.no_extra_linebreaks) prompt.push_back('\n');
llm->set_scroll_callback(scroll_cb);
co_await llm->append(fmt::format(fmt::runtime(prompt), "bot_name"_a=bot.me.username, "bot_prompt"_a=model_config.bot_prompt, "user_prompt"_a=model_config.user_prompt)+"\n\n"+model_config.user_prompt, show_console_progress);
co_await llm->append(fmt::format(fmt::runtime(prompt), "bot_name"_a=bot.me.username, "bot_prompt"_a=model_config.bot_prompt, "user_prompt"_a=model_config.user_prompt)+(model_config.no_extra_linebreaks?"":"\n\n")+model_config.user_prompt, show_console_progress);
}
// Append user prompt
co_await llm->append(model_config.user_prompt);
@ -311,7 +311,9 @@ private:
// Instruct mode user prompt
if (channel_cfg.instruct_mode) {
// Append line as-is
if (!co_await inference->append("\n\n"+std::string(co_await llm_translate_to_en(msg.content, channel_cfg.model->no_translate))+'\n', cb)) {
if (!co_await inference->append((channel_cfg.model->no_extra_linebreaks?"":"\n\n")
+std::string(co_await llm_translate_to_en(msg.content, channel_cfg.model->no_translate))
+(channel_cfg.model->no_extra_linebreaks?"":"\n"), cb)) {
std::cerr << "Warning: Failed to append user prompt: " << inference->get_last_error() << std::endl;
co_return false;
}
@ -332,7 +334,9 @@ private:
CoSched::AwaitableTask<bool> prompt_add_trigger(const std::shared_ptr<LM::Inference>& inference, const BotChannelConfig& channel_cfg) {
ENSURE_LLM_THREAD();
if (channel_cfg.instruct_mode) {
co_return co_await inference->append('\n'+channel_cfg.model->bot_prompt+"\n\n");
co_return co_await inference->append((channel_cfg.model->no_extra_linebreaks?"":"\n")
+channel_cfg.model->bot_prompt
+(channel_cfg.model->no_extra_linebreaks?"\n":"\n\n"));
} else {
co_return co_await inference->append(bot.me.username+':', show_console_progress);
}
@ -410,8 +414,10 @@ private:
co_await inference->append("... Response interrupted due to length error");
}
// Prepare for next message
co_await inference->append("\n");
if (channel_cfg.model->emits_eos) {
if (!channel_cfg.instruct_mode || !channel_cfg.model->no_extra_linebreaks) {
co_await inference->append("\n");
}
if (channel_cfg.instruct_mode && channel_cfg.model->emits_eos) {
co_await inference->append("\n"+channel_cfg.model->user_prompt);
}
}