Merge pull request #3911 from cloak1505/staging Normalize instruct names behavior and repair Lightning 1.1's system prompt
Signed| @@ -756,6 +756,10 @@ | |||
| 756 | "type": "sysprompt" | 756 | "type": "sysprompt" |
| 757 | }, | 757 | }, |
| 758 | { | 758 | { |
| 759 | "filename": "presets/sysprompt/Lightning 1.1.json", | ||
| 760 | "type": "sysprompt" | ||
| 761 | }, | ||
| 762 | { | ||
| 759 | "filename": "presets/instruct/Mistral V1.json", | 763 | "filename": "presets/instruct/Mistral V1.json", |
| 760 | "type": "instruct" | 764 | "type": "instruct" |
| 761 | }, | 765 | }, |
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "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}}", | 2 | "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", |
| 3 | "example_separator": "Example of an interaction:", | 3 | "example_separator": "Example of an interaction:\n", |
| 4 | "chat_start": "This is the history of the roleplay:", | 4 | "chat_start": "This is the history of the roleplay:\n", |
| 5 | "use_stop_strings": false, | 5 | "use_stop_strings": false, |
| 6 | "allow_jailbreak": false, | 6 | "allow_jailbreak": false, |
| 7 | "always_force_name2": true, | 7 | "always_force_name2": true, |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "<|im_end|>", | 6 | "stop_sequence": "<|im_end|>", |
| 7 | "wrap": true, | 7 | "wrap": true, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -8,7 +8,7 @@ | |||
| 8 | "stop_sequence": "<|END_OF_TURN_TOKEN|>", | 8 | "stop_sequence": "<|END_OF_TURN_TOKEN|>", |
| 9 | "wrap": false, | 9 | "wrap": false, |
| 10 | "macro": true, | 10 | "macro": true, |
| 11 | "names_behavior": "always", | 11 | "names_behavior": "force", |
| 12 | "activation_regex": "", | 12 | "activation_regex": "", |
| 13 | "skip_examples": false, | 13 | "skip_examples": false, |
| 14 | "output_suffix": "<|END_OF_TURN_TOKEN|>", | 14 | "output_suffix": "<|END_OF_TURN_TOKEN|>", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "<end_of_turn>", | 6 | "stop_sequence": "<end_of_turn>", |
| 7 | "wrap": true, | 7 | "wrap": true, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "none", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "input_sequence": "### Instruction:", | 2 | "input_sequence": "### Instruction:", |
| 3 | "output_sequence": "### Response: (length = unlimited)", | 3 | "output_sequence": "### Response:", |
| 4 | "last_output_sequence": "", | 4 | "last_output_sequence": "### Response: (length = unlimited)", |
| 5 | "system_sequence": "", | 5 | "system_sequence": "", |
| 6 | "stop_sequence": "", | 6 | "stop_sequence": "", |
| 7 | "wrap": true, | 7 | "wrap": true, |
| @@ -12,8 +12,8 @@ | |||
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| 13 | "first_output_sequence": "", | 13 | "first_output_sequence": "", |
| 14 | "skip_examples": false, | 14 | "skip_examples": false, |
| 15 | "output_suffix": "", | 15 | "output_suffix": "\n\n", |
| 16 | "input_suffix": "", | 16 | "input_suffix": "\n\n", |
| 17 | "system_suffix": "", | 17 | "system_suffix": "", |
| 18 | "user_alignment_message": "", | 18 | "user_alignment_message": "", |
| 19 | "system_same_as_user": true, | 19 | "system_same_as_user": true, |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "<|eot_id|>", | 6 | "stop_sequence": "<|eot_id|>", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "<|eot|>", | 6 | "stop_sequence": "<|eot|>", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "", | 6 | "stop_sequence": "", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "", | 6 | "stop_sequence": "", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "", | 6 | "stop_sequence": "", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "</s>", | 6 | "stop_sequence": "</s>", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "", | 11 | "system_sequence_prefix": "", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -8,7 +8,7 @@ | |||
| 8 | "stop_sequence": "<|end|>", | 8 | "stop_sequence": "<|end|>", |
| 9 | "wrap": false, | 9 | "wrap": false, |
| 10 | "macro": true, | 10 | "macro": true, |
| 11 | "names_behavior": "always", | 11 | "names_behavior": "force", |
| 12 | "activation_regex": "", | 12 | "activation_regex": "", |
| 13 | "skip_examples": false, | 13 | "skip_examples": false, |
| 14 | "output_suffix": "<|end|>\n", | 14 | "output_suffix": "<|end|>\n", |
| @@ -6,7 +6,7 @@ | |||
| 6 | "stop_sequence": "<|user|>", | 6 | "stop_sequence": "<|user|>", |
| 7 | "wrap": false, | 7 | "wrap": false, |
| 8 | "macro": true, | 8 | "macro": true, |
| 9 | "names_behavior": "always", | 9 | "names_behavior": "force", |
| 10 | "activation_regex": "", | 10 | "activation_regex": "", |
| 11 | "system_sequence_prefix": "<|system|>", | 11 | "system_sequence_prefix": "<|system|>", |
| 12 | "system_sequence_suffix": "", | 12 | "system_sequence_suffix": "", |
| @@ -8,7 +8,7 @@ | |||
| 8 | "stop_sequence": "<|end_of_text|>", | 8 | "stop_sequence": "<|end_of_text|>", |
| 9 | "wrap": false, | 9 | "wrap": false, |
| 10 | "macro": true, | 10 | "macro": true, |
| 11 | "names_behavior": "always", | 11 | "names_behavior": "force", |
| 12 | "activation_regex": "", | 12 | "activation_regex": "", |
| 13 | "skip_examples": false, | 13 | "skip_examples": false, |
| 14 | "output_suffix": "<|end_of_text|>\n", | 14 | "output_suffix": "<|end_of_text|>\n", |
| @@ -0,0 +1,4 @@ | |||
| 1 | { | ||
| 2 | "name": "Lightning 1.1", | ||
| 3 | "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." | ||
| 4 | } | ||