mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
merging with myself :p
This commit is contained in:
32
package-lock.json
generated
32
package-lock.json
generated
@@ -43,6 +43,7 @@
|
|||||||
"simple-git": "^3.19.1",
|
"simple-git": "^3.19.1",
|
||||||
"uniqolor": "^1.1.0",
|
"uniqolor": "^1.1.0",
|
||||||
"webp-converter": "2.3.2",
|
"webp-converter": "2.3.2",
|
||||||
|
"write-file-atomic": "^5.0.1",
|
||||||
"ws": "^8.13.0",
|
"ws": "^8.13.0",
|
||||||
"yargs": "^17.7.1",
|
"yargs": "^17.7.1",
|
||||||
"yauzl": "^2.10.0"
|
"yauzl": "^2.10.0"
|
||||||
@@ -1805,6 +1806,14 @@
|
|||||||
"@types/node": "16.9.1"
|
"@types/node": "16.9.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/imurmurhash": {
|
||||||
|
"version": "0.1.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
|
||||||
|
"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.8.19"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/inherits": {
|
"node_modules/inherits": {
|
||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||||
@@ -3073,6 +3082,17 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/signal-exit": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/isaacs"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/simple-concat": {
|
"node_modules/simple-concat": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
|
||||||
@@ -3523,6 +3543,18 @@
|
|||||||
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"node_modules/write-file-atomic": {
|
||||||
|
"version": "5.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
|
||||||
|
"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
|
||||||
|
"dependencies": {
|
||||||
|
"imurmurhash": "^0.1.4",
|
||||||
|
"signal-exit": "^4.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/ws": {
|
"node_modules/ws": {
|
||||||
"version": "8.13.0",
|
"version": "8.13.0",
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
|
"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@dqbd/tiktoken": "^1.0.2",
|
"@agnai/sentencepiece-js": "^1.1.1",
|
||||||
"@agnai/web-tokenizers": "^0.1.3",
|
"@agnai/web-tokenizers": "^0.1.3",
|
||||||
|
"@dqbd/tiktoken": "^1.0.2",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"command-exists": "^1.2.9",
|
"command-exists": "^1.2.9",
|
||||||
"compression": "^1",
|
"compression": "^1",
|
||||||
@@ -30,10 +31,10 @@
|
|||||||
"png-chunks-extract": "^1.0.0",
|
"png-chunks-extract": "^1.0.0",
|
||||||
"response-time": "^2.3.2",
|
"response-time": "^2.3.2",
|
||||||
"sanitize-filename": "^1.6.3",
|
"sanitize-filename": "^1.6.3",
|
||||||
"@agnai/sentencepiece-js": "^1.1.1",
|
|
||||||
"simple-git": "^3.19.1",
|
"simple-git": "^3.19.1",
|
||||||
"uniqolor": "^1.1.0",
|
"uniqolor": "^1.1.0",
|
||||||
"webp-converter": "2.3.2",
|
"webp-converter": "2.3.2",
|
||||||
|
"write-file-atomic": "^5.0.1",
|
||||||
"ws": "^8.13.0",
|
"ws": "^8.13.0",
|
||||||
"yargs": "^17.7.1",
|
"yargs": "^17.7.1",
|
||||||
"yauzl": "^2.10.0"
|
"yauzl": "^2.10.0"
|
||||||
|
@@ -857,7 +857,7 @@
|
|||||||
<small>3</small>
|
<small>3</small>
|
||||||
</div>
|
</div>
|
||||||
<div data-id="4">
|
<div data-id="4">
|
||||||
<span data-i18n="Typical Sampling">Typical Sampling</span>
|
<span data-i18n="Typical Sampling">Typical P Sampling</span>
|
||||||
<small>4</small>
|
<small>4</small>
|
||||||
</div>
|
</div>
|
||||||
<div data-id="5">
|
<div data-id="5">
|
||||||
@@ -901,6 +901,21 @@
|
|||||||
<textarea id="nai_banned_tokens" class="text_pole textarea_compact" name="nai_banned_tokens" rows="2" placeholder=""></textarea>
|
<textarea id="nai_banned_tokens" class="text_pole textarea_compact" name="nai_banned_tokens" rows="2" placeholder=""></textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="range-block">
|
||||||
|
<div class="range-block-title title_restorable">
|
||||||
|
<span data-i18n="Logit Bias">Logit Bias</span>
|
||||||
|
<div id="novelai_logit_bias_new_entry" class="menu_button menu_button_icon">
|
||||||
|
<i class="fa-xs fa-solid fa-plus"></i>
|
||||||
|
<small data-i18n="Add">Add</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="toggle-description justifyLeft" data-i18n="Helps to ban or reenforce the usage of certain words">
|
||||||
|
Helps to ban or reinforce the usage of certain tokens.
|
||||||
|
</div>
|
||||||
|
<div class="flex-container flexFlowColumn wide100p">
|
||||||
|
<div class="novelai_logit_bias_list"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="range-block">
|
<div class="range-block">
|
||||||
<div class="range-block-title justifyLeft" data-i18n="CFG Scale">
|
<div class="range-block-title justifyLeft" data-i18n="CFG Scale">
|
||||||
@@ -3783,6 +3798,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="novelai_logit_bias_template" class="template_element">
|
||||||
|
<div class="novelai_logit_bias_form">
|
||||||
|
<input class="novelai_logit_bias_text text_pole" data-i18n="[placeholder]Type here..." placeholder="type here..." />
|
||||||
|
<input class="novelai_logit_bias_value text_pole" type="number" min="-2" value="0" max="2" step="0.01" />
|
||||||
|
<i class="menu_button fa-solid fa-xmark novelai_logit_bias_remove"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div id="completion_prompt_manager_popup" class="drawer-content" style="display:none;">
|
<div id="completion_prompt_manager_popup" class="drawer-content" style="display:none;">
|
||||||
<div id="completion_prompt_manager_popup_inspect">
|
<div id="completion_prompt_manager_popup_inspect">
|
||||||
<h3>Inspect</h3>
|
<h3>Inspect</h3>
|
||||||
|
@@ -104,6 +104,7 @@ import {
|
|||||||
loadNovelSettings,
|
loadNovelSettings,
|
||||||
nai_settings,
|
nai_settings,
|
||||||
setNovelData,
|
setNovelData,
|
||||||
|
adjustNovelInstructionPrompt,
|
||||||
} from "./scripts/nai-settings.js";
|
} from "./scripts/nai-settings.js";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -1844,17 +1845,26 @@ function getStoppingStrings(isImpersonate, addSpace) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addInstructSequence(sequence) {
|
||||||
// Cohee: oobabooga's textgen always appends newline before the sequence as a stopping string
|
// Cohee: oobabooga's textgen always appends newline before the sequence as a stopping string
|
||||||
// But it's a problem for Metharme which doesn't use newlines to separate them.
|
// But it's a problem for Metharme which doesn't use newlines to separate them.
|
||||||
const wrap = (s) => power_user.instruct.wrap ? '\n' + s : s;
|
const wrap = (s) => power_user.instruct.wrap ? '\n' + s : s;
|
||||||
|
// Sequence must be a non-empty string
|
||||||
|
if (typeof sequence === 'string' && sequence.length > 0) {
|
||||||
|
// If sequence is just a whitespace or newline - we don't want to make it a stopping string
|
||||||
|
// User can always add it as a custom stop string if really needed
|
||||||
|
if (sequence.trim().length > 0) {
|
||||||
|
const wrappedSequence = wrap(sequence);
|
||||||
|
// Need to respect "insert macro" setting
|
||||||
|
const stopString = power_user.instruct.macro ? substituteParams(wrappedSequence) : wrappedSequence;
|
||||||
|
result.push(stopString);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (power_user.instruct.enabled) {
|
if (power_user.instruct.enabled) {
|
||||||
if (power_user.instruct.input_sequence) {
|
addInstructSequence(power_user.instruct.input_sequence);
|
||||||
result.push(substituteParams(wrap(power_user.instruct.input_sequence), name1, name2));
|
addInstructSequence(power_user.instruct.output_sequence);
|
||||||
}
|
|
||||||
if (power_user.instruct.output_sequence) {
|
|
||||||
result.push(substituteParams(wrap(power_user.instruct.output_sequence), name1, name2));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (power_user.custom_stopping_strings) {
|
if (power_user.custom_stopping_strings) {
|
||||||
@@ -2311,6 +2321,10 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
|
|||||||
abortController = new AbortController();
|
abortController = new AbortController();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (main_api == 'novel' && quiet_prompt) {
|
||||||
|
quiet_prompt = adjustNovelInstructionPrompt(quiet_prompt);
|
||||||
|
}
|
||||||
|
|
||||||
// OpenAI doesn't need instruct mode. Use OAI main prompt instead.
|
// OpenAI doesn't need instruct mode. Use OAI main prompt instead.
|
||||||
const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
|
const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
|
||||||
const isImpersonate = type == "impersonate";
|
const isImpersonate = type == "impersonate";
|
||||||
|
@@ -4,7 +4,6 @@ TODO:
|
|||||||
- Delete useless call
|
- Delete useless call
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { saveSettingsDebounced } from "../../../script.js"
|
|
||||||
import { doExtrasFetch, extension_settings, getApiUrl, getContext, modules, ModuleWorkerWrapper } from "../../extensions.js"
|
import { doExtrasFetch, extension_settings, getApiUrl, getContext, modules, ModuleWorkerWrapper } from "../../extensions.js"
|
||||||
|
|
||||||
export { CoquiTtsProvider }
|
export { CoquiTtsProvider }
|
||||||
|
@@ -9,7 +9,10 @@ import {
|
|||||||
} from "../script.js";
|
} from "../script.js";
|
||||||
import { getCfg } from "./extensions/cfg/util.js";
|
import { getCfg } from "./extensions/cfg/util.js";
|
||||||
import { MAX_CONTEXT_DEFAULT, tokenizers } from "./power-user.js";
|
import { MAX_CONTEXT_DEFAULT, tokenizers } from "./power-user.js";
|
||||||
import { getStringHash } from "./utils.js";
|
import {
|
||||||
|
getStringHash,
|
||||||
|
uuidv4
|
||||||
|
} from "./utils.js";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
nai_settings,
|
nai_settings,
|
||||||
@@ -49,6 +52,7 @@ const nai_settings = {
|
|||||||
cfg_uc: '',
|
cfg_uc: '',
|
||||||
banned_tokens: '',
|
banned_tokens: '',
|
||||||
order: default_order,
|
order: default_order,
|
||||||
|
logit_bias: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
const nai_tiers = {
|
const nai_tiers = {
|
||||||
@@ -60,6 +64,7 @@ const nai_tiers = {
|
|||||||
|
|
||||||
let novel_data = null;
|
let novel_data = null;
|
||||||
let badWordsCache = {};
|
let badWordsCache = {};
|
||||||
|
let biasCache = undefined;
|
||||||
|
|
||||||
export function setNovelData(data) {
|
export function setNovelData(data) {
|
||||||
novel_data = data;
|
novel_data = data;
|
||||||
@@ -114,6 +119,7 @@ function loadNovelPreset(preset) {
|
|||||||
nai_settings.cfg_uc = preset.cfg_uc || '';
|
nai_settings.cfg_uc = preset.cfg_uc || '';
|
||||||
nai_settings.banned_tokens = preset.banned_tokens || '';
|
nai_settings.banned_tokens = preset.banned_tokens || '';
|
||||||
nai_settings.order = preset.order || default_order;
|
nai_settings.order = preset.order || default_order;
|
||||||
|
nai_settings.logit_bias = preset.logit_bias || [];
|
||||||
loadNovelSettingsUi(nai_settings);
|
loadNovelSettingsUi(nai_settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -147,6 +153,7 @@ function loadNovelSettings(settings) {
|
|||||||
nai_settings.cfg_uc = settings.cfg_uc || '';
|
nai_settings.cfg_uc = settings.cfg_uc || '';
|
||||||
nai_settings.banned_tokens = settings.banned_tokens || '';
|
nai_settings.banned_tokens = settings.banned_tokens || '';
|
||||||
nai_settings.order = settings.order || default_order;
|
nai_settings.order = settings.order || default_order;
|
||||||
|
nai_settings.logit_bias = settings.logit_bias || [];
|
||||||
loadNovelSettingsUi(nai_settings);
|
loadNovelSettingsUi(nai_settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,6 +196,7 @@ function loadNovelSettingsUi(ui_settings) {
|
|||||||
|
|
||||||
$("#streaming_novel").prop('checked', ui_settings.streaming_novel);
|
$("#streaming_novel").prop('checked', ui_settings.streaming_novel);
|
||||||
sortItemsByOrder(ui_settings.order);
|
sortItemsByOrder(ui_settings.order);
|
||||||
|
displayLogitBias(ui_settings.logit_bias);
|
||||||
}
|
}
|
||||||
|
|
||||||
const sliders = [
|
const sliders = [
|
||||||
@@ -398,6 +406,12 @@ export function getNovelGenerationData(finalPrompt, this_settings, this_amount_g
|
|||||||
const prefix = selectPrefix(nai_settings.prefix, finalPrompt);
|
const prefix = selectPrefix(nai_settings.prefix, finalPrompt);
|
||||||
const cfgSettings = getCfg();
|
const cfgSettings = getCfg();
|
||||||
|
|
||||||
|
let logitBias = [];
|
||||||
|
if (tokenizerType !== tokenizers.NONE && Array.isArray(nai_settings.logit_bias) && nai_settings.logit_bias.length) {
|
||||||
|
logitBias = biasCache || calculateLogitBias();
|
||||||
|
biasCache = logitBias;
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"input": finalPrompt,
|
"input": finalPrompt,
|
||||||
"model": nai_settings.model_novel,
|
"model": nai_settings.model_novel,
|
||||||
@@ -422,6 +436,7 @@ export function getNovelGenerationData(finalPrompt, this_settings, this_amount_g
|
|||||||
"phrase_rep_pen": nai_settings.phrase_rep_pen,
|
"phrase_rep_pen": nai_settings.phrase_rep_pen,
|
||||||
"stop_sequences": stopSequences,
|
"stop_sequences": stopSequences,
|
||||||
"bad_words_ids": badWordIds,
|
"bad_words_ids": badWordIds,
|
||||||
|
"logit_bias_exp": logitBias,
|
||||||
"generate_until_sentence": true,
|
"generate_until_sentence": true,
|
||||||
"use_cache": false,
|
"use_cache": false,
|
||||||
"use_string": true,
|
"use_string": true,
|
||||||
@@ -487,6 +502,88 @@ function saveSamplingOrder() {
|
|||||||
saveSettingsDebounced();
|
saveSettingsDebounced();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function displayLogitBias(logit_bias) {
|
||||||
|
if (!Array.isArray(logit_bias)) {
|
||||||
|
console.log('Logit bias set not found');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$('.novelai_logit_bias_list').empty();
|
||||||
|
|
||||||
|
for (const entry of logit_bias) {
|
||||||
|
if (entry) {
|
||||||
|
createLogitBiasListItem(entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
biasCache = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createNewLogitBiasEntry() {
|
||||||
|
const entry = { id: uuidv4(), text: '', value: 0 };
|
||||||
|
nai_settings.logit_bias.push(entry);
|
||||||
|
biasCache = undefined;
|
||||||
|
createLogitBiasListItem(entry);
|
||||||
|
saveSettingsDebounced();
|
||||||
|
}
|
||||||
|
|
||||||
|
function createLogitBiasListItem(entry) {
|
||||||
|
const id = entry.id;
|
||||||
|
const template = $('#novelai_logit_bias_template .novelai_logit_bias_form').clone();
|
||||||
|
template.data('id', id);
|
||||||
|
template.find('.novelai_logit_bias_text').val(entry.text).on('input', function () {
|
||||||
|
entry.text = $(this).val();
|
||||||
|
biasCache = undefined;
|
||||||
|
saveSettingsDebounced();
|
||||||
|
});
|
||||||
|
template.find('.novelai_logit_bias_value').val(entry.value).on('input', function () {
|
||||||
|
entry.value = Number($(this).val());
|
||||||
|
biasCache = undefined;
|
||||||
|
saveSettingsDebounced();
|
||||||
|
});
|
||||||
|
template.find('.novelai_logit_bias_remove').on('click', function () {
|
||||||
|
$(this).closest('.novelai_logit_bias_form').remove();
|
||||||
|
const index = nai_settings.logit_bias.indexOf(entry);
|
||||||
|
if (index > -1) {
|
||||||
|
nai_settings.logit_bias.splice(index, 1);
|
||||||
|
}
|
||||||
|
biasCache = undefined;
|
||||||
|
saveSettingsDebounced();
|
||||||
|
});
|
||||||
|
$('.novelai_logit_bias_list').prepend(template);
|
||||||
|
}
|
||||||
|
|
||||||
|
function calculateLogitBias() {
|
||||||
|
const bias_preset = nai_settings.logit_bias;
|
||||||
|
|
||||||
|
if (!Array.isArray(bias_preset) || bias_preset.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
const clio = nai_settings.model_novel.includes('clio');
|
||||||
|
const kayra = nai_settings.model_novel.includes('kayra');
|
||||||
|
const tokenizerType = kayra ? tokenizers.NERD2 : (clio ? tokenizers.NERD : tokenizers.NONE);
|
||||||
|
|
||||||
|
return bias_preset.filter(b => b.text?.length > 0).map(bias => ({
|
||||||
|
bias: bias.value,
|
||||||
|
ensure_sequence_finish: false,
|
||||||
|
generate_once: false,
|
||||||
|
sequence: getTextTokens(tokenizerType, bias.text)
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transforms instruction into compatible format for Novel AI.
|
||||||
|
* 1. Instruction must begin and end with curly braces followed and preceded by a space.
|
||||||
|
* 2. Instruction must not contain square brackets as it serves different purpose in NAI.
|
||||||
|
* @param {string} prompt Original instruction prompt
|
||||||
|
* @returns Processed prompt
|
||||||
|
*/
|
||||||
|
export function adjustNovelInstructionPrompt(prompt) {
|
||||||
|
const stripedPrompt = prompt.replace(/[\[\]]/g, '').trim();
|
||||||
|
return `{ ${stripedPrompt} }`;
|
||||||
|
}
|
||||||
|
|
||||||
export async function generateNovelWithStreaming(generate_data, signal) {
|
export async function generateNovelWithStreaming(generate_data, signal) {
|
||||||
const response = await fetch('/generate_novelai', {
|
const response = await fetch('/generate_novelai', {
|
||||||
headers: getRequestHeaders(),
|
headers: getRequestHeaders(),
|
||||||
@@ -590,4 +687,6 @@ $(document).ready(function () {
|
|||||||
console.log('Sampler toggled:', $item.data('id'), !isEnabled);
|
console.log('Sampler toggled:', $item.data('id'), !isEnabled);
|
||||||
saveSamplingOrder();
|
saveSamplingOrder();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#novelai_logit_bias_new_entry").on("click", createNewLogitBiasEntry);
|
||||||
});
|
});
|
||||||
|
@@ -10,6 +10,7 @@ import {
|
|||||||
} from "../script.js";
|
} from "../script.js";
|
||||||
|
|
||||||
import { selected_group } from "./group-chats.js";
|
import { selected_group } from "./group-chats.js";
|
||||||
|
import { uuidv4 } from "./utils.js";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
tags,
|
tags,
|
||||||
@@ -24,7 +25,7 @@ export {
|
|||||||
importTags,
|
importTags,
|
||||||
};
|
};
|
||||||
|
|
||||||
const random_id = () => Math.round(Date.now() * Math.random()).toString();
|
const random_id = () => uuidv4();
|
||||||
const TAG_LOGIC_AND = true; // switch to false to use OR logic for combining tags
|
const TAG_LOGIC_AND = true; // switch to false to use OR logic for combining tags
|
||||||
const CHARACTER_SELECTOR = '#rm_print_characters_block > div';
|
const CHARACTER_SELECTOR = '#rm_print_characters_block > div';
|
||||||
const GROUP_MEMBER_SELECTOR = '#rm_group_add_members > div';
|
const GROUP_MEMBER_SELECTOR = '#rm_group_add_members > div';
|
||||||
|
@@ -4590,6 +4590,41 @@ toolcool-color-picker {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.novelai_logit_bias_form {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
column-gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.novelai_logit_bias_text,
|
||||||
|
.novelai_logit_bias_value {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.novelai_logit_bias_list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.novelai_logit_bias_list:empty {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.novelai_logit_bias_list:empty::before {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
content: "No items";
|
||||||
|
font-weight: bolder;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
opacity: 0.8;
|
||||||
|
min-height: 2.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
/*used to fix smallness of certain FontAwesome glyph which break button squareness*/
|
/*used to fix smallness of certain FontAwesome glyph which break button squareness*/
|
||||||
/*currently used on: CharList Import*/
|
/*currently used on: CharList Import*/
|
||||||
|
|
||||||
|
110
server.js
110
server.js
@@ -68,6 +68,8 @@ app.use(compression());
|
|||||||
app.use(responseTime());
|
app.use(responseTime());
|
||||||
|
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
const writeFileAtomicSync = require('write-file-atomic').sync;
|
||||||
|
const writeFileAtomic = require('write-file-atomic');
|
||||||
const readline = require('readline');
|
const readline = require('readline');
|
||||||
const open = require('open');
|
const open = require('open');
|
||||||
|
|
||||||
@@ -551,6 +553,7 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
|
|||||||
}
|
}
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
console.log("Endpoint response:", data);
|
||||||
return response_generate.send(data);
|
return response_generate.send(data);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -600,18 +603,13 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
|
|||||||
const websocket = new WebSocket(streamingUrl);
|
const websocket = new WebSocket(streamingUrl);
|
||||||
|
|
||||||
websocket.on('open', async function () {
|
websocket.on('open', async function () {
|
||||||
console.log('websocket open');
|
console.log('WebSocket opened');
|
||||||
websocket.send(JSON.stringify(request.body));
|
websocket.send(JSON.stringify(request.body));
|
||||||
});
|
});
|
||||||
|
|
||||||
websocket.on('error', (err) => {
|
|
||||||
console.error(err);
|
|
||||||
websocket.close();
|
|
||||||
});
|
|
||||||
|
|
||||||
websocket.on('close', (code, buffer) => {
|
websocket.on('close', (code, buffer) => {
|
||||||
const reason = new TextDecoder().decode(buffer)
|
const reason = new TextDecoder().decode(buffer)
|
||||||
console.log(reason);
|
console.log("WebSocket closed (reason: %o)", reason);
|
||||||
});
|
});
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -621,7 +619,26 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const rawMessage = await new Promise(resolve => websocket.once('message', resolve));
|
let rawMessage = null;
|
||||||
|
try {
|
||||||
|
// This lunacy is because the websocket can fail to connect AFTER we're awaiting 'message'... so 'message' never triggers.
|
||||||
|
// So instead we need to look for 'error' at the same time to reject the promise. And then remove the listener if we resolve.
|
||||||
|
// This is awful.
|
||||||
|
// Welcome to the shenanigan shack.
|
||||||
|
rawMessage = await new Promise(function (resolve, reject) {
|
||||||
|
websocket.once('error', reject);
|
||||||
|
websocket.once('message', (data, isBinary) => {
|
||||||
|
websocket.removeListener('error', reject);
|
||||||
|
resolve(data, isBinary);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} catch(err) {
|
||||||
|
console.error("Socket error:", err);
|
||||||
|
websocket.close();
|
||||||
|
yield "[SillyTavern] Streaming failed:\n" + err;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const message = json5.parse(rawMessage);
|
const message = json5.parse(rawMessage);
|
||||||
|
|
||||||
switch (message.event) {
|
switch (message.event) {
|
||||||
@@ -672,11 +689,11 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const data = await postAsync(api_server + "/v1/generate", args);
|
const data = await postAsync(api_server + "/v1/generate", args);
|
||||||
console.log(data);
|
console.log("Endpoint response:", data);
|
||||||
return response_generate.send(data);
|
return response_generate.send(data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
retval = { error: true, status: error.status, response: error.statusText };
|
retval = { error: true, status: error.status, response: error.statusText };
|
||||||
console.log(error);
|
console.log("Endpoint error:", error);
|
||||||
try {
|
try {
|
||||||
retval.response = await error.json();
|
retval.response = await error.json();
|
||||||
retval.response = retval.response.result;
|
retval.response = retval.response.result;
|
||||||
@@ -692,7 +709,7 @@ app.post("/savechat", jsonParser, function (request, response) {
|
|||||||
var dir_name = String(request.body.avatar_url).replace('.png', '');
|
var dir_name = String(request.body.avatar_url).replace('.png', '');
|
||||||
let chat_data = request.body.chat;
|
let chat_data = request.body.chat;
|
||||||
let jsonlData = chat_data.map(JSON.stringify).join('\n');
|
let jsonlData = chat_data.map(JSON.stringify).join('\n');
|
||||||
fs.writeFileSync(`${chatsPath + sanitize(dir_name)}/${sanitize(String(request.body.file_name))}.jsonl`, jsonlData, 'utf8');
|
writeFileAtomicSync(`${chatsPath + sanitize(dir_name)}/${sanitize(String(request.body.file_name))}.jsonl`, jsonlData, 'utf8');
|
||||||
return response.send({ result: "ok" });
|
return response.send({ result: "ok" });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
response.send(error);
|
response.send(error);
|
||||||
@@ -1217,7 +1234,7 @@ async function charaWrite(img_url, data, target_img, response = undefined, mes =
|
|||||||
chunks.splice(-1, 0, PNGtext.encode('chara', base64EncodedData));
|
chunks.splice(-1, 0, PNGtext.encode('chara', base64EncodedData));
|
||||||
//chunks.splice(-1, 0, text.encode('lorem', 'ipsum'));
|
//chunks.splice(-1, 0, text.encode('lorem', 'ipsum'));
|
||||||
|
|
||||||
fs.writeFileSync(charactersPath + target_img + '.png', new Buffer.from(encode(chunks)));
|
writeFileAtomicSync(charactersPath + target_img + '.png', new Buffer.from(encode(chunks)));
|
||||||
if (response !== undefined) response.send(mes);
|
if (response !== undefined) response.send(mes);
|
||||||
return true;
|
return true;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -1429,7 +1446,7 @@ app.post('/deleteuseravatar', jsonParser, function (request, response) {
|
|||||||
|
|
||||||
app.post("/setbackground", jsonParser, function (request, response) {
|
app.post("/setbackground", jsonParser, function (request, response) {
|
||||||
var bg = "#bg1 {background-image: url('../backgrounds/" + request.body.bg + "');}";
|
var bg = "#bg1 {background-image: url('../backgrounds/" + request.body.bg + "');}";
|
||||||
fs.writeFile('public/css/bg_load.css', bg, 'utf8', function (err) {
|
writeFileAtomic('public/css/bg_load.css', bg, 'utf8', function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
response.send(err);
|
response.send(err);
|
||||||
return console.log(err);
|
return console.log(err);
|
||||||
@@ -1530,7 +1547,7 @@ app.post("/downloadbackground", urlencodedParser, function (request, response) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.post("/savesettings", jsonParser, function (request, response) {
|
app.post("/savesettings", jsonParser, function (request, response) {
|
||||||
fs.writeFile('public/settings.json', JSON.stringify(request.body, null, 4), 'utf8', function (err) {
|
writeFileAtomic('public/settings.json', JSON.stringify(request.body, null, 4), 'utf8', function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
response.send(err);
|
response.send(err);
|
||||||
console.log(err);
|
console.log(err);
|
||||||
@@ -1538,17 +1555,6 @@ app.post("/savesettings", jsonParser, function (request, response) {
|
|||||||
response.send({ result: "ok" });
|
response.send({ result: "ok" });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/*fs.writeFile('public/settings.json', JSON.stringify(request.body), 'utf8', function (err) {
|
|
||||||
if (err) {
|
|
||||||
response.send(err);
|
|
||||||
return console.log(err);
|
|
||||||
//response.send(err);
|
|
||||||
} else {
|
|
||||||
//response.redirect("/");
|
|
||||||
response.send({ result: "ok" });
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function getCharaCardV2(jsonObject) {
|
function getCharaCardV2(jsonObject) {
|
||||||
@@ -1714,7 +1720,7 @@ app.post('/savetheme', jsonParser, (request, response) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const filename = path.join(directories.themes, sanitize(request.body.name) + '.json');
|
const filename = path.join(directories.themes, sanitize(request.body.name) + '.json');
|
||||||
fs.writeFileSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
|
writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
|
||||||
|
|
||||||
return response.sendStatus(200);
|
return response.sendStatus(200);
|
||||||
});
|
});
|
||||||
@@ -1725,7 +1731,7 @@ app.post('/savemovingui', jsonParser, (request, response) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const filename = path.join(directories.movingUI, sanitize(request.body.name) + '.json');
|
const filename = path.join(directories.movingUI, sanitize(request.body.name) + '.json');
|
||||||
fs.writeFileSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
|
writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
|
||||||
|
|
||||||
return response.sendStatus(200);
|
return response.sendStatus(200);
|
||||||
});
|
});
|
||||||
@@ -1736,7 +1742,7 @@ app.post('/savequickreply', jsonParser, (request, response) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const filename = path.join(directories.quickreplies, sanitize(request.body.name) + '.json');
|
const filename = path.join(directories.quickreplies, sanitize(request.body.name) + '.json');
|
||||||
fs.writeFileSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
|
writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
|
||||||
|
|
||||||
return response.sendStatus(200);
|
return response.sendStatus(200);
|
||||||
});
|
});
|
||||||
@@ -1853,7 +1859,7 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
|
|||||||
const novelai = require('./src/novelai');
|
const novelai = require('./src/novelai');
|
||||||
const isNewModel = (request.body.model.includes('clio') || request.body.model.includes('kayra'));
|
const isNewModel = (request.body.model.includes('clio') || request.body.model.includes('kayra'));
|
||||||
const isKrake = request.body.model.includes('krake');
|
const isKrake = request.body.model.includes('krake');
|
||||||
const badWordsList = isNewModel ? novelai.badWordsList : (isKrake ? novelai.krakeBadWordsList : novelai.euterpeBadWordsList);
|
const badWordsList = (isNewModel ? novelai.badWordsList : (isKrake ? novelai.krakeBadWordsList : novelai.euterpeBadWordsList)).slice();
|
||||||
|
|
||||||
// Add customized bad words for Clio and Kayra
|
// Add customized bad words for Clio and Kayra
|
||||||
if (isNewModel && Array.isArray(request.body.bad_words_ids)) {
|
if (isNewModel && Array.isArray(request.body.bad_words_ids)) {
|
||||||
@@ -1864,6 +1870,13 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add default biases for dinkus and asterism
|
||||||
|
const logit_bias_exp = isNewModel ? novelai.logitBiasExp.slice() : null;
|
||||||
|
|
||||||
|
if (Array.isArray(logit_bias_exp) && Array.isArray(request.body.logit_bias_exp)) {
|
||||||
|
logit_bias_exp.push(...request.body.logit_bias_exp);
|
||||||
|
}
|
||||||
|
|
||||||
const data = {
|
const data = {
|
||||||
"input": request.body.input,
|
"input": request.body.input,
|
||||||
"model": request.body.model,
|
"model": request.body.model,
|
||||||
@@ -1889,9 +1902,8 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
|
|||||||
"cfg_uc": request.body.cfg_uc,
|
"cfg_uc": request.body.cfg_uc,
|
||||||
"phrase_rep_pen": request.body.phrase_rep_pen,
|
"phrase_rep_pen": request.body.phrase_rep_pen,
|
||||||
"stop_sequences": request.body.stop_sequences,
|
"stop_sequences": request.body.stop_sequences,
|
||||||
//"stop_sequences": {{187}},
|
|
||||||
"bad_words_ids": badWordsList,
|
"bad_words_ids": badWordsList,
|
||||||
"logit_bias_exp": isNewModel ? novelai.logitBiasExp : null,
|
"logit_bias_exp": logit_bias_exp,
|
||||||
//generate_until_sentence = true;
|
//generate_until_sentence = true;
|
||||||
"use_cache": request.body.use_cache,
|
"use_cache": request.body.use_cache,
|
||||||
"use_string": true,
|
"use_string": true,
|
||||||
@@ -2324,7 +2336,7 @@ app.post("/exportcharacter", jsonParser, async function (request, response) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
const exifString = exif.dump(metadata);
|
const exifString = exif.dump(metadata);
|
||||||
fs.writeFileSync(metadataPath, exifString, 'binary');
|
writeFileAtomicSync(metadataPath, exifString, 'binary');
|
||||||
|
|
||||||
await webp.cwebp(filename, inputWebpPath, '-q 95');
|
await webp.cwebp(filename, inputWebpPath, '-q 95');
|
||||||
await webp.webpmux_add(inputWebpPath, outputWebpPath, metadataPath, 'exif');
|
await webp.webpmux_add(inputWebpPath, outputWebpPath, metadataPath, 'exif');
|
||||||
@@ -2406,9 +2418,9 @@ app.post("/importchat", urlencodedParser, function (request, response) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const errors = [];
|
const errors = [];
|
||||||
newChats.forEach(chat => fs.writeFile(
|
newChats.forEach(chat => writeFileAtomic(
|
||||||
`${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()} imported.jsonl`,
|
`${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()} imported.jsonl`,
|
||||||
chat.map(JSON.stringify).join('\n'),
|
chat.map(tryParse).filter(x => x).join('\n'),
|
||||||
'utf8',
|
'utf8',
|
||||||
(err) => err ?? errors.push(err)
|
(err) => err ?? errors.push(err)
|
||||||
)
|
)
|
||||||
@@ -2450,7 +2462,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.writeFileSync(`${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()} imported.jsonl`, chat.map(JSON.stringify).join('\n'), 'utf8');
|
writeFileAtomicSync(`${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()} imported.jsonl`, chat.map(JSON.stringify).join('\n'), 'utf8');
|
||||||
|
|
||||||
response.send({ res: true });
|
response.send({ res: true });
|
||||||
} else {
|
} else {
|
||||||
@@ -2519,7 +2531,7 @@ app.post('/importworldinfo', urlencodedParser, (request, response) => {
|
|||||||
return response.status(400).send('World file must have a name');
|
return response.status(400).send('World file must have a name');
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.writeFileSync(pathToNewFile, fileContents);
|
writeFileAtomicSync(pathToNewFile, fileContents);
|
||||||
return response.send({ name: worldName });
|
return response.send({ name: worldName });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -2543,7 +2555,7 @@ app.post('/editworldinfo', jsonParser, (request, response) => {
|
|||||||
const filename = `${sanitize(request.body.name)}.json`;
|
const filename = `${sanitize(request.body.name)}.json`;
|
||||||
const pathToFile = path.join(directories.worlds, filename);
|
const pathToFile = path.join(directories.worlds, filename);
|
||||||
|
|
||||||
fs.writeFileSync(pathToFile, JSON.stringify(request.body.data, null, 4));
|
writeFileAtomicSync(pathToFile, JSON.stringify(request.body.data, null, 4));
|
||||||
|
|
||||||
return response.send({ ok: true });
|
return response.send({ ok: true });
|
||||||
});
|
});
|
||||||
@@ -2564,7 +2576,7 @@ app.post('/uploaduseravatar', urlencodedParser, async (request, response) => {
|
|||||||
|
|
||||||
const filename = request.body.overwrite_name || `${Date.now()}.png`;
|
const filename = request.body.overwrite_name || `${Date.now()}.png`;
|
||||||
const pathToNewFile = path.join(directories.avatars, filename);
|
const pathToNewFile = path.join(directories.avatars, filename);
|
||||||
fs.writeFileSync(pathToNewFile, image);
|
writeFileAtomicSync(pathToNewFile, image);
|
||||||
fs.rmSync(pathToUpload);
|
fs.rmSync(pathToUpload);
|
||||||
return response.send({ path: filename });
|
return response.send({ path: filename });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -2641,7 +2653,7 @@ app.post('/creategroup', jsonParser, (request, response) => {
|
|||||||
fs.mkdirSync(directories.groups);
|
fs.mkdirSync(directories.groups);
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.writeFileSync(pathToFile, fileData);
|
writeFileAtomicSync(pathToFile, fileData);
|
||||||
return response.send(groupMetadata);
|
return response.send(groupMetadata);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -2653,7 +2665,7 @@ app.post('/editgroup', jsonParser, (request, response) => {
|
|||||||
const pathToFile = path.join(directories.groups, `${id}.json`);
|
const pathToFile = path.join(directories.groups, `${id}.json`);
|
||||||
const fileData = JSON.stringify(request.body);
|
const fileData = JSON.stringify(request.body);
|
||||||
|
|
||||||
fs.writeFileSync(pathToFile, fileData);
|
writeFileAtomicSync(pathToFile, fileData);
|
||||||
return response.send({ ok: true });
|
return response.send({ ok: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -2707,7 +2719,7 @@ app.post('/savegroupchat', jsonParser, (request, response) => {
|
|||||||
|
|
||||||
let chat_data = request.body.chat;
|
let chat_data = request.body.chat;
|
||||||
let jsonlData = chat_data.map(JSON.stringify).join('\n');
|
let jsonlData = chat_data.map(JSON.stringify).join('\n');
|
||||||
fs.writeFileSync(pathToFile, jsonlData, 'utf8');
|
writeFileAtomicSync(pathToFile, jsonlData, 'utf8');
|
||||||
return response.send({ ok: true });
|
return response.send({ ok: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -2906,7 +2918,7 @@ async function generateThumbnail(type, file) {
|
|||||||
buffer = fs.readFileSync(pathToOriginalFile);
|
buffer = fs.readFileSync(pathToOriginalFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.writeFileSync(pathToCachedFile, buffer);
|
writeFileAtomicSync(pathToCachedFile, buffer);
|
||||||
}
|
}
|
||||||
catch (outer) {
|
catch (outer) {
|
||||||
return null;
|
return null;
|
||||||
@@ -3467,7 +3479,7 @@ app.post("/save_preset", jsonParser, function (request, response) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const fullpath = path.join(directory, filename);
|
const fullpath = path.join(directory, filename);
|
||||||
fs.writeFileSync(fullpath, JSON.stringify(request.body.preset, null, 4), 'utf-8');
|
writeFileAtomicSync(fullpath, JSON.stringify(request.body.preset, null, 4), 'utf-8');
|
||||||
return response.send({ name });
|
return response.send({ name });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3502,7 +3514,7 @@ app.post("/savepreset_openai", jsonParser, function (request, response) {
|
|||||||
|
|
||||||
const filename = `${name}.settings`;
|
const filename = `${name}.settings`;
|
||||||
const fullpath = path.join(directories.openAI_Settings, filename);
|
const fullpath = path.join(directories.openAI_Settings, filename);
|
||||||
fs.writeFileSync(fullpath, JSON.stringify(request.body, null, 4), 'utf-8');
|
writeFileAtomicSync(fullpath, JSON.stringify(request.body, null, 4), 'utf-8');
|
||||||
return response.send({ name });
|
return response.send({ name });
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3804,7 +3816,7 @@ function migrateSecrets() {
|
|||||||
if (modified) {
|
if (modified) {
|
||||||
console.log('Writing updated settings.json...');
|
console.log('Writing updated settings.json...');
|
||||||
const settingsContent = JSON.stringify(settings);
|
const settingsContent = JSON.stringify(settings);
|
||||||
fs.writeFileSync(SETTINGS_FILE, settingsContent, "utf-8");
|
writeFileAtomicSync(SETTINGS_FILE, settingsContent, "utf-8");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
@@ -4175,7 +4187,7 @@ app.post('/upload_sprite_pack', urlencodedParser, async (request, response) => {
|
|||||||
|
|
||||||
// Write sprite buffer to disk
|
// Write sprite buffer to disk
|
||||||
const pathToSprite = path.join(spritesPath, filename);
|
const pathToSprite = path.join(spritesPath, filename);
|
||||||
fs.writeFileSync(pathToSprite, buffer);
|
writeFileAtomicSync(pathToSprite, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove uploaded ZIP file
|
// Remove uploaded ZIP file
|
||||||
@@ -4400,7 +4412,7 @@ function importRisuSprites(data) {
|
|||||||
|
|
||||||
const filename = label + '.png';
|
const filename = label + '.png';
|
||||||
const pathToFile = path.join(spritesPath, filename);
|
const pathToFile = path.join(spritesPath, filename);
|
||||||
fs.writeFileSync(pathToFile, fileBase64, { encoding: 'base64' });
|
writeFileAtomicSync(pathToFile, fileBase64, { encoding: 'base64' });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove additionalAssets and emotions from data (they are now in the sprites folder)
|
// Remove additionalAssets and emotions from data (they are now in the sprites folder)
|
||||||
@@ -4414,13 +4426,13 @@ function importRisuSprites(data) {
|
|||||||
function writeSecret(key, value) {
|
function writeSecret(key, value) {
|
||||||
if (!fs.existsSync(SECRETS_FILE)) {
|
if (!fs.existsSync(SECRETS_FILE)) {
|
||||||
const emptyFile = JSON.stringify({});
|
const emptyFile = JSON.stringify({});
|
||||||
fs.writeFileSync(SECRETS_FILE, emptyFile, "utf-8");
|
writeFileAtomicSync(SECRETS_FILE, emptyFile, "utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
const fileContents = fs.readFileSync(SECRETS_FILE);
|
const fileContents = fs.readFileSync(SECRETS_FILE);
|
||||||
const secrets = JSON.parse(fileContents);
|
const secrets = JSON.parse(fileContents);
|
||||||
secrets[key] = value;
|
secrets[key] = value;
|
||||||
fs.writeFileSync(SECRETS_FILE, JSON.stringify(secrets), "utf-8");
|
writeFileAtomicSync(SECRETS_FILE, JSON.stringify(secrets), "utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
function readSecret(key) {
|
function readSecret(key) {
|
||||||
|
@@ -9,7 +9,8 @@
|
|||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const util = require("util");
|
const util = require("util");
|
||||||
const writeFile = util.promisify(fs.writeFile);
|
const writeFileAtomic = require("write-file-atomic");
|
||||||
|
const writeFile = util.promisify(writeFileAtomic);
|
||||||
const readFile = util.promisify(fs.readFile);
|
const readFile = util.promisify(fs.readFile);
|
||||||
const readdir = util.promisify(fs.readdir);
|
const readdir = util.promisify(fs.readdir);
|
||||||
const crypto = require("crypto");
|
const crypto = require("crypto");
|
||||||
|
Reference in New Issue
Block a user