Merge branch 'staging' into qr-rewrite

public/context/Alpaca-Single-Turn.json

@@ -0,0 +1,11 @@
+{
+    "story_string": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\n{{#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}}",
+    "example_separator": "",
+    "chat_start": "",
+    "use_stop_strings": false,
+    "always_force_name2": false,
+    "trim_sentences": false,
+    "include_newline": false,
+    "single_line": false,
+    "name": "Alpaca-Single-Turn"
+}

public/instruct/Alpaca-Single-Turn.json

@@ -0,0 +1,17 @@
+{
+    "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": "",
+    "first_output_sequence": "<START OF ROLEPLAY>",
+    "last_output_sequence": "\n### Response:",
+    "system_sequence_prefix": "",
+    "system_sequence_suffix": "",
+    "stop_sequence": "",
+    "separator_sequence": "",
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true,
+    "activation_regex": "",
+    "name": "Alpaca-Single-Turn"
+}

public/script.js

@@ -3655,6 +3655,8 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
                 scenario,
                 char: name2,
                 user: name1,
+                worldInfoBefore,
+                worldInfoAfter,
                 beforeScenarioAnchor,
                 afterScenarioAnchor,
                 mesExmString,