From 1749a669237a282e48a53b8547037c55350e6c51 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Sun, 14 May 2023 05:07:48 +0900 Subject: [PATCH] parse memory & AN in prompt itemizer --- public/script.js | 56 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/public/script.js b/public/script.js index d8ebff5a2..56e81c954 100644 --- a/public/script.js +++ b/public/script.js @@ -107,7 +107,7 @@ import { } from "./scripts/poe.js"; import { debounce, delay, restoreCaretPosition, saveCaretPosition } from "./scripts/utils.js"; -import { extension_settings, loadExtensionSettings } from "./scripts/extensions.js"; +import { extension_settings, getContext, loadExtensionSettings } from "./scripts/extensions.js"; import { executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "./scripts/slash-commands.js"; import { tag_map, @@ -2112,6 +2112,8 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, mesId: count_view_mes, worldInfoBefore: worldInfoBefore, allAnchors: allAnchors, + summarizeString: extension_prompts['1_memory'].value, + authorsNoteString: extension_prompts['2_floating_prompt'].value, worldInfoString: worldInfoString, storyString: storyString, worldInfoAfter: worldInfoAfter, @@ -2425,6 +2427,8 @@ function promptItemize(itemizedPrompts, requestedMesId) { let finalPromptTokens = getTokenCount(itemizedPrompts[thisPromptSet].finalPromt); let allAnchorsTokens = getTokenCount(itemizedPrompts[thisPromptSet].allAnchors); + let summarizeStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].summarizeString); + let authorsNoteStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].authorsNoteString); let afterScenarioAnchorTokens = getTokenCount(itemizedPrompts[thisPromptSet].afterScenarioAnchor); let zeroDepthAnchorTokens = getTokenCount(itemizedPrompts[thisPromptSet].afterScenarioAnchor); let worldInfoStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].worldInfoString); @@ -2458,7 +2462,11 @@ function promptItemize(itemizedPrompts, requestedMesId) { callPopup( `

Prompt Itemization

- Tokenizer: ${selectedTokenizer} + Tokenizer: ${selectedTokenizer}
+ + Only the white numbers really matter. All numbers are estimates. + Grey color items may not have been included in the context due to certain prompt format settings. +
@@ -2472,29 +2480,47 @@ function promptItemize(itemizedPrompts, requestedMesId) {
-
Character Definitions:
${storyStringTokens}
+
Character Definitions:
+
${storyStringTokens}
-
-
-- Description:
${charDescriptionTokens}
+
+
-- Description:
+
${charDescriptionTokens}
-
-
-- Personality:
${charPersonalityTokens}
+
+
-- Personality:
+
${charPersonalityTokens}
-
-
-- Scenario:
${scenarioTextTokens}
+
+
-- Scenario:
+
${scenarioTextTokens}
-
-
-- Examples:
${examplesStringTokens}
+
+
-- Examples:
+
${examplesStringTokens}
-
World Info:
${worldInfoStringTokens}
+
World Info:
+
${worldInfoStringTokens}
-
Chat History:
${ActualChatHistoryTokens}
+
Chat History:
+
${ActualChatHistoryTokens}
-
-
Author's Note:
${allAnchorsTokens}
+
+
+
Extensions:
+
${allAnchorsTokens}
+
+
+
-- Summarize:
+
${summarizeStringTokens}
+
+
+
-- Author's Note:
+
${authorsNoteStringTokens}
+
{{}} Bias:
${promptBiasTokens}