From 6bb44b95b04d6d59e44b64d21f7aa0bc2a11cfc5 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Tue, 16 May 2023 00:53:33 +0300 Subject: [PATCH 1/5] Fix OAI key usage --- server.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 7aee9bb00..2308c2a16 100644 --- a/server.js +++ b/server.js @@ -2437,7 +2437,13 @@ app.post("/openai_bias", jsonParser, async function (request, response) { // Shamelessly stolen from Agnai app.post("/openai_usage", jsonParser, async function (request, response) { if (!request.body) return response.sendStatus(400); - const key = request.body.key; + const key = readSecret(SECRET_KEYS.OPENAI); + + if (!key) { + console.warn('Get key usage failed: Missing OpenAI API key.'); + return response.sendStatus(401); + } + const api_url = new URL(request.body.reverse_proxy || api_openai).toString(); const headers = { From 1ec3352f393de9b1e4f1eaedc862a03259533fe1 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Tue, 16 May 2023 01:17:37 +0300 Subject: [PATCH 2/5] Revert pygmalion formatting of substitution parameters #317 --- public/script.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/script.js b/public/script.js index cd49c03a4..b1c98b2fa 100644 --- a/public/script.js +++ b/public/script.js @@ -1369,7 +1369,12 @@ function getExtensionPrompt(position = 0, depth = undefined, separator = "\n") { function baseChatReplace(value, name1, name2) { if (value !== undefined && value.length > 0) { - value = substituteParams(value, is_pygmalion ? "You" : name1, name2); + if (is_pygmalion) { + value = value.replace(/{{user}}:/gi, 'You:'); + value = value.replace(/:/gi, 'You:'); + } + + value = substituteParams(value, name1, name2); if (power_user.collapse_newlines) { value = collapseNewlines(value); From b1acf1532e7404ed8deb745732c9296a8a2e280c Mon Sep 17 00:00:00 2001 From: Sanskar Tiwari Date: Tue, 16 May 2023 04:42:50 +0530 Subject: [PATCH 3/5] make swipe button cursor pointer since it is a button --- public/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/style.css b/public/style.css index 0d415f11d..c60b711dc 100644 --- a/public/style.css +++ b/public/style.css @@ -527,6 +527,7 @@ code { grid-column-start: 4; flex-flow: column; font-size: 30px; + cursor: pointer; } .swipe_right img, From b823d40df690bc6a2ce4d16dc9e8db7c31a6432a Mon Sep 17 00:00:00 2001 From: Sanskar Tiwari Date: Tue, 16 May 2023 04:44:10 +0530 Subject: [PATCH 4/5] ocd whitespace --- public/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/script.js b/public/script.js index b1c98b2fa..dab17418d 100644 --- a/public/script.js +++ b/public/script.js @@ -2743,7 +2743,7 @@ function saveReply(type, getMessage, this_mes_is_name, title) { } else { item['swipe_id'] = 0; item['swipes'] = []; - item['swipes'][0] = chat[chat.length - 1]['mes']; + item['swipes'][0] = chat[chat.length - 1]['mes']; } return { type, getMessage }; From bd2bcf6e9d7f8c88508c9842a4529238e2916e24 Mon Sep 17 00:00:00 2001 From: Cohee Date: Tue, 16 May 2023 10:17:01 +0300 Subject: [PATCH 5/5] Update readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 2a4b3ac3b..5b6a380fe 100644 --- a/readme.md +++ b/readme.md @@ -136,8 +136,8 @@ Easy to follow guide with pretty pictures: 5. Open a Command Prompt inside that folder by clicking in the 'Address Bar' at the top, typing `cmd`, and pressing Enter. 6. Once the black box (Command Prompt) pops up, type ONE of the following into it and press Enter: - * for Main Branch: `git clone -b main` - * for Dev Branch: `git clone -b dev` + * for Main Branch: `git clone https://github.com/Cohee1207/SillyTavern -b main` + * for Dev Branch: `git clone https://github.com/Cohee1207/SillyTavern -b dev` 7. Once everything is cloned, double click `Start.bat` to make NodeJS install its requirements. 8. The server will then start, and SillyTavern will popup in your browser.