slvccans/ST-Amily2-Chat-Optimisation-SecFix
1
0
Fork 0
mirror of https://github.com/SilenceLurker/ST-Amily2-Chat-Optimisation.git synced 2026-06-06 10:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update executor.js

Browse Source
This commit is contained in:
Wx-2025
2025-10-19 17:17:27 +08:00
committed by GitHub
parent a3a7fdac20
commit 7e4b2b1abd
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
glossary/executor.js
View File

@@ -2,8 +2,7 @@ import { callSybdAI } from '../core/api/SybdApi.js';
import { extensionName } from '../utils/settings.js'; import { extensionName } from '../utils/settings.js';
import { getPresetPrompts, getMixedOrder } from '../PresetSettings/index.js'; import { getPresetPrompts, getMixedOrder } from '../PresetSettings/index.js';
import { generateRandomSeed } from '../core/api.js'; import { generateRandomSeed } from '../core/api.js';
import { safeLorebookEntries, safeUpdateLorebookEntries, compatibleWriteToLorebook } from '../core/tavernhelper-compatibility.js';
const { TavernHelper } = window;
function buildContextFromEntries(entries) { function buildContextFromEntries(entries) {
if (!entries || entries.length === 0) { if (!entries || entries.length === 0) {
@@ -11,10 +10,10 @@ function buildContextFromEntries(entries) {
} }
const mappedContent = entries.map(entry => { const mappedContent = entries.map(entry => {
if (!Array.isArray(entry.keyword) || entry.keyword.length < 2) { if (!Array.isArray(entry.keys) || entry.keys.length < 2) {
return null; return null;
} }
const name = entry.keyword[1]; const name = entry.keys[1];
return `[--START_TABLE--]\n[name]:${name}\n${entry.content}\n[--END_TABLE--]`; return `[--START_TABLE--]\n[name]:${name}\n${entry.content}\n[--END_TABLE--]`;
}).filter(Boolean).join('\n\n'); }).filter(Boolean).join('\n\n');
@@ -54,7 +53,7 @@ export async function executeNovelProcessing(processingState, updateStatusCallba
throw new Error('请先在设置中选择一个目标世界书。'); throw new Error('请先在设置中选择一个目标世界书。');
} }
const allEntries = (await TavernHelper.getLorebookEntries(bookName)) || []; const allEntries = (await safeLorebookEntries(bookName)) || [];
const managedEntries = allEntries.filter(e => e.comment?.startsWith('[Amily2小说处理]') || e.comment?.startsWith('[Amily2-Glossary]')); const managedEntries = allEntries.filter(e => e.comment?.startsWith('[Amily2小说处理]') || e.comment?.startsWith('[Amily2-Glossary]'));
const localManagedEntries = [...managedEntries]; const localManagedEntries = [...managedEntries];
@@ -132,7 +131,7 @@ export async function executeNovelProcessing(processingState, updateStatusCallba
keys = [`小说处理`, title, `第${nextPart}部分`]; keys = [`小说处理`, title, `第${nextPart}部分`];
const newEntryData = { keys, content, comment, enabled: true, order: 100, position: 'before_char' }; const newEntryData = { keys, content, comment, enabled: true, order: 100, position: 'before_char' };
entriesToCreate.push(newEntryData); entriesToCreate.push(newEntryData);
localManagedEntries.push({ uid: -1, ...newEntryData, keyword: keys }); localManagedEntries.push({ uid: -1, ...newEntryData, keys: keys });
nextPart++; nextPart++;
continue; continue;
} }
@@ -150,19 +149,26 @@ export async function executeNovelProcessing(processingState, updateStatusCallba
if (existingEntry) { if (existingEntry) {
entriesToUpdate.push({ uid: existingEntry.uid, ...loreData }); entriesToUpdate.push({ uid: existingEntry.uid, ...loreData });
Object.assign(existingEntry, { ...loreData, keyword: keys }); Object.assign(existingEntry, { ...loreData, keys: keys });
} else { } else {
entriesToCreate.push(loreData); entriesToCreate.push(loreData);
localManagedEntries.push({ uid: -1, ...loreData, keyword: keys }); localManagedEntries.push({ uid: -1, ...loreData, keys: keys });
} }
} }
if (entriesToUpdate.length > 0) { if (entriesToUpdate.length > 0) {
await TavernHelper.setLorebookEntries(bookName, entriesToUpdate); await safeUpdateLorebookEntries(bookName, entriesToUpdate);
updateStatusCallback(`更新了 ${entriesToUpdate.length} 个世界书条目。`, 'info'); updateStatusCallback(`更新了 ${entriesToUpdate.length} 个世界书条目。`, 'info');
} }
if (entriesToCreate.length > 0) { if (entriesToCreate.length > 0) {
await TavernHelper.createLorebookEntries(bookName, entriesToCreate); for (const entry of entriesToCreate) {
await compatibleWriteToLorebook(bookName, entry.comment, () => entry.content, {
keys: entry.keys,
isConstant: false,
insertion_position: 'before_char',
depth: 100,
});
}
updateStatusCallback(`创建了 ${entriesToCreate.length} 个新世界书条目。`, 'success'); updateStatusCallback(`创建了 ${entriesToCreate.length} 个新世界书条目。`, 'success');
} }