From e8eb1ac36b0472d22a5b10cb15aaa6aa04346e1a Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Mon, 15 May 2023 02:36:52 +0900
Subject: [PATCH] fix items lost on merge
---
public/script.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/public/script.js b/public/script.js
index 270c8de39..7d15cd23c 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2201,7 +2201,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
breakdown_bar.empty();
const total = Object.values(counts).filter(x => !Number.isNaN(x)).reduce((acc, val) => acc + val, 0);
- console.log(`oai start tokens: ${Object.entries(counts)[0][1]}`);
thisPromptBits.push({
oaiStartTokens: Object.entries(counts)[0][1],
@@ -2215,9 +2214,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
oaiTotalTokens: total,
})
-
- console.log(`added OAI prompt bits to array`);
-
Object.entries(counts).forEach(([type, value]) => {
if (value === 0) {
return;
@@ -2554,6 +2550,8 @@ function promptItemize(itemizedPrompts, requestedMesId) {
var worldInfoStringTokensPercentage = ((worldInfoStringTokens / (finalPromptTokens)) * 100).toFixed(2);
var allAnchorsTokensPercentage = ((allAnchorsTokens / (finalPromptTokens)) * 100).toFixed(2);
var selectedTokenizer = `tiktoken (${oai_settings.openai_model})`;
+ var oaiSystemTokens = oaiImpersonateTokens + oaiJailbreakTokens + oaiNudgeTokens + oaiStartTokens;
+ var oaiSystemTokensPercentage = ((oaiSystemTokens / (finalPromptTokens)) * 100).toFixed(2);
} else {
//console.log('-- applying % on non-OAI tokens');
@@ -2603,7 +2601,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
-- NSFW:
-
${oaiSystemTokens}
+
??