Remove "include newlines" checkbox from context formatting settings

2025-06-05 21:59:27 +02:00 · 2024-09-22 19:55:43 +03:00
parent 93bf87b035
commit a18dae8f69
32 changed files with 19 additions and 74 deletions
--- 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"
-}
+}
--- a/default/content/presets/context/Alpaca-Roleplay.json
+++ b/default/content/presets/context/Alpaca-Roleplay.json
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Alpaca-Roleplay"
 }
--- 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"
-}
+}
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- a/default/content/presets/context/Command
+++ b/default/content/presets/context/Command
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Command R"
-}
+}
--- 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"
-}
+}
--- a/default/content/presets/context/DreamGen
+++ b/default/content/presets/context/DreamGen
@@ -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"
-}
+}
--- a/default/content/presets/context/DreamGen
+++ b/default/content/presets/context/DreamGen
@@ -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"
-}
+}
--- a/default/content/presets/context/Gemma
+++ b/default/content/presets/context/Gemma
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Gemma 2"
-}
+}
--- a/default/content/presets/context/Libra-32B.json
+++ b/default/content/presets/context/Libra-32B.json
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Libra-32B"
-}
+}
--- a/default/content/presets/context/Lightning
+++ b/default/content/presets/context/Lightning
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Lightning 1.1"
-}
+}
--- a/default/content/presets/context/Llama
+++ b/default/content/presets/context/Llama
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Llama 2 Chat"
 }
--- a/default/content/presets/context/Llama
+++ b/default/content/presets/context/Llama
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Llama 3 Instruct"
-}
+}
--- 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"
 }
--- 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"
-}
+}
--- a/default/content/presets/context/Mistral
+++ b/default/content/presets/context/Mistral
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Mistral V1"
 }
--- a/default/content/presets/context/Mistral
+++ b/default/content/presets/context/Mistral
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Mistral V2 & V3"
 }
--- a/default/content/presets/context/Mistral
+++ b/default/content/presets/context/Mistral
@@ -6,7 +6,6 @@
    "allow_jailbreak": false,
    "always_force_name2": true,
    "trim_sentences": false,
-    "include_newline": false,
    "single_line": false,
    "name": "Mistral V3-Tekken"
 }
--- 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"
-}
+}
--- 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"
-}
+}
--- 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"
-}
+}
--- 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"
-}
+}
--- 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"
-}
+}
--- 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"
 }
--- 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"
-}
+}
--- 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,