diff --git a/.gitignore b/.gitignore index 4be6774fb..235983338 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ public/css/user.css /data /default/scaffold public/scripts/extensions/third-party +/certs diff --git a/default/config.yaml b/default/config.yaml index 8a55f6afb..585988686 100644 --- a/default/config.yaml +++ b/default/config.yaml @@ -110,9 +110,6 @@ enableExtensionsAutoUpdate: true # Additional model tokenizers can be downloaded on demand. # Disabling will fallback to another locally available tokenizer. enableDownloadableTokenizers: true -# Vector storage settings -vectors: - enableModelScopes: false # Extension settings extras: # Disables automatic model download from HuggingFace diff --git a/default/content/index.json b/default/content/index.json index c8ebfa3b1..8c2ca66be 100644 --- a/default/content/index.json +++ b/default/content/index.json @@ -319,6 +319,26 @@ "filename": "presets/novel/Writers-Daemon-Kayra.json", "type": "novel_preset" }, + { + "filename": "presets/novel/Erato-Dragonfruit.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Golden Arrow.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Shosetsu.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Wilder.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Zany Scribe.json", + "type": "novel_preset" + }, { "filename": "presets/textgen/Asterism.json", "type": "textgen_preset" @@ -467,10 +487,6 @@ "filename": "presets/context/Adventure.json", "type": "context" }, - { - "filename": "presets/context/Alpaca-Roleplay.json", - "type": "context" - }, { "filename": "presets/context/Alpaca-Single-Turn.json", "type": "context" @@ -551,10 +567,6 @@ "filename": "presets/instruct/Adventure.json", "type": "instruct" }, - { - "filename": "presets/instruct/Alpaca-Roleplay.json", - "type": "instruct" - }, { "filename": "presets/instruct/Alpaca-Single-Turn.json", "type": "instruct" @@ -679,6 +691,54 @@ "filename": "presets/instruct/Gemma 2.json", "type": "instruct" }, + { + "filename": "presets/sysprompt/Actor.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Assistant - Expert.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Assistant - Simple.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Chain of Thought.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Roleplay - Detailed.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Roleplay - Immersive.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Roleplay - Simple.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Text Adventure.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Writer - Creative.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Writer - Realistic.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Blank.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Neutral - Chat.json", + "type": "sysprompt" + }, { "filename": "presets/instruct/Mistral V1.json", "type": "instruct" diff --git a/default/content/presets/context/Adventure.json b/default/content/presets/context/Adventure.json index 3318d518f..03ad99837 100644 --- a/default/content/presets/context/Adventure.json +++ b/default/content/presets/context/Adventure.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": false, - "include_newline": false, "single_line": true, "name": "Adventure" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Alpaca-Roleplay.json b/default/content/presets/context/Alpaca-Roleplay.json deleted file mode 100644 index e7a45c2d8..000000000 --- a/default/content/presets/context/Alpaca-Roleplay.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "story_string": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.\n\n{{#if system}}{{system}}\n\n{{/if}}### Input:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}\n\n", - "example_separator": "### New Roleplay:", - "chat_start": "### New Roleplay:", - "use_stop_strings": false, - "allow_jailbreak": false, - "always_force_name2": true, - "trim_sentences": false, - "include_newline": false, - "single_line": false, - "name": "Alpaca-Roleplay" -} diff --git a/default/content/presets/context/Alpaca-Single-Turn.json b/default/content/presets/context/Alpaca-Single-Turn.json index ea58fe9d5..ea0b08816 100644 --- a/default/content/presets/context/Alpaca-Single-Turn.json +++ b/default/content/presets/context/Alpaca-Single-Turn.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Alpaca-Single-Turn" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Alpaca.json b/default/content/presets/context/Alpaca.json index 6e9418549..0432976f1 100644 --- a/default/content/presets/context/Alpaca.json +++ b/default/content/presets/context/Alpaca.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Alpaca" } diff --git a/default/content/presets/context/ChatML-Names.json b/default/content/presets/context/ChatML-Names.json index 691d3179c..8aa30b516 100644 --- a/default/content/presets/context/ChatML-Names.json +++ b/default/content/presets/context/ChatML-Names.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "ChatML-Names" } diff --git a/default/content/presets/context/ChatML.json b/default/content/presets/context/ChatML.json index 2184e91d3..4b8610b7a 100644 --- a/default/content/presets/context/ChatML.json +++ b/default/content/presets/context/ChatML.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "ChatML" } diff --git a/default/content/presets/context/Command R.json b/default/content/presets/context/Command R.json index 4d77553d1..01410e517 100644 --- a/default/content/presets/context/Command R.json +++ b/default/content/presets/context/Command R.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Command R" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Default.json b/default/content/presets/context/Default.json index 7c8a231cf..de84def35 100644 --- a/default/content/presets/context/Default.json +++ b/default/content/presets/context/Default.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Default" -} \ No newline at end of file +} diff --git a/default/content/presets/context/DreamGen Role-Play V1 ChatML.json b/default/content/presets/context/DreamGen Role-Play V1 ChatML.json index 9042ed758..6b2d8bc61 100644 --- a/default/content/presets/context/DreamGen Role-Play V1 ChatML.json +++ b/default/content/presets/context/DreamGen Role-Play V1 ChatML.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": true, - "include_newline": false, "single_line": false, "name": "DreamGen Role-Play V1 ChatML" -} \ No newline at end of file +} diff --git a/default/content/presets/context/DreamGen Role-Play V1 Llama3.json b/default/content/presets/context/DreamGen Role-Play V1 Llama3.json index 965e9632c..aa51e64f8 100644 --- a/default/content/presets/context/DreamGen Role-Play V1 Llama3.json +++ b/default/content/presets/context/DreamGen Role-Play V1 Llama3.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": true, - "include_newline": false, "single_line": false, "name": "DreamGen Role-Play V1 Llama3" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Gemma 2.json b/default/content/presets/context/Gemma 2.json index 7e8dba55b..768346957 100644 --- a/default/content/presets/context/Gemma 2.json +++ b/default/content/presets/context/Gemma 2.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Gemma 2" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Libra-32B.json b/default/content/presets/context/Libra-32B.json index b5dee2872..974391be6 100644 --- a/default/content/presets/context/Libra-32B.json +++ b/default/content/presets/context/Libra-32B.json @@ -1,12 +1,11 @@ { - "story_string": "### Instruction:\nWrite {{char}}'s next reply in this roleplay with {{user}}. Use the provided character sheet and example dialogue for formatting direction and character speech patterns.\n\n{{#if system}}{{system}}\n\n{{/if}}### Character Sheet:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", + "story_string": "### Instruction:\n{{#if system}}{{system}}\n\n{{/if}}### Character Sheet:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", "example_separator": "### Example:", "chat_start": "### START ROLEPLAY:", "use_stop_strings": false, "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Libra-32B" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Lightning 1.1.json b/default/content/presets/context/Lightning 1.1.json index 3b0190c92..24878e009 100644 --- a/default/content/presets/context/Lightning 1.1.json +++ b/default/content/presets/context/Lightning 1.1.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Lightning 1.1" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Llama 2 Chat.json b/default/content/presets/context/Llama 2 Chat.json index be18ad69d..d0cd16ca0 100644 --- a/default/content/presets/context/Llama 2 Chat.json +++ b/default/content/presets/context/Llama 2 Chat.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Llama 2 Chat" } diff --git a/default/content/presets/context/Llama 3 Instruct.json b/default/content/presets/context/Llama 3 Instruct.json index 62bbd0753..cbc155504 100644 --- a/default/content/presets/context/Llama 3 Instruct.json +++ b/default/content/presets/context/Llama 3 Instruct.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Llama 3 Instruct" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Llama-3-Instruct-Names.json b/default/content/presets/context/Llama-3-Instruct-Names.json index 2850293e0..a1815e02c 100644 --- a/default/content/presets/context/Llama-3-Instruct-Names.json +++ b/default/content/presets/context/Llama-3-Instruct-Names.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Llama-3-Instruct-Names" } diff --git a/default/content/presets/context/Minimalist.json b/default/content/presets/context/Minimalist.json index cc7550c51..107da83b3 100644 --- a/default/content/presets/context/Minimalist.json +++ b/default/content/presets/context/Minimalist.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Minimalist" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Mistral V1.json b/default/content/presets/context/Mistral V1.json index 75bb82cb1..93d037941 100644 --- a/default/content/presets/context/Mistral V1.json +++ b/default/content/presets/context/Mistral V1.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Mistral V1" } diff --git a/default/content/presets/context/Mistral V2 & V3.json b/default/content/presets/context/Mistral V2 & V3.json index 3102e1112..bc41b01a1 100644 --- a/default/content/presets/context/Mistral V2 & V3.json +++ b/default/content/presets/context/Mistral V2 & V3.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Mistral V2 & V3" } diff --git a/default/content/presets/context/Mistral V3-Tekken.json b/default/content/presets/context/Mistral V3-Tekken.json index 26e196b5b..e5b211606 100644 --- a/default/content/presets/context/Mistral V3-Tekken.json +++ b/default/content/presets/context/Mistral V3-Tekken.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Mistral V3-Tekken" } diff --git a/default/content/presets/context/NovelAI.json b/default/content/presets/context/NovelAI.json index 1a7887a90..8914a953d 100644 --- a/default/content/presets/context/NovelAI.json +++ b/default/content/presets/context/NovelAI.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "NovelAI" -} \ No newline at end of file +} diff --git a/default/content/presets/context/OldDefault.json b/default/content/presets/context/OldDefault.json index 542971f21..81dd70911 100644 --- a/default/content/presets/context/OldDefault.json +++ b/default/content/presets/context/OldDefault.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "OldDefault" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Phi.json b/default/content/presets/context/Phi.json index 2eb7a98d8..79a27ada9 100644 --- a/default/content/presets/context/Phi.json +++ b/default/content/presets/context/Phi.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Phi" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Pygmalion.json b/default/content/presets/context/Pygmalion.json index 68de8c1d0..eab73535c 100644 --- a/default/content/presets/context/Pygmalion.json +++ b/default/content/presets/context/Pygmalion.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Pygmalion" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Story.json b/default/content/presets/context/Story.json index 26f70937b..525a06dc0 100644 --- a/default/content/presets/context/Story.json +++ b/default/content/presets/context/Story.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Story" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Synthia.json b/default/content/presets/context/Synthia.json index 8bffe47d3..1fb639c0b 100644 --- a/default/content/presets/context/Synthia.json +++ b/default/content/presets/context/Synthia.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Synthia" } diff --git a/default/content/presets/context/simple-proxy-for-tavern.json b/default/content/presets/context/simple-proxy-for-tavern.json index 38003c68d..0346c2f32 100644 --- a/default/content/presets/context/simple-proxy-for-tavern.json +++ b/default/content/presets/context/simple-proxy-for-tavern.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "simple-proxy-for-tavern" -} \ No newline at end of file +} diff --git a/default/content/presets/instruct/Adventure.json b/default/content/presets/instruct/Adventure.json index ad9e86da8..0a8471236 100644 --- a/default/content/presets/instruct/Adventure.json +++ b/default/content/presets/instruct/Adventure.json @@ -1,5 +1,4 @@ { - "system_prompt": "[Enter Adventure Mode. Narrate the story based on {{user}}'s dialogue and actions after \">\". Describe the surroundings in vivid detail. Be detailed, creative, verbose, and proactive. Move the story forward by introducing fantasy elements and interesting characters.]", "input_sequence": "", "output_sequence": "", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Alpaca-Roleplay.json b/default/content/presets/instruct/Alpaca-Roleplay.json deleted file mode 100644 index 21891c340..000000000 --- a/default/content/presets/instruct/Alpaca-Roleplay.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "system_prompt": "Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.", - "input_sequence": "### Instruction:", - "output_sequence": "### Response:", - "last_output_sequence": "### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):", - "system_sequence": "### Input:", - "stop_sequence": "", - "wrap": true, - "macro": true, - "names_behavior": "always", - "activation_regex": "", - "system_sequence_prefix": "", - "system_sequence_suffix": "", - "first_output_sequence": "", - "skip_examples": false, - "output_suffix": "\n\n", - "input_suffix": "\n\n", - "system_suffix": "\n\n", - "user_alignment_message": "", - "system_same_as_user": false, - "last_system_sequence": "", - "name": "Alpaca-Roleplay" -} diff --git a/default/content/presets/instruct/Alpaca-Single-Turn.json b/default/content/presets/instruct/Alpaca-Single-Turn.json index 3ed20775d..e5e4fa2d8 100644 --- a/default/content/presets/instruct/Alpaca-Single-Turn.json +++ b/default/content/presets/instruct/Alpaca-Single-Turn.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\nWrite 1 reply only, italicize actions, and avoid quotation marks. Use markdown. Be proactive, creative, and drive the plot and conversation forward. Include dialog as well as narration.", "input_sequence": "", "output_sequence": "", "last_output_sequence": "\n### Response:", @@ -11,7 +10,7 @@ "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", - "first_output_sequence": "", + "first_output_sequence": "", "skip_examples": false, "output_suffix": "", "input_suffix": "", diff --git a/default/content/presets/instruct/Alpaca.json b/default/content/presets/instruct/Alpaca.json index 830c87972..5088cfd9a 100644 --- a/default/content/presets/instruct/Alpaca.json +++ b/default/content/presets/instruct/Alpaca.json @@ -1,5 +1,4 @@ { - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "### Instruction:", "output_sequence": "### Response:", "last_output_sequence": "", diff --git a/default/content/presets/instruct/ChatML-Names.json b/default/content/presets/instruct/ChatML-Names.json index 8237b3d31..41e14e9b5 100644 --- a/default/content/presets/instruct/ChatML-Names.json +++ b/default/content/presets/instruct/ChatML-Names.json @@ -1,5 +1,4 @@ { - "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.", "input_sequence": "<|im_start|>[{{name}}]", "output_sequence": "<|im_start|>[{{name}}]", "last_output_sequence": "", diff --git a/default/content/presets/instruct/ChatML.json b/default/content/presets/instruct/ChatML.json index dd32badd3..199b3915b 100644 --- a/default/content/presets/instruct/ChatML.json +++ b/default/content/presets/instruct/ChatML.json @@ -1,5 +1,4 @@ { - "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.", "input_sequence": "<|im_start|>user", "output_sequence": "<|im_start|>assistant", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Command R.json b/default/content/presets/instruct/Command R.json index a70972d86..f34159081 100644 --- a/default/content/presets/instruct/Command R.json +++ b/default/content/presets/instruct/Command R.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "<|START_OF_TURN_TOKEN|><|USER_TOKEN|>", "output_sequence": "<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>", "first_output_sequence": "", diff --git a/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json b/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json index 08e4258d8..b705b2853 100644 --- a/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json +++ b/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below.", "input_sequence": "\n<|im_start|>text names= {{name}}\n", "output_sequence": "\n<|im_start|>text names= {{name}}\n", "last_output_sequence": "", diff --git a/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json b/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json index 08a659beb..e52fe73f8 100644 --- a/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json +++ b/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below.", "input_sequence": "<|eot_id|>\n<|start_header_id|>writer character: {{user}}<|end_header_id|>\n\n", "output_sequence": "<|eot_id|>\n<|start_header_id|>writer character: {{char}}<|end_header_id|>\n\n", "first_output_sequence": "", diff --git a/default/content/presets/instruct/Gemma 2.json b/default/content/presets/instruct/Gemma 2.json index cb777122e..7a21a2316 100644 --- a/default/content/presets/instruct/Gemma 2.json +++ b/default/content/presets/instruct/Gemma 2.json @@ -1,5 +1,4 @@ { - "system_prompt": "Continue writing this story and portray characters realistically.", "input_sequence": "user", "output_sequence": "model", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Koala.json b/default/content/presets/instruct/Koala.json index 798bcafb4..386faa85c 100644 --- a/default/content/presets/instruct/Koala.json +++ b/default/content/presets/instruct/Koala.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "USER: ", "output_sequence": "GPT: ", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Libra-32B.json b/default/content/presets/instruct/Libra-32B.json index cde79d642..2e3e9ecba 100644 --- a/default/content/presets/instruct/Libra-32B.json +++ b/default/content/presets/instruct/Libra-32B.json @@ -1,5 +1,4 @@ { - "system_prompt": "Avoid repetition, don't loop. Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.", "input_sequence": "", "output_sequence": "", "last_output_sequence": "\n### Response:", diff --git a/default/content/presets/instruct/Lightning 1.1.json b/default/content/presets/instruct/Lightning 1.1.json index a4cc86ba4..3ce4d6a90 100644 --- a/default/content/presets/instruct/Lightning 1.1.json +++ b/default/content/presets/instruct/Lightning 1.1.json @@ -1,5 +1,4 @@ { - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\nTake the role of {{char}} in a play that leaves a lasting impression on {{user}}. Write {{char}}'s next reply.\nNever skip or gloss over {{char}}’s actions. Progress the scene at a naturally slow pace.\n\n", "input_sequence": "### Instruction:", "output_sequence": "### Response: (length = unlimited)", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Llama 2 Chat.json b/default/content/presets/instruct/Llama 2 Chat.json index 0a03a5444..7d5efcb21 100644 --- a/default/content/presets/instruct/Llama 2 Chat.json +++ b/default/content/presets/instruct/Llama 2 Chat.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "[INST] ", "output_sequence": "", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Llama 3 Instruct.json b/default/content/presets/instruct/Llama 3 Instruct.json index 87e6e049e..d283820f4 100644 --- a/default/content/presets/instruct/Llama 3 Instruct.json +++ b/default/content/presets/instruct/Llama 3 Instruct.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}.", "input_sequence": "<|start_header_id|>user<|end_header_id|>\n\n", "output_sequence": "<|start_header_id|>assistant<|end_header_id|>\n\n", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Llama-3-Instruct-Names.json b/default/content/presets/instruct/Llama-3-Instruct-Names.json index e44bc117b..f0b4f1439 100644 --- a/default/content/presets/instruct/Llama-3-Instruct-Names.json +++ b/default/content/presets/instruct/Llama-3-Instruct-Names.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}.", "input_sequence": "<|start_header_id|>[{{name}}]<|end_header_id|>\n\n", "output_sequence": "<|start_header_id|>[{{name}}]<|end_header_id|>\n\n", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Metharme.json b/default/content/presets/instruct/Metharme.json index c49f908aa..2756e709b 100644 --- a/default/content/presets/instruct/Metharme.json +++ b/default/content/presets/instruct/Metharme.json @@ -1,5 +1,4 @@ { - "system_prompt": "Enter roleplay mode. You must act as {{char}}, whose persona follows:", "input_sequence": "<|user|>", "output_sequence": "<|model|>", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Mistral V1.json b/default/content/presets/instruct/Mistral V1.json index 5a680a6f3..c47dbdc77 100644 --- a/default/content/presets/instruct/Mistral V1.json +++ b/default/content/presets/instruct/Mistral V1.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": " [INST] ", "output_sequence": " [/INST] ", "last_output_sequence": " [/INST]", diff --git a/default/content/presets/instruct/Mistral V2 & V3.json b/default/content/presets/instruct/Mistral V2 & V3.json index 6c7819689..7619a1aa5 100644 --- a/default/content/presets/instruct/Mistral V2 & V3.json +++ b/default/content/presets/instruct/Mistral V2 & V3.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "[INST] ", "output_sequence": "[/INST] ", "last_output_sequence": "[/INST]", diff --git a/default/content/presets/instruct/Mistral V3-Tekken.json b/default/content/presets/instruct/Mistral V3-Tekken.json index a82a53705..217007d73 100644 --- a/default/content/presets/instruct/Mistral V3-Tekken.json +++ b/default/content/presets/instruct/Mistral V3-Tekken.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "[INST]", "output_sequence": "[/INST]", "last_output_sequence": "", diff --git a/default/content/presets/instruct/OpenOrca-OpenChat.json b/default/content/presets/instruct/OpenOrca-OpenChat.json index 4ee8eae2f..84ae96d15 100644 --- a/default/content/presets/instruct/OpenOrca-OpenChat.json +++ b/default/content/presets/instruct/OpenOrca-OpenChat.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate.\n", "input_sequence": "\nUser: ", "output_sequence": "\nAssistant: ", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Phi.json b/default/content/presets/instruct/Phi.json index 6b5ade784..2762cdbd2 100644 --- a/default/content/presets/instruct/Phi.json +++ b/default/content/presets/instruct/Phi.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "<|user|>\n", "output_sequence": "<|assistant|>\n", "first_output_sequence": "", diff --git a/default/content/presets/instruct/Pygmalion.json b/default/content/presets/instruct/Pygmalion.json index d47aa4656..3827585bf 100644 --- a/default/content/presets/instruct/Pygmalion.json +++ b/default/content/presets/instruct/Pygmalion.json @@ -1,5 +1,4 @@ { - "system_prompt": "Enter RP mode. You shall reply to {{user}} while staying in character. Your responses must be detailed, creative, immersive, and drive the scenario forward. You will follow {{char}}'s persona.", "input_sequence": "<|user|>", "output_sequence": "<|model|>", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Story.json b/default/content/presets/instruct/Story.json index 1f6694946..6e90dd0ba 100644 --- a/default/content/presets/instruct/Story.json +++ b/default/content/presets/instruct/Story.json @@ -1,5 +1,4 @@ { - "system_prompt": "", "input_sequence": "", "output_sequence": "", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Synthia.json b/default/content/presets/instruct/Synthia.json index 216ebbd70..ccba89a9f 100644 --- a/default/content/presets/instruct/Synthia.json +++ b/default/content/presets/instruct/Synthia.json @@ -1,5 +1,4 @@ { - "system_prompt": "Elaborate on the topic using a Tree of Thoughts and backtrack when necessary to construct a clear, cohesive Chain of Thought reasoning. Always answer without hesitation.", "input_sequence": "USER: ", "output_sequence": "ASSISTANT: ", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Vicuna 1.0.json b/default/content/presets/instruct/Vicuna 1.0.json index b93f91a24..1c5fca144 100644 --- a/default/content/presets/instruct/Vicuna 1.0.json +++ b/default/content/presets/instruct/Vicuna 1.0.json @@ -1,5 +1,4 @@ { - "system_prompt": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "### Human:", "output_sequence": "### Assistant:", "last_output_sequence": "", diff --git a/default/content/presets/instruct/Vicuna 1.1.json b/default/content/presets/instruct/Vicuna 1.1.json index 63a9340de..88119ecd1 100644 --- a/default/content/presets/instruct/Vicuna 1.1.json +++ b/default/content/presets/instruct/Vicuna 1.1.json @@ -1,5 +1,4 @@ { - "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "\nUSER: ", "output_sequence": "\nASSISTANT: ", "last_output_sequence": "", diff --git a/default/content/presets/instruct/WizardLM-13B.json b/default/content/presets/instruct/WizardLM-13B.json index 7f94b7dc2..ea793ac57 100644 --- a/default/content/presets/instruct/WizardLM-13B.json +++ b/default/content/presets/instruct/WizardLM-13B.json @@ -1,5 +1,4 @@ { - "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next detailed reply in a fictional roleplay chat between {{user}} and {{char}}.", "input_sequence": "USER: ", "output_sequence": "ASSISTANT: ", "last_output_sequence": "", diff --git a/default/content/presets/instruct/WizardLM.json b/default/content/presets/instruct/WizardLM.json index 2488310e3..081d9d68c 100644 --- a/default/content/presets/instruct/WizardLM.json +++ b/default/content/presets/instruct/WizardLM.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "", "output_sequence": "### Response:", "last_output_sequence": "", diff --git a/default/content/presets/instruct/simple-proxy-for-tavern.json b/default/content/presets/instruct/simple-proxy-for-tavern.json index f184c8dfe..2123edbbd 100644 --- a/default/content/presets/instruct/simple-proxy-for-tavern.json +++ b/default/content/presets/instruct/simple-proxy-for-tavern.json @@ -1,5 +1,4 @@ { - "system_prompt": "[System note: Write one reply only. Do not decide what {{user}} says or does. Write at least one paragraph, up to four. Be descriptive and immersive, providing vivid details about {{char}}'s actions, emotions, and the environment. Write with a high degree of complexity and burstiness. Do not repeat this message.]", "input_sequence": "### Instruction:\n#### {{name}}:", "output_sequence": "### Response:\n#### {{name}}:", "last_output_sequence": "### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):\n#### {{name}}:", diff --git a/default/content/presets/novel/Asper-Kayra.json b/default/content/presets/novel/Asper-Kayra.json index 0fa8f9979..0b4b78e6d 100644 --- a/default/content/presets/novel/Asper-Kayra.json +++ b/default/content/presets/novel/Asper-Kayra.json @@ -14,7 +14,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "medium", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Blended-Coffee-Kayra.json b/default/content/presets/novel/Blended-Coffee-Kayra.json index de830aee7..05f796381 100644 --- a/default/content/presets/novel/Blended-Coffee-Kayra.json +++ b/default/content/presets/novel/Blended-Coffee-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 1, 2, 3], + "order": [0, 1, 2, 3], "temperature": 1, "max_length": 150, "min_length": 1, @@ -14,7 +14,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "cfg_scale": 1.55, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Blook-Kayra.json b/default/content/presets/novel/Blook-Kayra.json index fd35d9920..42cf9e00a 100644 --- a/default/content/presets/novel/Blook-Kayra.json +++ b/default/content/presets/novel/Blook-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 2, 3, 1, 0], + "order": [2, 3, 1, 0], "temperature": 1, "max_length": 150, "min_length": 1, @@ -15,7 +15,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "very_aggressive", - "cfg_scale": 1.3, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Carefree-Kayra.json b/default/content/presets/novel/Carefree-Kayra.json index bba4378fc..a99f18d09 100644 --- a/default/content/presets/novel/Carefree-Kayra.json +++ b/default/content/presets/novel/Carefree-Kayra.json @@ -15,7 +15,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "aggressive", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/CosmicCube-Kayra.json b/default/content/presets/novel/CosmicCube-Kayra.json index ed9318449..b818f6a50 100644 --- a/default/content/presets/novel/CosmicCube-Kayra.json +++ b/default/content/presets/novel/CosmicCube-Kayra.json @@ -1,5 +1,5 @@ { - "order": [8, 6, 5, 0, 3], + "order": [8, 5, 0, 3], "temperature": 0.9, "max_length": 150, "min_length": 1, @@ -15,7 +15,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "off", - "cfg_scale": 1.48, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Edgewise-Clio.json b/default/content/presets/novel/Edgewise-Clio.json index ff5f517f5..32b4544db 100644 --- a/default/content/presets/novel/Edgewise-Clio.json +++ b/default/content/presets/novel/Edgewise-Clio.json @@ -15,7 +15,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Erato-Dragonfruit.json b/default/content/presets/novel/Erato-Dragonfruit.json new file mode 100644 index 000000000..4a1fd903c --- /dev/null +++ b/default/content/presets/novel/Erato-Dragonfruit.json @@ -0,0 +1,31 @@ +{ + "max_context": 8000, + "temperature": 1.37, + "max_length": 150, + "min_length": 1, + "top_k": 0, + "top_p": 1, + "top_a": 0.1, + "typical_p": 0.875, + "tail_free_sampling": 0.87, + "repetition_penalty": 3.25, + "repetition_penalty_range": 6000, + "repetition_penalty_slope": 3.25, + "repetition_penalty_frequency": 0, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "off", + "mirostat_lr": 0.2, + "mirostat_tau": 4, + "math1_temp": 0.9, + "math1_quad": 0.07, + "math1_quad_entropy_scale": -0.05, + "min_p": 0.035, + "order": [ + 0, + 5, + 9, + 10, + 8, + 4 + ] +} diff --git a/default/content/presets/novel/Erato-Golden Arrow.json b/default/content/presets/novel/Erato-Golden Arrow.json new file mode 100644 index 000000000..e8b17dcd7 --- /dev/null +++ b/default/content/presets/novel/Erato-Golden Arrow.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 0, + "top_p": 0.995, + "top_a": 1, + "typical_p": 1, + "tail_free_sampling": 0.87, + "repetition_penalty": 1.5, + "repetition_penalty_range": 2240, + "repetition_penalty_slope": 1, + "repetition_penalty_frequency": 0, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "light", + "mirostat_lr": 1, + "mirostat_tau": 0, + "math1_temp": 0.3, + "math1_quad": 0.19, + "math1_quad_entropy_scale": 0, + "min_p": 0, + "order": [ + 9, + 2 + ] +} diff --git a/default/content/presets/novel/Erato-Shosetsu.json b/default/content/presets/novel/Erato-Shosetsu.json new file mode 100644 index 000000000..14e97d096 --- /dev/null +++ b/default/content/presets/novel/Erato-Shosetsu.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 50, + "top_p": 0.85, + "top_a": 1, + "typical_p": 1, + "tail_free_sampling": 0.895, + "repetition_penalty": 1.63, + "repetition_penalty_range": 1024, + "repetition_penalty_slope": 3.33, + "repetition_penalty_frequency": 0.0035, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "medium", + "mirostat_lr": 1, + "mirostat_tau": 0, + "math1_temp": 0.3, + "math1_quad": 0.0645, + "math1_quad_entropy_scale": 0.05, + "min_p": 0.05, + "order": [ + 9, + 10 + ] +} diff --git a/default/content/presets/novel/Erato-Wilder.json b/default/content/presets/novel/Erato-Wilder.json new file mode 100644 index 000000000..474d540cc --- /dev/null +++ b/default/content/presets/novel/Erato-Wilder.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 300, + "top_p": 0.98, + "top_a": 0.004, + "typical_p": 0.96, + "tail_free_sampling": 0.96, + "repetition_penalty": 1.48, + "repetition_penalty_range": 2240, + "repetition_penalty_slope": 0.64, + "repetition_penalty_frequency": 0, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "medium", + "mirostat_lr": 1, + "mirostat_tau": 0, + "math1_temp": -0.0485, + "math1_quad": 0.145, + "math1_quad_entropy_scale": 0, + "min_p": 0.02, + "order": [ + 9, + 10 + ] +} diff --git a/default/content/presets/novel/Erato-Zany Scribe.json b/default/content/presets/novel/Erato-Zany Scribe.json new file mode 100644 index 000000000..2f94d92bc --- /dev/null +++ b/default/content/presets/novel/Erato-Zany Scribe.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 0, + "top_p": 0.99, + "top_a": 1, + "typical_p": 1, + "tail_free_sampling": 0.99, + "repetition_penalty": 1, + "repetition_penalty_range": 64, + "repetition_penalty_slope": 1, + "repetition_penalty_frequency": 0.75, + "repetition_penalty_presence": 1.5, + "phrase_rep_pen": "medium", + "mirostat_lr": 1, + "mirostat_tau": 1, + "math1_temp": -0.4, + "math1_quad": 0.6, + "math1_quad_entropy_scale": -0.1, + "min_p": 0.08, + "order": [ + 9, + 2 + ] +} diff --git a/default/content/presets/novel/Fresh-Coffee-Clio.json b/default/content/presets/novel/Fresh-Coffee-Clio.json index 15df88905..729a4b438 100644 --- a/default/content/presets/novel/Fresh-Coffee-Clio.json +++ b/default/content/presets/novel/Fresh-Coffee-Clio.json @@ -16,7 +16,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Fresh-Coffee-Kayra.json b/default/content/presets/novel/Fresh-Coffee-Kayra.json index 4abbc5bec..162b8e778 100644 --- a/default/content/presets/novel/Fresh-Coffee-Kayra.json +++ b/default/content/presets/novel/Fresh-Coffee-Kayra.json @@ -14,7 +14,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "off", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Green-Active-Writer-Kayra.json b/default/content/presets/novel/Green-Active-Writer-Kayra.json index 7fe1e6eb1..635f3fbc1 100644 --- a/default/content/presets/novel/Green-Active-Writer-Kayra.json +++ b/default/content/presets/novel/Green-Active-Writer-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 8, 5, 3], + "order": [0, 8, 5, 3], "temperature": 1.5, "max_length": 150, "min_length": 1, @@ -15,7 +15,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "very_aggressive", - "cfg_scale": 1.4, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Keelback-Clio.json b/default/content/presets/novel/Keelback-Clio.json index 821bbdd42..5beba6606 100644 --- a/default/content/presets/novel/Keelback-Clio.json +++ b/default/content/presets/novel/Keelback-Clio.json @@ -16,7 +16,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Long-Press-Clio.json b/default/content/presets/novel/Long-Press-Clio.json index 3bd67c84a..c2900a2de 100644 --- a/default/content/presets/novel/Long-Press-Clio.json +++ b/default/content/presets/novel/Long-Press-Clio.json @@ -16,7 +16,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Pilotfish-Kayra.json b/default/content/presets/novel/Pilotfish-Kayra.json index 87cd24ba4..15a8726c6 100644 --- a/default/content/presets/novel/Pilotfish-Kayra.json +++ b/default/content/presets/novel/Pilotfish-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 4, 1, 2, 5, 3], + "order": [0, 4, 1, 2, 5, 3], "temperature": 1.31, "max_length": 150, "min_length": 1, @@ -17,7 +17,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "cfg_scale": 1.35, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Pro_Writer-Kayra.json b/default/content/presets/novel/Pro_Writer-Kayra.json index 11a18f031..374f96ae3 100644 --- a/default/content/presets/novel/Pro_Writer-Kayra.json +++ b/default/content/presets/novel/Pro_Writer-Kayra.json @@ -15,7 +15,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "cfg_scale": 1.0, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Talker-Chat-Clio.json b/default/content/presets/novel/Talker-Chat-Clio.json index 390cbf178..de93b11dc 100644 --- a/default/content/presets/novel/Talker-Chat-Clio.json +++ b/default/content/presets/novel/Talker-Chat-Clio.json @@ -16,7 +16,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/novel/Tea_Time-Kayra.json b/default/content/presets/novel/Tea_Time-Kayra.json index 2142a0c2b..4d40d66cd 100644 --- a/default/content/presets/novel/Tea_Time-Kayra.json +++ b/default/content/presets/novel/Tea_Time-Kayra.json @@ -14,7 +14,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "aggressive", - "cfg_scale": 1.0, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Tesseract-Kayra.json b/default/content/presets/novel/Tesseract-Kayra.json index 0948dbe60..f4e44a123 100644 --- a/default/content/presets/novel/Tesseract-Kayra.json +++ b/default/content/presets/novel/Tesseract-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 5], + "order": [0, 5], "temperature": 0.895, "max_length": 150, "min_length": 1, @@ -13,7 +13,6 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "aggressive", - "cfg_scale": 1.3, "max_context": 7800, "min_p": 0, "math1_temp": 1, diff --git a/default/content/presets/novel/Vingt-Un-Clio.json b/default/content/presets/novel/Vingt-Un-Clio.json index bf0eb8f23..b6e594c75 100644 --- a/default/content/presets/novel/Vingt-Un-Clio.json +++ b/default/content/presets/novel/Vingt-Un-Clio.json @@ -16,7 +16,6 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", "max_context": 7800, "min_p": 0, diff --git a/default/content/presets/openai/Default.json b/default/content/presets/openai/Default.json index 4e6076d5a..b8a38560c 100644 --- a/default/content/presets/openai/Default.json +++ b/default/content/presets/openai/Default.json @@ -5,7 +5,6 @@ "windowai_model": "", "openrouter_model": "OR_Website", "openrouter_use_fallback": false, - "openrouter_force_instruct": false, "openrouter_group_models": false, "openrouter_sort_models": "alphabetically", "ai21_model": "jamba-1.5-large", diff --git a/default/content/presets/sysprompt/Actor.json b/default/content/presets/sysprompt/Actor.json new file mode 100644 index 000000000..3fa842c4f --- /dev/null +++ b/default/content/presets/sysprompt/Actor.json @@ -0,0 +1,4 @@ +{ + "name": "Actor", + "content": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}." +} diff --git a/default/content/presets/sysprompt/Assistant - Expert.json b/default/content/presets/sysprompt/Assistant - Expert.json new file mode 100644 index 000000000..a493a8db3 --- /dev/null +++ b/default/content/presets/sysprompt/Assistant - Expert.json @@ -0,0 +1,4 @@ +{ + "name": "Assistant - Expert", + "content": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate." +} diff --git a/default/content/presets/sysprompt/Assistant - Simple.json b/default/content/presets/sysprompt/Assistant - Simple.json new file mode 100644 index 000000000..8a367983a --- /dev/null +++ b/default/content/presets/sysprompt/Assistant - Simple.json @@ -0,0 +1,4 @@ +{ + "name": "Assistant - Simple", + "content": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions." +} diff --git a/default/content/presets/sysprompt/Blank.json b/default/content/presets/sysprompt/Blank.json new file mode 100644 index 000000000..9648d8583 --- /dev/null +++ b/default/content/presets/sysprompt/Blank.json @@ -0,0 +1,4 @@ +{ + "name": "Blank", + "content": "" +} diff --git a/default/content/presets/sysprompt/Chain of Thought.json b/default/content/presets/sysprompt/Chain of Thought.json new file mode 100644 index 000000000..0b9e45bea --- /dev/null +++ b/default/content/presets/sysprompt/Chain of Thought.json @@ -0,0 +1,4 @@ +{ + "name": "Chain of Thought", + "content": "Elaborate on the topic using a Tree of Thoughts and backtrack when necessary to construct a clear, cohesive Chain of Thought reasoning. Always answer without hesitation." +} diff --git a/default/content/presets/sysprompt/Neutral - Chat.json b/default/content/presets/sysprompt/Neutral - Chat.json new file mode 100644 index 000000000..9b392d28d --- /dev/null +++ b/default/content/presets/sysprompt/Neutral - Chat.json @@ -0,0 +1,4 @@ +{ + "name": "Neutral - Chat", + "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}." +} diff --git a/default/content/presets/sysprompt/Roleplay - Detailed.json b/default/content/presets/sysprompt/Roleplay - Detailed.json new file mode 100644 index 000000000..2e3c95c7a --- /dev/null +++ b/default/content/presets/sysprompt/Roleplay - Detailed.json @@ -0,0 +1,4 @@ +{ + "name": "Roleplay - Detailed", + "content": "Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions. Keep the story immersive and engaging." +} diff --git a/default/content/presets/sysprompt/Roleplay - Immersive.json b/default/content/presets/sysprompt/Roleplay - Immersive.json new file mode 100644 index 000000000..cdd85f7d2 --- /dev/null +++ b/default/content/presets/sysprompt/Roleplay - Immersive.json @@ -0,0 +1,4 @@ +{ + "name": "Roleplay - Immersive", + "content": "[System note: Write one reply only. Do not decide what {{user}} says or does. Write at least one paragraph, up to four. Be descriptive and immersive, providing vivid details about {{char}}'s actions, emotions, and the environment. Write with a high degree of complexity and burstiness. Do not repeat this message.]" +} diff --git a/default/content/presets/sysprompt/Roleplay - Simple.json b/default/content/presets/sysprompt/Roleplay - Simple.json new file mode 100644 index 000000000..dcef1f10c --- /dev/null +++ b/default/content/presets/sysprompt/Roleplay - Simple.json @@ -0,0 +1,4 @@ +{ + "name": "Roleplay - Simple", + "content": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}." +} diff --git a/default/content/presets/sysprompt/Text Adventure.json b/default/content/presets/sysprompt/Text Adventure.json new file mode 100644 index 000000000..2e22abe5b --- /dev/null +++ b/default/content/presets/sysprompt/Text Adventure.json @@ -0,0 +1,4 @@ +{ + "name": "Text Adventure", + "content": "[Enter Adventure Mode. Narrate the story based on {{user}}'s dialogue and actions after \">\". Describe the surroundings in vivid detail. Be detailed, creative, verbose, and proactive. Move the story forward by introducing fantasy elements and interesting characters.]" +} diff --git a/default/content/presets/sysprompt/Writer - Creative.json b/default/content/presets/sysprompt/Writer - Creative.json new file mode 100644 index 000000000..65a7aec52 --- /dev/null +++ b/default/content/presets/sysprompt/Writer - Creative.json @@ -0,0 +1,4 @@ +{ + "name": "Writer - Creative", + "content": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below." +} diff --git a/default/content/presets/sysprompt/Writer - Realistic.json b/default/content/presets/sysprompt/Writer - Realistic.json new file mode 100644 index 000000000..a5abcbfb5 --- /dev/null +++ b/default/content/presets/sysprompt/Writer - Realistic.json @@ -0,0 +1,4 @@ +{ + "name": "Writer - Realistic", + "content": "Continue writing this story and portray characters realistically." +} diff --git a/default/content/settings.json b/default/content/settings.json index ebe51a22f..86806f963 100644 --- a/default/content/settings.json +++ b/default/content/settings.json @@ -90,7 +90,6 @@ "pin_examples": false, "strip_examples": false, "trim_sentences": false, - "include_newline": false, "always_force_name2": true, "user_prompt_bias": "", "show_user_prompt_bias": true, @@ -150,11 +149,9 @@ "continue_on_send": false, "trim_spaces": true, "relaxed_api_urls": false, - "default_instruct": "", "instruct": { "enabled": false, "preset": "Alpaca", - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "### Instruction:", "output_sequence": "### Response:", "last_output_sequence": "", @@ -174,7 +171,11 @@ "user_alignment_message": "", "system_same_as_user": false }, - "default_context": "Default", + "sysprompt": { + "enabled": true, + "name": "Neutral - Chat", + "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}." + }, "context": { "preset": "Default", "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", @@ -234,7 +235,7 @@ "lengthPenaltyStep": 0.1, "memoryFrozen": false, "source": "extras", - "prompt": "[Pause your roleplay. Summarize the most important facts and events that have happened in the chat so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.]", + "prompt": "Ignore previous instructions. Summarize the most important facts and events in the story so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.", "promptWords": 200, "promptMinWords": 25, "promptMaxWords": 1000, @@ -297,13 +298,13 @@ "horde_karras": true, "refine_mode": false, "prompts": { - "0": "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,']", - "1": "[Pause your roleplay and provide a detailed description of {{user}}'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'. Ignore the rest of the story when crafting this description. Do not roleplay as {{char}} when writing this description, and do not attempt to continue the story.]", - "2": "[Pause your roleplay and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not roleplay while writing this description.]", - "3": "[Pause your roleplay and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not roleplay at all in your response. Do not continue the roleplay story.]", - "4": "[Pause your roleplay. Your next response must be formatted as a single comma-delimited list of concise keywords. The list will describe of the visual details included in the last chat message.\n\n Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').\n\n Ignore non-visible things such as feelings, personality traits, thoughts, and spoken dialog.\n\n Add keywords in this precise order:\n a keyword to describe the location of the scene,\n a keyword to mention how many characters of each gender or type are present in the scene (minimum of two characters:\n {{user}} and {{char}}, example: '2 men ' or '1 man 1 woman ', '1 man 3 robots'),\n\n keywords to describe the relative physical positioning of the characters to each other (if a commonly known term for the positioning is known use it instead of describing the positioning in detail) + 'POV',\n\n a single keyword or phrase to describe the primary act taking place in the last chat message,\n\n keywords to describe {{char}}'s physical appearance and facial expression,\n keywords to describe {{char}}'s actions,\n keywords to describe {{user}}'s physical appearance and actions.\n\n If character actions involve direct physical interaction with another character, mention specifically which body parts interacting and how.\n\n A correctly formatted example response would be:\n '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)']", - "5": "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait,']", - "7": "[Pause your roleplay and provide a detailed description of {{char}}'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'background,'. Ignore the rest of the story when crafting this description. Do not roleplay as {{user}} when writing this description, and do not attempt to continue the story.]" + "0": "In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'", + "1": "Ignore previous instructions and provide a detailed description of {{user}}'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'. Ignore the rest of the story when crafting this description. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.", + "2": "Ignore previous instructions and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.", + "3": "Ignore previous instructions and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.", + "4": "Ignore previous instructions. Your next response must be formatted as a single comma-delimited list of concise keywords. The list will describe of the visual details included in the last chat message.\n\n Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').\n\n Ignore non-visible things such as feelings, personality traits, thoughts, and spoken dialog.\n\n Add keywords in this precise order:\n a keyword to describe the location of the scene,\n a keyword to mention how many characters of each gender or type are present in the scene (minimum of two characters:\n {{user}} and {{char}}, example: '2 men ' or '1 man 1 woman ', '1 man 3 robots'),\n\n keywords to describe the relative physical positioning of the characters to each other (if a commonly known term for the positioning is known use it instead of describing the positioning in detail) + 'POV',\n\n a single keyword or phrase to describe the primary act taking place in the last chat message,\n\n keywords to describe {{char}}'s physical appearance and facial expression,\n keywords to describe {{char}}'s actions,\n keywords to describe {{user}}'s physical appearance and actions.\n\n If character actions involve direct physical interaction with another character, mention specifically which body parts interacting and how.\n\n A correctly formatted example response would be:\n '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)'", + "5": "In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait,'", + "7": "Ignore previous instructions and provide a detailed description of {{char}}'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'background,'. Ignore the rest of the story when crafting this description. Do not reply as {{user}} when writing this description, and do not attempt to continue the story." }, "character_prompts": {} }, @@ -317,9 +318,9 @@ "objective": { "customPrompts": { "default": { - "createTask": "Pause your roleplay and generate a list of tasks to complete an objective. Your next response must be formatted as a numbered list of plain text entries. Do not include anything but the numbered list. The list must be prioritized in the order that tasks must be completed.\n\nThe objective that you must make a numbered task list for is: [{{objective}}].\nThe tasks created should take into account the character traits of {{char}}. These tasks may or may not involve {{user}} directly. Be sure to include the objective as the final task.\n\nGiven an example objective of 'Make me a four course dinner', here is an example output:\n1. Determine what the courses will be\n2. Find recipes for each course\n3. Go shopping for supplies with {{user}}\n4. Cook the food\n5. Get {{user}} to set the table\n6. Serve the food\n7. Enjoy eating the meal with {{user}}\n ", - "checkTaskCompleted": "Pause your roleplay. Determine if this task is completed: [{{task}}].\nTo do this, examine the most recent messages. Your response must only contain either true or false, nothing other words.\nExample output:\ntrue\n ", - "currentTask": "Your current task is [{{task}}]. Balance existing roleplay with completing this task." + "createTask": "Ignore previous instructions and generate a list of tasks to complete an objective. Your next response must be formatted as a numbered list of plain text entries. Do not include anything but the numbered list. The list must be prioritized in the order that tasks must be completed.\n\nThe objective that you must make a numbered task list for is: [{{objective}}].\nThe tasks created should take into account the character traits of {{char}}. These tasks may or may not involve {{user}} directly. Be sure to include the objective as the final task.\n\nGiven an example objective of 'Make me a four course dinner', here is an example output:\n1. Determine what the courses will be\n2. Find recipes for each course\n3. Go shopping for supplies with {{user}}\n4. Cook the food\n5. Get {{user}} to set the table\n6. Serve the food\n7. Enjoy eating the meal with {{user}}\n ", + "checkTaskCompleted": "Ignore previous instructions. Determine if this task is completed: [{{task}}].\nTo do this, examine the most recent messages. Your response must only contain either true or false, nothing other words.\nExample output:\ntrue\n ", + "currentTask": "Your current task is [{{task}}]. Balance existing story with completing this task." } } }, @@ -416,7 +417,6 @@ "preset_settings_novel": "Talker-Chat-Clio", "streaming_novel": true, "preamble": "[ Style: chat, complex, sensory, visceral ]", - "cfg_uc": "", "banned_tokens": "", "order": [ 1, diff --git a/package-lock.json b/package-lock.json index f0476f154..94134d9b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sillytavern", - "version": "1.12.5", + "version": "1.12.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sillytavern", - "version": "1.12.5", + "version": "1.12.6", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 7aed31810..382d6ab57 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "type": "git", "url": "https://github.com/SillyTavern/SillyTavern.git" }, - "version": "1.12.5", + "version": "1.12.6", "scripts": { "start": "node server.js", "start:no-csrf": "node server.js --disableCsrf", diff --git a/public/css/promptmanager.css b/public/css/promptmanager.css index 6953a5e3f..24bc05bfc 100644 --- a/public/css/promptmanager.css +++ b/public/css/promptmanager.css @@ -91,15 +91,34 @@ #completion_prompt_manager_popup #completion_prompt_manager_popup_inspect { display: none; padding: 0.5em; + height: 100%; + display: flex; + flex-direction: column; } #completion_prompt_manager_popup .completion_prompt_manager_popup_entry { - padding: 1em; - margin-top: 2em; + padding: 0.5em; + flex: 1; +} + +#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form { + height: 100%; + display: flex; + flex-direction: column; +} + +#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt) { + flex: 1; + display: flex; + flex-direction: column; +} + +#completion_prompt_manager_popup #completion_prompt_manager_popup_entry_form_prompt { + flex: 1; } #completion_prompt_manager_popup #completion_prompt_manager_popup_inspect .completion_prompt_manager_popup_entry { - padding: 1em; + padding: 0.5em; } #completion_prompt_manager_popup #completion_prompt_manager_popup_entry_form_inspect_list { @@ -248,7 +267,7 @@ } #completion_prompt_manager_footer_append_prompt { - font-size: 16px; + font-size: 1em; } #prompt-manager-export-format-popup { @@ -303,10 +322,6 @@ justify-content: space-between; } -#prompt-manager-export-format-popup span { - font-size: 16px; -} - @media screen and (max-width: 412px) { #completion_prompt_manager_popup { max-width: 100%; @@ -317,7 +332,7 @@ } } -.completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt:disabled) > div:first-child::after { +.completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt:disabled)>div:first-child::after { content: 'The content of this prompt is pulled from elsewhere and cannot be edited here.'; display: block; width: 100%; diff --git a/public/index.html b/public/index.html index f306f5a1f..9e53da59f 100644 --- a/public/index.html +++ b/public/index.html @@ -119,7 +119,7 @@
- + @@ -532,32 +532,6 @@
-
-
-
- CFG Scale -
-
-
- -
-
- -
-
-
-
-
- Negative Prompt -
-
- -
- - Used if CFG Scale is unset globally, per chat or character - -
-
@@ -1154,12 +1128,7 @@ 5
-
- CFG - 6 -
-
- +
Mirostat 8 @@ -1341,7 +1310,7 @@
-
+

@@ -2100,6 +2069,7 @@
@@ -2445,14 +2415,15 @@

Tabby Model

- - EXPERIMENTAL FEATURE. USE AT YOUR OWN RISK. DON'T ASK FOR SUPPORT ON THIS. - +
+ + Experimental feature. Use at your own risk. +
@@ -2827,22 +2798,10 @@ Allow fallback providers
-
- -
- - If both Instruct Mode and this are enabled, the prompt will be formatted by SillyTavern using the current - advanced formatting settings (except instruct System Prompt). If disabled, the prompt will be formatted by OpenRouter. - -
-
+ + + To use instruct formatting, switch to OpenRouter under Text Completion API. +
@@ -2924,10 +2883,13 @@ + + + @@ -3162,9 +3124,22 @@
-

- Advanced Formatting -

+
+

+ Advanced Formatting +

+
+ + + +
+

-
- - - - - - - - -
+
+ + + + + + + +
- -
-
-

- - Custom Stopping Strings - - - - -

-
- - JSON serialized array of strings - - -
-
- -
- -
@@ -3308,29 +3249,28 @@
- +
-
- - - - - - - - -
+
+ + + + + + + +