From 7e9f5b8ee2dd56fc41f70b915dc244e9ce6a17ba Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:01:55 +0300 Subject: [PATCH 01/11] Indicate connected textarea for expanded editor --- public/scripts/chats.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/scripts/chats.js b/public/scripts/chats.js index d8f1e8dad..ea4871ecc 100644 --- a/public/scripts/chats.js +++ b/public/scripts/chats.js @@ -1458,6 +1458,7 @@ jQuery(function () { wrapper.classList.add('height100p', 'wide100p', 'flex-container'); wrapper.classList.add('flexFlowColumn', 'justifyCenter', 'alignitemscenter'); const textarea = document.createElement('textarea'); + textarea.dataset.for = broId; textarea.value = String(contentEditable ? bro[0].innerText : bro.val()); textarea.classList.add('height100p', 'wide100p', 'maximized_textarea'); bro.hasClass('monospace') && textarea.classList.add('monospace'); From 030808d3081c4a2b296fab06ca79fa9942580c4a Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Tue, 22 Oct 2024 19:05:51 +0100 Subject: [PATCH 02/11] feat: add Claude 3.5 Sonnet 20241022 API model --- public/index.html | 1 + public/scripts/extensions/caption/settings.html | 1 + 2 files changed, 2 insertions(+) diff --git a/public/index.html b/public/index.html index 5d5b0857b..6d9a6a3e5 100644 --- a/public/index.html +++ b/public/index.html @@ -2797,6 +2797,7 @@

Claude Model

+ diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html index a388030b0..d9cfc7215 100644 --- a/public/scripts/extensions/caption/settings.html +++ b/public/scripts/extensions/caption/settings.html @@ -43,6 +43,7 @@ + From 2a60b6be0b12ad23c801c3c37803d3f0b79b2a0e Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Sat, 26 Oct 2024 15:45:40 +0300 Subject: [PATCH 09/11] Bump package version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3ac436ef..9974db1ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sillytavern", - "version": "1.12.6", + "version": "1.12.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sillytavern", - "version": "1.12.6", + "version": "1.12.7", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 7bb9783fa..a94bc0a58 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "type": "git", "url": "https://github.com/SillyTavern/SillyTavern.git" }, - "version": "1.12.6", + "version": "1.12.7", "scripts": { "start": "node server.js", "start:no-csrf": "node server.js --disableCsrf", From 5b1a4fc7233f3ad2992f0d7cac0fb1a3ecaad209 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Sat, 26 Oct 2024 17:03:01 +0300 Subject: [PATCH 10/11] Update char PHI macro lingo --- public/script.js | 2 +- public/scripts/templates/macros.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/script.js b/public/script.js index 1bb05e4cc..5112240dd 100644 --- a/public/script.js +++ b/public/script.js @@ -2570,7 +2570,7 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re if (_replaceCharacterCard) { const fields = getCharacterCardFields(); environment.charPrompt = fields.system || ''; - environment.charJailbreak = fields.jailbreak || ''; + environment.charInstruction = environment.charJailbreak = fields.jailbreak || ''; environment.description = fields.description || ''; environment.personality = fields.personality || ''; environment.scenario = fields.scenario || ''; diff --git a/public/scripts/templates/macros.html b/public/scripts/templates/macros.html index f3b319af1..6e96ae4fa 100644 --- a/public/scripts/templates/macros.html +++ b/public/scripts/templates/macros.html @@ -9,7 +9,7 @@
  • {{original}} – global prompts defined in API settings. Only valid in Advanced Definitions prompt overrides.
  • {{input}} – the user input
  • {{charPrompt}} – the Character's Main Prompt override
    • -
  • {{charJailbreak}} – the Character's Jailbreak Prompt override
    • +
  • {{charInstruction}} – the Character's Post-History Instructions override
  • {{description}} – the Character's Description
  • {{personality}} – the Character's Personality
  • {{scenario}} – the Character's Scenario
    • From 2c7e9729bcbb274381001ce883bba98cc867e646 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Sat, 26 Oct 2024 17:25:42 +0300 Subject: [PATCH 11/11] Fix example prefixes in Gemini with no system instruction #2997 --- src/prompt-converters.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/prompt-converters.js b/src/prompt-converters.js index cb65b4e2c..9c4502303 100644 --- a/src/prompt-converters.js +++ b/src/prompt-converters.js @@ -396,11 +396,23 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN // similar story as claude if (message.name) { - if (Array.isArray(message.content)) { - message.content[0].text = `${message.name}: ${message.content[0].text}`; - } else { - message.content = `${message.name}: ${message.content}`; + if (userName && message.name === 'example_user') { + message.name = userName; } + if (charName && message.name === 'example_assistant') { + message.name = charName; + } + + if (Array.isArray(message.content)) { + if (!message.content[0].text.startsWith(`${message.name}: `)) { + message.content[0].text = `${message.name}: ${message.content[0].text}`; + } + } else { + if (!message.content.startsWith(`${message.name}: `)) { + message.content = `${message.name}: ${message.content}`; + } + } + delete message.name; }