From db2971c82d226b08ddeaff7e3f843ee5bf95d22c Mon Sep 17 00:00:00 2001
From: cloak1505 <170299980+cloak1505@users.noreply.github.com>
Date: Thu, 1 May 2025 03:24:28 -0500
Subject: [PATCH] Remove Pygmalion instruct template (duplicate of Metharme)

ST already applies user sequence as stop string, so Pygmalion's <|user|> stop_sequence is meaningless.
---
 default/content/index.json                    |  6 +----
 .../context/{Pygmalion.json => Metharme.json} |  2 +-
 .../content/presets/instruct/Pygmalion.json   | 22 -------------------
 3 files changed, 2 insertions(+), 28 deletions(-)
 rename default/content/presets/context/{Pygmalion.json => Metharme.json} (95%)
 delete mode 100644 default/content/presets/instruct/Pygmalion.json

diff --git a/default/content/index.json b/default/content/index.json
index 3557ea8e0..c74592051 100644
--- a/default/content/index.json
+++ b/default/content/index.json
@@ -540,7 +540,7 @@
         "type": "context"
     },
     {
-        "filename": "presets/context/Pygmalion.json",
+        "filename": "presets/context/Metharme.json",
         "type": "context"
     },
     {
@@ -619,10 +619,6 @@
         "filename": "presets/instruct/OpenOrca-OpenChat.json",
         "type": "instruct"
     },
-    {
-        "filename": "presets/instruct/Pygmalion.json",
-        "type": "instruct"
-    },
     {
         "filename": "presets/instruct/Story.json",
         "type": "instruct"
diff --git a/default/content/presets/context/Pygmalion.json b/default/content/presets/context/Metharme.json
similarity index 95%
rename from default/content/presets/context/Pygmalion.json
rename to default/content/presets/context/Metharme.json
index 38a81adc6..f27b140bf 100644
--- a/default/content/presets/context/Pygmalion.json
+++ b/default/content/presets/context/Metharme.json
@@ -6,5 +6,5 @@
     "always_force_name2": true,
     "trim_sentences": false,
     "single_line": false,
-    "name": "Pygmalion"
+    "name": "Metharme"
 }
diff --git a/default/content/presets/instruct/Pygmalion.json b/default/content/presets/instruct/Pygmalion.json
deleted file mode 100644
index 96cd55312..000000000
--- a/default/content/presets/instruct/Pygmalion.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "input_sequence": "<|user|>",
-    "output_sequence": "<|model|>",
-    "last_output_sequence": "",
-    "system_sequence": "",
-    "stop_sequence": "<|user|>",
-    "wrap": false,
-    "macro": true,
-    "names_behavior": "force",
-    "activation_regex": "",
-    "system_sequence_prefix": "<|system|>",
-    "system_sequence_suffix": "",
-    "first_output_sequence": "",
-    "skip_examples": false,
-    "output_suffix": "",
-    "input_suffix": "",
-    "system_suffix": "",
-    "user_alignment_message": "",
-    "system_same_as_user": true,
-    "last_system_sequence": "",
-    "name": "Pygmalion"
-}