Merge pull request #3911 from cloak1505/staging

Normalize instruct names behavior and repair Lightning 1.1's system prompt

default/content/index.json

@@ -755,6 +755,10 @@
         "filename": "presets/sysprompt/Neutral - Chat.json",
         "type": "sysprompt"
     },
+    {
+        "filename": "presets/sysprompt/Lightning 1.1.json",
+        "type": "sysprompt"
+    },
     {
         "filename": "presets/instruct/Mistral V1.json",
         "type": "instruct"

default/content/presets/context/Lightning 1.1.json

@@ -1,7 +1,7 @@
 {
-    "story_string": "{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s 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}}{{user}}'s persona: {{persona}}\n{{/if}}",
-    "example_separator": "Example of an interaction:",
-    "chat_start": "This is the history of the roleplay:",
+    "story_string": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\n{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s 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}}{{user}}'s persona: {{persona}}\n{{/if}}\n\n",
+    "example_separator": "Example of an interaction:\n",
+    "chat_start": "This is the history of the roleplay:\n",
     "use_stop_strings": false,
     "allow_jailbreak": false,
     "always_force_name2": true,

default/content/presets/instruct/ChatML.json

@@ -6,7 +6,7 @@
     "stop_sequence": "<|im_end|>",
     "wrap": true,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Command R.json

@@ -8,7 +8,7 @@
     "stop_sequence": "<|END_OF_TURN_TOKEN|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|END_OF_TURN_TOKEN|>",

default/content/presets/instruct/Gemma 2.json

@@ -6,7 +6,7 @@
     "stop_sequence": "<end_of_turn>",
     "wrap": true,
     "macro": true,
-    "names_behavior": "none",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Lightning 1.1.json

@@ -1,7 +1,7 @@
 {
     "input_sequence": "### Instruction:",
-    "output_sequence": "### Response: (length = unlimited)",
-    "last_output_sequence": "",
+    "output_sequence": "### Response:",
+    "last_output_sequence": "### Response: (length = unlimited)",
     "system_sequence": "",
     "stop_sequence": "",
     "wrap": true,
@@ -12,8 +12,8 @@
     "system_sequence_suffix": "",
     "first_output_sequence": "",
     "skip_examples": false,
-    "output_suffix": "",
-    "input_suffix": "",
+    "output_suffix": "\n\n",
+    "input_suffix": "\n\n",
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,

default/content/presets/instruct/Llama 3 Instruct.json

@@ -6,7 +6,7 @@
     "stop_sequence": "<|eot_id|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Llama 4 Instruct.json

@@ -6,7 +6,7 @@
     "stop_sequence": "<|eot|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Mistral V1.json

@@ -6,7 +6,7 @@
     "stop_sequence": "",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Mistral V2 & V3.json

@@ -6,7 +6,7 @@
     "stop_sequence": "",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Mistral V3-Tekken.json

@@ -6,7 +6,7 @@
     "stop_sequence": "",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Mistral V7.json

@@ -6,7 +6,7 @@
     "stop_sequence": "</s>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",

default/content/presets/instruct/Phi.json

@@ -8,7 +8,7 @@
     "stop_sequence": "<|end|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|end|>\n",

default/content/presets/instruct/Pygmalion.json

@@ -6,7 +6,7 @@
     "stop_sequence": "<|user|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "<|system|>",
     "system_sequence_suffix": "",

default/content/presets/instruct/Tulu.json

@@ -8,7 +8,7 @@
     "stop_sequence": "<|end_of_text|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|end_of_text|>\n",

default/content/presets/sysprompt/Lightning 1.1.json

@@ -0,0 +1,4 @@
+{
+    "name": "Lightning 1.1",
+    "content": "Take 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."
+}