From 391c3e9eff4584d47ef21aad83be93bec2d89801 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 19 Apr 2024 22:08:31 +0300
Subject: [PATCH] Remove dupes, change system prompt

---
 .../presets/context/Llama 3 Context.json      | 12 ----------
 .../presets/instruct/Llama 3 Instruct.json    |  4 ++--
 default/content/presets/instruct/Llama 3.json | 24 -------------------
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 default/content/presets/context/Llama 3 Context.json
 delete mode 100644 default/content/presets/instruct/Llama 3.json

diff --git a/default/content/presets/context/Llama 3 Context.json b/default/content/presets/context/Llama 3 Context.json
deleted file mode 100644
index c5af17def..000000000
--- a/default/content/presets/context/Llama 3 Context.json	
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "story_string": "<|begin_of_text|><|start_header_id|>system<|end_header_id|>\n\n{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{personality}}\n{{/if}}{{#if scenario}}{{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}{{trim}}<|eot_id|>",
-    "example_separator": "",
-    "chat_start": "",
-    "use_stop_strings": false,
-    "allow_jailbreak": false,
-    "always_force_name2": false,
-    "trim_sentences": true,
-    "include_newline": true,
-    "single_line": false,
-    "name": "Llama 3 Context"
-}
\ No newline at end of file
diff --git a/default/content/presets/instruct/Llama 3 Instruct.json b/default/content/presets/instruct/Llama 3 Instruct.json
index 786540fec..111501287 100644
--- a/default/content/presets/instruct/Llama 3 Instruct.json	
+++ b/default/content/presets/instruct/Llama 3 Instruct.json	
@@ -1,5 +1,5 @@
 {
-    "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
+    "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": "",
@@ -21,4 +21,4 @@
     "system_same_as_user": false,
     "last_system_sequence": "",
     "name": "Llama 3 Instruct"
-}
\ No newline at end of file
+}
diff --git a/default/content/presets/instruct/Llama 3.json b/default/content/presets/instruct/Llama 3.json
deleted file mode 100644
index 1fd085ab5..000000000
--- a/default/content/presets/instruct/Llama 3.json	
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "wrap": false,
-    "names": true,
-    "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}}.",
-    "system_sequence": "<|start_header_id|>user({{name}})<|end_header_id|>\n\n",
-    "stop_sequence": "<|eot_id|>",
-    "input_sequence": "<|start_header_id|>user({{user}})<|end_header_id|>\n\n",
-    "output_sequence": "<|start_header_id|>assistant({{char}})<|end_header_id|>\n\n",
-    "macro": true,
-    "names_force_groups": false,
-    "last_output_sequence": "",
-    "activation_regex": "",
-    "system_sequence_prefix": "",
-    "system_sequence_suffix": "",
-    "first_output_sequence": "",
-    "skip_examples": false,
-    "output_suffix": "<|eot_id|>",
-    "input_suffix": "<|eot_id|>",
-    "system_suffix": "<|eot_id|>",
-    "user_alignment_message": "",
-    "system_same_as_user": false,
-    "last_system_sequence": "",
-    "name": "Llama 3"
-}
\ No newline at end of file