@@ -160,6 +154,26 @@
+
+
+
+
+
diff --git a/public/scripts/extensions/token-counter/index.js b/public/scripts/extensions/token-counter/index.js
index 5dc794f2b..aaa1d58e2 100644
--- a/public/scripts/extensions/token-counter/index.js
+++ b/public/scripts/extensions/token-counter/index.js
@@ -101,7 +101,9 @@ function drawChunks(chunks, ids) {
}
const color = pastelRainbow[i % pastelRainbow.length];
- const chunkHtml = $(`${chunk}`);
+ const chunkHtml = $('${inject.value} (${positionName}, depth: ${inject.depth})`;
+ return `* **${id}**: ${inject.value} (${positionName}, depth: ${inject.depth}, scan: ${inject.scan ?? false}, role: ${inject.role ?? extension_prompt_roles.SYSTEM})`;
})
.join('\n');
@@ -311,7 +332,7 @@ function flushInjectsCallback() {
for (const [id, inject] of Object.entries(chat_metadata.script_injects)) {
const prefixedId = `${SCRIPT_PROMPT_KEY}${id}`;
- setExtensionPrompt(prefixedId, '', inject.position, inject.depth);
+ setExtensionPrompt(prefixedId, '', inject.position, inject.depth, inject.scan, inject.role);
}
chat_metadata.script_injects = {};
@@ -338,7 +359,7 @@ export function processChatSlashCommands() {
for (const [id, inject] of Object.entries(context.chatMetadata.script_injects)) {
const prefixedId = `${SCRIPT_PROMPT_KEY}${id}`;
console.log('Adding script injection', id);
- setExtensionPrompt(prefixedId, inject.value, inject.position, inject.depth);
+ setExtensionPrompt(prefixedId, inject.value, inject.position, inject.depth, inject.scan, inject.role);
}
}
@@ -1724,6 +1745,11 @@ async function executeSlashCommands(text, unescape = false) {
continue;
}
+ // Skip comment commands. They don't run macros or interrupt pipes.
+ if (SlashCommandParser.COMMENT_KEYWORDS.includes(result.command)) {
+ continue;
+ }
+
if (result.value && typeof result.value === 'string') {
result.value = substituteParams(result.value.trim());
}
diff --git a/public/scripts/utils.js b/public/scripts/utils.js
index c7d001761..0b309c4f0 100644
--- a/public/scripts/utils.js
+++ b/public/scripts/utils.js
@@ -996,7 +996,7 @@ export async function saveBase64AsFile(base64Data, characterName, filename = '',
};
// Send the data URL to your backend using fetch
- const response = await fetch('/uploadimage', {
+ const response = await fetch('/api/images/upload', {
method: 'POST',
body: JSON.stringify(requestBody),
headers: {
@@ -1047,15 +1047,51 @@ export function loadFileToDocument(url, type) {
});
}
+/**
+ * Ensure that we can import war crime image formats like WEBP and AVIF.
+ * @param {File} file Input file
+ * @returns {Promise} A promise that resolves to the supported file.
+ */
+export async function ensureImageFormatSupported(file) {
+ const supportedTypes = [
+ 'image/jpeg',
+ 'image/png',
+ 'image/bmp',
+ 'image/tiff',
+ 'image/gif',
+ 'image/apng',
+ ];
+
+ if (supportedTypes.includes(file.type) || !file.type.startsWith('image/')) {
+ return file;
+ }
+
+ return await convertImageFile(file, 'image/png');
+}
+
+/**
+ * Converts an image file to a given format.
+ * @param {File} inputFile File to convert
+ * @param {string} type Target file type
+ * @returns {Promise} A promise that resolves to the converted file.
+ */
+export async function convertImageFile(inputFile, type = 'image/png') {
+ const base64 = await getBase64Async(inputFile);
+ const thumbnail = await createThumbnail(base64, null, null, type);
+ const blob = await fetch(thumbnail).then(res => res.blob());
+ const outputFile = new File([blob], inputFile.name, { type });
+ return outputFile;
+}
+
/**
* Creates a thumbnail from a data URL.
* @param {string} dataUrl The data URL encoded data of the image.
- * @param {number} maxWidth The maximum width of the thumbnail.
- * @param {number} maxHeight The maximum height of the thumbnail.
+ * @param {number|null} maxWidth The maximum width of the thumbnail.
+ * @param {number|null} maxHeight The maximum height of the thumbnail.
* @param {string} [type='image/jpeg'] The type of the thumbnail.
* @returns {Promise} A promise that resolves to the thumbnail data URL.
*/
-export function createThumbnail(dataUrl, maxWidth, maxHeight, type = 'image/jpeg') {
+export function createThumbnail(dataUrl, maxWidth = null, maxHeight = null, type = 'image/jpeg') {
// Someone might pass in a base64 encoded string without the data URL prefix
if (!dataUrl.includes('data:')) {
dataUrl = `data:image/jpeg;base64,${dataUrl}`;
@@ -1073,6 +1109,16 @@ export function createThumbnail(dataUrl, maxWidth, maxHeight, type = 'image/jpeg
let thumbnailWidth = maxWidth;
let thumbnailHeight = maxHeight;
+ if (maxWidth === null) {
+ thumbnailWidth = img.width;
+ maxWidth = img.width;
+ }
+
+ if (maxHeight === null) {
+ thumbnailHeight = img.height;
+ maxHeight = img.height;
+ }
+
if (img.width > img.height) {
thumbnailHeight = maxWidth / aspectRatio;
} else {
diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js
index 3f6dbc862..29582a1f0 100644
--- a/public/scripts/world-info.js
+++ b/public/scripts/world-info.js
@@ -1,4 +1,4 @@
-import { saveSettings, callPopup, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId } from '../script.js';
+import { saveSettings, callPopup, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId, extension_prompt_roles } from '../script.js';
import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath } from './utils.js';
import { extension_settings, getContext } from './extensions.js';
import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from './authors-note.js';
@@ -931,6 +931,7 @@ const originalDataKeyMap = {
'depth': 'extensions.depth',
'probability': 'extensions.probability',
'position': 'extensions.position',
+ 'role': 'extensions.role',
'content': 'content',
'enabled': 'enabled',
'key': 'keys',
@@ -1375,9 +1376,12 @@ function getWorldEntry(name, data, entry) {
depthInput.prop('disabled', false);
depthInput.css('visibility', 'visible');
//depthInput.parent().show();
+ const role = Number($(this).find(':selected').data('role'));
+ data.entries[uid].role = role;
} else {
depthInput.prop('disabled', true);
depthInput.css('visibility', 'hidden');
+ data.entries[uid].role = null;
//depthInput.parent().hide();
}
updatePosOrdDisplay(uid);
@@ -1385,11 +1389,13 @@ function getWorldEntry(name, data, entry) {
setOriginalDataValue(data, uid, 'position', data.entries[uid].position == 0 ? 'before_char' : 'after_char');
// Write the original value as extensions field
setOriginalDataValue(data, uid, 'extensions.position', data.entries[uid].position);
+ setOriginalDataValue(data, uid, 'extensions.role', data.entries[uid].role);
saveWorldInfo(name, data);
});
+ const roleValue = entry.position === world_info_position.atDepth ? String(entry.role ?? extension_prompt_roles.SYSTEM) : '';
template
- .find(`select[name="position"] option[value=${entry.position}]`)
+ .find(`select[name="position"] option[value=${entry.position}][data-role="${roleValue}"]`)
.prop('selected', true)
.trigger('input');
@@ -1610,7 +1616,7 @@ function getWorldEntry(name, data, entry) {
* @returns {(input: any, output: any) => any} Callback function for the autocomplete
*/
function getInclusionGroupCallback(data) {
- return function(input, output) {
+ return function (input, output) {
const groups = new Set();
for (const entry of Object.values(data.entries)) {
if (entry.group) {
@@ -1633,7 +1639,7 @@ function getInclusionGroupCallback(data) {
}
function getAutomationIdCallback(data) {
- return function(input, output) {
+ return function (input, output) {
const ids = new Set();
for (const entry of Object.values(data.entries)) {
if (entry.automationId) {
@@ -1714,6 +1720,7 @@ const newEntryTemplate = {
caseSensitive: null,
matchWholeWords: null,
automationId: '',
+ role: 0,
};
function createWorldInfoEntry(name, data, fromSlashCommand = false) {
@@ -2255,13 +2262,14 @@ async function checkWorldInfo(chat, maxContext) {
ANBottomEntries.unshift(entry.content);
break;
case world_info_position.atDepth: {
- const existingDepthIndex = WIDepthEntries.findIndex((e) => e.depth === entry.depth ?? DEFAULT_DEPTH);
+ const existingDepthIndex = WIDepthEntries.findIndex((e) => e.depth === (entry.depth ?? DEFAULT_DEPTH) && e.role === (entry.role ?? extension_prompt_roles.SYSTEM));
if (existingDepthIndex !== -1) {
WIDepthEntries[existingDepthIndex].entries.unshift(entry.content);
} else {
WIDepthEntries.push({
depth: entry.depth,
entries: [entry.content],
+ role: entry.role ?? extension_prompt_roles.SYSTEM,
});
}
break;
@@ -2277,7 +2285,7 @@ async function checkWorldInfo(chat, maxContext) {
if (shouldWIAddPrompt) {
const originalAN = context.extensionPrompts[NOTE_MODULE_NAME].value;
const ANWithWI = `${ANTopEntries.join('\n')}\n${originalAN}\n${ANBottomEntries.join('\n')}`;
- context.setExtensionPrompt(NOTE_MODULE_NAME, ANWithWI, chat_metadata[metadata_keys.position], chat_metadata[metadata_keys.depth], extension_settings.note.allowWIScan);
+ context.setExtensionPrompt(NOTE_MODULE_NAME, ANWithWI, chat_metadata[metadata_keys.position], chat_metadata[metadata_keys.depth], extension_settings.note.allowWIScan, chat_metadata[metadata_keys.role]);
}
return { worldInfoBefore, worldInfoAfter, WIDepthEntries, allActivatedEntries };
@@ -2358,6 +2366,7 @@ function convertAgnaiMemoryBook(inputObj) {
inputObj.entries.forEach((entry, index) => {
outputObj.entries[index] = {
+ ...newEntryTemplate,
uid: index,
key: entry.keywords,
keysecondary: [],
@@ -2375,6 +2384,11 @@ function convertAgnaiMemoryBook(inputObj) {
probability: null,
useProbability: false,
group: '',
+ scanDepth: entry.extensions?.scan_depth ?? null,
+ caseSensitive: entry.extensions?.case_sensitive ?? null,
+ matchWholeWords: entry.extensions?.match_whole_words ?? null,
+ automationId: entry.extensions?.automation_id ?? '',
+ role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
};
});
@@ -2386,6 +2400,7 @@ function convertRisuLorebook(inputObj) {
inputObj.data.forEach((entry, index) => {
outputObj.entries[index] = {
+ ...newEntryTemplate,
uid: index,
key: entry.key.split(',').map(x => x.trim()),
keysecondary: entry.secondkey ? entry.secondkey.split(',').map(x => x.trim()) : [],
@@ -2403,6 +2418,11 @@ function convertRisuLorebook(inputObj) {
probability: entry.activationPercent ?? null,
useProbability: entry.activationPercent ?? false,
group: '',
+ scanDepth: entry.extensions?.scan_depth ?? null,
+ caseSensitive: entry.extensions?.case_sensitive ?? null,
+ matchWholeWords: entry.extensions?.match_whole_words ?? null,
+ automationId: entry.extensions?.automation_id ?? '',
+ role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
};
});
@@ -2419,6 +2439,7 @@ function convertNovelLorebook(inputObj) {
const addMemo = displayName !== undefined && displayName.trim() !== '';
outputObj.entries[index] = {
+ ...newEntryTemplate,
uid: index,
key: entry.keys,
keysecondary: [],
@@ -2436,6 +2457,11 @@ function convertNovelLorebook(inputObj) {
probability: null,
useProbability: false,
group: '',
+ scanDepth: entry.extensions?.scan_depth ?? null,
+ caseSensitive: entry.extensions?.case_sensitive ?? null,
+ matchWholeWords: entry.extensions?.match_whole_words ?? null,
+ automationId: entry.extensions?.automation_id ?? '',
+ role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
};
});
@@ -2452,6 +2478,7 @@ function convertCharacterBook(characterBook) {
}
result.entries[entry.id] = {
+ ...newEntryTemplate,
uid: entry.id,
key: entry.keys,
keysecondary: entry.secondary_keys || [],
@@ -2475,6 +2502,7 @@ function convertCharacterBook(characterBook) {
caseSensitive: entry.extensions?.case_sensitive ?? null,
matchWholeWords: entry.extensions?.match_whole_words ?? null,
automationId: entry.extensions?.automation_id ?? '',
+ role: entry.extensions?.role ?? extension_prompt_roles.SYSTEM,
};
});
diff --git a/public/style.css b/public/style.css
index 40e64641c..d4c4a1855 100644
--- a/public/style.css
+++ b/public/style.css
@@ -630,7 +630,8 @@ body.reduced-motion #bg_custom {
padding-right: 2px;
}
-#send_form>#nonQRFormItems>div>div:not(.mes_stop) {
+#rightSendForm>div:not(.mes_stop),
+#leftSendForm>div {
width: var(--bottomFormBlockSize);
height: var(--bottomFormBlockSize);
margin: 0;
@@ -645,7 +646,8 @@ body.reduced-motion #bg_custom {
transition: all 300ms;
}
-#send_form>#nonQRFormItems>div>div:hover {
+#rightSendForm>div:hover,
+#leftSendForm>div:hover {
opacity: 1;
filter: brightness(1.2);
}
@@ -1383,7 +1385,7 @@ input[type="file"] {
}
-#movingDivs > div {
+#movingDivs>div {
z-index: 4000;
}
@@ -2746,7 +2748,7 @@ input[type="range"]::-webkit-slider-thumb {
max-height: calc(100vh - 84px);
max-height: calc(100svh - 84px);
position: absolute;
- z-index: 3000;
+ z-index: 4001;
margin-left: auto;
margin-right: auto;
left: 0;
@@ -2824,7 +2826,7 @@ h5 {
width: 100%;
height: 100vh;
height: 100svh;
- z-index: 3001;
+ z-index: 4100;
top: 0;
background-color: var(--black70a);
backdrop-filter: blur(var(--SmartThemeBlurStrength));
@@ -3384,7 +3386,8 @@ a {
}
body:has(.drawer-content.maximized) #top-settings-holder:has(.drawer-content.openDrawer:not(.fillLeft):not(.fillRight)),
-body:has(.drawer-content.open) #top-settings-holder:has(.drawer-content.openDrawer:not(.fillLeft):not(.fillRight)) {
+body:has(.drawer-content.open) #top-settings-holder:has(.drawer-content.openDrawer:not(.fillLeft):not(.fillRight)),
+body:has(#character_popup.open) #top-settings-holder:has(.drawer-content.openDrawer:not(.fillLeft):not(.fillRight)) {
z-index: 4005;
}
diff --git a/server.js b/server.js
index 538679dbc..77ab7073f 100644
--- a/server.js
+++ b/server.js
@@ -10,8 +10,6 @@ const util = require('util');
// cli/fs related library imports
const open = require('open');
-const sanitize = require('sanitize-filename');
-const writeFileAtomicSync = require('write-file-atomic').sync;
const yargs = require('yargs/yargs');
const { hideBin } = require('yargs/helpers');
@@ -29,9 +27,6 @@ const net = require('net');
const dns = require('dns');
const fetch = require('node-fetch').default;
-// image processing related library imports
-const jimp = require('jimp');
-
// Unrestrict console logs display limit
util.inspect.defaultOptions.maxArrayLength = null;
util.inspect.defaultOptions.maxStringLength = null;
@@ -39,16 +34,11 @@ util.inspect.defaultOptions.maxStringLength = null;
// local library imports
const basicAuthMiddleware = require('./src/middleware/basicAuth');
const whitelistMiddleware = require('./src/middleware/whitelist');
-const { jsonParser, urlencodedParser } = require('./src/express-common.js');
const contentManager = require('./src/endpoints/content-manager');
const {
getVersion,
getConfigValue,
color,
- tryParse,
- clientRelativePath,
- removeFileExtension,
- getImages,
forwardFetchResponse,
} = require('./src/util');
const { ensureThumbnailCache } = require('./src/endpoints/thumbnails');
@@ -106,7 +96,7 @@ const server_port = process.env.SILLY_TAVERN_PORT || getConfigValue('port', 8000
const autorun = (getConfigValue('autorun', false) || cliArguments.autorun) && !cliArguments.ssl;
const listen = getConfigValue('listen', false);
-const { DIRECTORIES, UPLOADS_PATH, AVATAR_WIDTH, AVATAR_HEIGHT } = require('./src/constants');
+const { DIRECTORIES, UPLOADS_PATH } = require('./src/constants');
// CORS Settings //
const CORS = cors({
@@ -207,7 +197,7 @@ if (getConfigValue('enableCorsProxy', false) || cliArguments.corsProxy) {
app.use(express.static(process.cwd() + '/public', {}));
app.use('/backgrounds', (req, res) => {
- const filePath = decodeURIComponent(path.join(process.cwd(), 'public/backgrounds', req.url.replace(/%20/g, ' ')));
+ const filePath = decodeURIComponent(path.join(process.cwd(), DIRECTORIES.backgrounds, req.url.replace(/%20/g, ' ')));
fs.readFile(filePath, (err, data) => {
if (err) {
res.status(404).send('File not found');
@@ -237,185 +227,6 @@ app.get('/version', async function (_, response) {
response.send(data);
});
-app.post('/getuseravatars', jsonParser, function (request, response) {
- var images = getImages('public/User Avatars');
- response.send(JSON.stringify(images));
-
-});
-
-app.post('/deleteuseravatar', jsonParser, function (request, response) {
- if (!request.body) return response.sendStatus(400);
-
- if (request.body.avatar !== sanitize(request.body.avatar)) {
- console.error('Malicious avatar name prevented');
- return response.sendStatus(403);
- }
-
- const fileName = path.join(DIRECTORIES.avatars, sanitize(request.body.avatar));
-
- if (fs.existsSync(fileName)) {
- fs.rmSync(fileName);
- return response.send({ result: 'ok' });
- }
-
- return response.sendStatus(404);
-});
-
-app.post('/savetheme', jsonParser, (request, response) => {
- if (!request.body || !request.body.name) {
- return response.sendStatus(400);
- }
-
- const filename = path.join(DIRECTORIES.themes, sanitize(request.body.name) + '.json');
- writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
-
- return response.sendStatus(200);
-});
-
-app.post('/savemovingui', jsonParser, (request, response) => {
- if (!request.body || !request.body.name) {
- return response.sendStatus(400);
- }
-
- const filename = path.join(DIRECTORIES.movingUI, sanitize(request.body.name) + '.json');
- writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
-
- return response.sendStatus(200);
-});
-
-app.post('/savequickreply', jsonParser, (request, response) => {
- if (!request.body || !request.body.name) {
- return response.sendStatus(400);
- }
-
- const filename = path.join(DIRECTORIES.quickreplies, sanitize(request.body.name) + '.json');
- writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
-
- return response.sendStatus(200);
-});
-
-app.post('/deletequickreply', jsonParser, (request, response) => {
- if (!request.body || !request.body.name) {
- return response.sendStatus(400);
- }
-
- const filename = path.join(DIRECTORIES.quickreplies, sanitize(request.body.name) + '.json');
- if (fs.existsSync(filename)) {
- fs.unlinkSync(filename);
- }
-
- return response.sendStatus(200);
-});
-
-
-app.post('/uploaduseravatar', urlencodedParser, async (request, response) => {
- if (!request.file) return response.sendStatus(400);
-
- try {
- const pathToUpload = path.join(UPLOADS_PATH, request.file.filename);
- const crop = tryParse(request.query.crop);
- let rawImg = await jimp.read(pathToUpload);
-
- if (typeof crop == 'object' && [crop.x, crop.y, crop.width, crop.height].every(x => typeof x === 'number')) {
- rawImg = rawImg.crop(crop.x, crop.y, crop.width, crop.height);
- }
-
- const image = await rawImg.cover(AVATAR_WIDTH, AVATAR_HEIGHT).getBufferAsync(jimp.MIME_PNG);
-
- const filename = request.body.overwrite_name || `${Date.now()}.png`;
- const pathToNewFile = path.join(DIRECTORIES.avatars, filename);
- writeFileAtomicSync(pathToNewFile, image);
- fs.rmSync(pathToUpload);
- return response.send({ path: filename });
- } catch (err) {
- return response.status(400).send('Is not a valid image');
- }
-});
-
-
-/**
- * Ensure the directory for the provided file path exists.
- * If not, it will recursively create the directory.
- *
- * @param {string} filePath - The full path of the file for which the directory should be ensured.
- */
-function ensureDirectoryExistence(filePath) {
- const dirname = path.dirname(filePath);
- if (fs.existsSync(dirname)) {
- return true;
- }
- ensureDirectoryExistence(dirname);
- fs.mkdirSync(dirname);
-}
-
-/**
- * Endpoint to handle image uploads.
- * The image should be provided in the request body in base64 format.
- * Optionally, a character name can be provided to save the image in a sub-folder.
- *
- * @route POST /uploadimage
- * @param {Object} request.body - The request payload.
- * @param {string} request.body.image - The base64 encoded image data.
- * @param {string} [request.body.ch_name] - Optional character name to determine the sub-directory.
- * @returns {Object} response - The response object containing the path where the image was saved.
- */
-app.post('/uploadimage', jsonParser, async (request, response) => {
- // Check for image data
- if (!request.body || !request.body.image) {
- return response.status(400).send({ error: 'No image data provided' });
- }
-
- try {
- // Extracting the base64 data and the image format
- const splitParts = request.body.image.split(',');
- const format = splitParts[0].split(';')[0].split('/')[1];
- const base64Data = splitParts[1];
- const validFormat = ['png', 'jpg', 'webp', 'jpeg', 'gif'].includes(format);
- if (!validFormat) {
- return response.status(400).send({ error: 'Invalid image format' });
- }
-
- // Constructing filename and path
- let filename;
- if (request.body.filename) {
- filename = `${removeFileExtension(request.body.filename)}.${format}`;
- } else {
- filename = `${Date.now()}.${format}`;
- }
-
- // if character is defined, save to a sub folder for that character
- let pathToNewFile = path.join(DIRECTORIES.userImages, sanitize(filename));
- if (request.body.ch_name) {
- pathToNewFile = path.join(DIRECTORIES.userImages, sanitize(request.body.ch_name), sanitize(filename));
- }
-
- ensureDirectoryExistence(pathToNewFile);
- const imageBuffer = Buffer.from(base64Data, 'base64');
- await fs.promises.writeFile(pathToNewFile, imageBuffer);
- response.send({ path: clientRelativePath(pathToNewFile) });
- } catch (error) {
- console.log(error);
- response.status(500).send({ error: 'Failed to save the image' });
- }
-});
-
-app.post('/listimgfiles/:folder', (req, res) => {
- const directoryPath = path.join(process.cwd(), 'public/user/images/', sanitize(req.params.folder));
-
- if (!fs.existsSync(directoryPath)) {
- fs.mkdirSync(directoryPath, { recursive: true });
- }
-
- try {
- const images = getImages(directoryPath);
- return res.send(images);
- } catch (error) {
- console.error(error);
- return res.status(500).send({ error: 'Unable to retrieve files' });
- }
-});
-
-
function cleanUploads() {
try {
if (fs.existsSync(UPLOADS_PATH)) {
@@ -499,6 +310,40 @@ redirect('/delbackground', '/api/backgrounds/delete');
redirect('/renamebackground', '/api/backgrounds/rename');
redirect('/downloadbackground', '/api/backgrounds/upload'); // yes, the downloadbackground endpoint actually uploads one
+// Redirect deprecated theme API endpoints
+redirect('/savetheme', '/api/themes/save');
+
+// Redirect deprecated avatar API endpoints
+redirect('/getuseravatars', '/api/avatars/get');
+redirect('/deleteuseravatar', '/api/avatars/delete');
+redirect('/uploaduseravatar', '/api/avatars/upload');
+
+// Redirect deprecated quick reply endpoints
+redirect('/deletequickreply', '/api/quick-replies/delete');
+redirect('/savequickreply', '/api/quick-replies/save');
+
+// Redirect deprecated image endpoints
+redirect('/uploadimage', '/api/images/upload');
+redirect('/listimgfiles/:folder', '/api/images/list/:folder');
+
+// Redirect deprecated moving UI endpoints
+redirect('/savemovingui', '/api/moving-ui/save');
+
+// Moving UI
+app.use('/api/moving-ui', require('./src/endpoints/moving-ui').router);
+
+// Image management
+app.use('/api/images', require('./src/endpoints/images').router);
+
+// Quick reply management
+app.use('/api/quick-replies', require('./src/endpoints/quick-replies').router);
+
+// Avatar management
+app.use('/api/avatars', require('./src/endpoints/avatars').router);
+
+// Theme management
+app.use('/api/themes', require('./src/endpoints/themes').router);
+
// OpenAI API
app.use('/api/openai', require('./src/endpoints/openai').router);
diff --git a/src/endpoints/avatars.js b/src/endpoints/avatars.js
new file mode 100644
index 000000000..d13d1bf29
--- /dev/null
+++ b/src/endpoints/avatars.js
@@ -0,0 +1,62 @@
+const express = require('express');
+const path = require('path');
+const fs = require('fs');
+const sanitize = require('sanitize-filename');
+const writeFileAtomicSync = require('write-file-atomic').sync;
+const { jsonParser, urlencodedParser } = require('../express-common');
+const { DIRECTORIES, AVATAR_WIDTH, AVATAR_HEIGHT, UPLOADS_PATH } = require('../constants');
+const { getImages, tryParse } = require('../util');
+
+// image processing related library imports
+const jimp = require('jimp');
+
+const router = express.Router();
+
+router.post('/get', jsonParser, function (request, response) {
+ var images = getImages(DIRECTORIES.avatars);
+ response.send(JSON.stringify(images));
+});
+
+router.post('/delete', jsonParser, function (request, response) {
+ if (!request.body) return response.sendStatus(400);
+
+ if (request.body.avatar !== sanitize(request.body.avatar)) {
+ console.error('Malicious avatar name prevented');
+ return response.sendStatus(403);
+ }
+
+ const fileName = path.join(DIRECTORIES.avatars, sanitize(request.body.avatar));
+
+ if (fs.existsSync(fileName)) {
+ fs.rmSync(fileName);
+ return response.send({ result: 'ok' });
+ }
+
+ return response.sendStatus(404);
+});
+
+router.post('/upload', urlencodedParser, async (request, response) => {
+ if (!request.file) return response.sendStatus(400);
+
+ try {
+ const pathToUpload = path.join(UPLOADS_PATH, request.file.filename);
+ const crop = tryParse(request.query.crop);
+ let rawImg = await jimp.read(pathToUpload);
+
+ if (typeof crop == 'object' && [crop.x, crop.y, crop.width, crop.height].every(x => typeof x === 'number')) {
+ rawImg = rawImg.crop(crop.x, crop.y, crop.width, crop.height);
+ }
+
+ const image = await rawImg.cover(AVATAR_WIDTH, AVATAR_HEIGHT).getBufferAsync(jimp.MIME_PNG);
+
+ const filename = request.body.overwrite_name || `${Date.now()}.png`;
+ const pathToNewFile = path.join(DIRECTORIES.avatars, filename);
+ writeFileAtomicSync(pathToNewFile, image);
+ fs.rmSync(pathToUpload);
+ return response.send({ path: filename });
+ } catch (err) {
+ return response.status(400).send('Is not a valid image');
+ }
+});
+
+module.exports = { router };
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index 318932b45..c695e230a 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -1,11 +1,10 @@
const express = require('express');
const fetch = require('node-fetch').default;
-const { Readable } = require('stream');
const { jsonParser } = require('../../express-common');
const { CHAT_COMPLETION_SOURCES, GEMINI_SAFETY, BISON_SAFETY, OPENROUTER_HEADERS } = require('../../constants');
const { forwardFetchResponse, getConfigValue, tryParse, uuidv4, mergeObjectWithYaml, excludeKeysByYaml, color } = require('../../util');
-const { convertClaudeMessages, convertGooglePrompt, convertTextCompletionPrompt } = require('../prompt-converters');
+const { convertClaudeMessages, convertGooglePrompt, convertTextCompletionPrompt } = require('../../prompt-converters');
const { readSecret, SECRET_KEYS } = require('../secrets');
const { getTokenizerModel, getSentencepiceTokenizer, getTiktokenTokenizer, sentencepieceTokenizers, TEXT_COMPLETION_MODELS } = require('../tokenizers');
diff --git a/src/endpoints/backgrounds.js b/src/endpoints/backgrounds.js
index ffcaed559..d0b9d5ab7 100644
--- a/src/endpoints/backgrounds.js
+++ b/src/endpoints/backgrounds.js
@@ -8,7 +8,7 @@ const { DIRECTORIES, UPLOADS_PATH } = require('../constants');
const { invalidateThumbnail } = require('./thumbnails');
const { getImages } = require('../util');
-const router = new express.Router();
+const router = express.Router();
router.post('/all', jsonParser, function (request, response) {
var images = getImages('public/backgrounds');
diff --git a/src/endpoints/characters.js b/src/endpoints/characters.js
index 03260f1a7..e2063def3 100644
--- a/src/endpoints/characters.js
+++ b/src/endpoints/characters.js
@@ -406,6 +406,7 @@ function convertWorldInfoToCharacterBook(name, entries) {
match_whole_words: entry.matchWholeWords ?? null,
case_sensitive: entry.caseSensitive ?? null,
automation_id: entry.automationId ?? '',
+ role: entry.role ?? 0,
},
};
diff --git a/src/endpoints/images.js b/src/endpoints/images.js
new file mode 100644
index 000000000..e0f458c35
--- /dev/null
+++ b/src/endpoints/images.js
@@ -0,0 +1,94 @@
+const fs = require('fs');
+const path = require('path');
+const express = require('express');
+const sanitize = require('sanitize-filename');
+
+const { jsonParser } = require('../express-common');
+const { DIRECTORIES } = require('../constants');
+const { clientRelativePath, removeFileExtension, getImages } = require('../util');
+
+/**
+ * Ensure the directory for the provided file path exists.
+ * If not, it will recursively create the directory.
+ *
+ * @param {string} filePath - The full path of the file for which the directory should be ensured.
+ */
+function ensureDirectoryExistence(filePath) {
+ const dirname = path.dirname(filePath);
+ if (fs.existsSync(dirname)) {
+ return true;
+ }
+ ensureDirectoryExistence(dirname);
+ fs.mkdirSync(dirname);
+}
+
+const router = express.Router();
+
+/**
+ * Endpoint to handle image uploads.
+ * The image should be provided in the request body in base64 format.
+ * Optionally, a character name can be provided to save the image in a sub-folder.
+ *
+ * @route POST /api/images/upload
+ * @param {Object} request.body - The request payload.
+ * @param {string} request.body.image - The base64 encoded image data.
+ * @param {string} [request.body.ch_name] - Optional character name to determine the sub-directory.
+ * @returns {Object} response - The response object containing the path where the image was saved.
+ */
+router.post('/upload', jsonParser, async (request, response) => {
+ // Check for image data
+ if (!request.body || !request.body.image) {
+ return response.status(400).send({ error: 'No image data provided' });
+ }
+
+ try {
+ // Extracting the base64 data and the image format
+ const splitParts = request.body.image.split(',');
+ const format = splitParts[0].split(';')[0].split('/')[1];
+ const base64Data = splitParts[1];
+ const validFormat = ['png', 'jpg', 'webp', 'jpeg', 'gif'].includes(format);
+ if (!validFormat) {
+ return response.status(400).send({ error: 'Invalid image format' });
+ }
+
+ // Constructing filename and path
+ let filename;
+ if (request.body.filename) {
+ filename = `${removeFileExtension(request.body.filename)}.${format}`;
+ } else {
+ filename = `${Date.now()}.${format}`;
+ }
+
+ // if character is defined, save to a sub folder for that character
+ let pathToNewFile = path.join(DIRECTORIES.userImages, sanitize(filename));
+ if (request.body.ch_name) {
+ pathToNewFile = path.join(DIRECTORIES.userImages, sanitize(request.body.ch_name), sanitize(filename));
+ }
+
+ ensureDirectoryExistence(pathToNewFile);
+ const imageBuffer = Buffer.from(base64Data, 'base64');
+ await fs.promises.writeFile(pathToNewFile, imageBuffer);
+ response.send({ path: clientRelativePath(pathToNewFile) });
+ } catch (error) {
+ console.log(error);
+ response.status(500).send({ error: 'Failed to save the image' });
+ }
+});
+
+router.post('/list/:folder', (req, res) => {
+ const directoryPath = path.join(process.cwd(), DIRECTORIES.userImages, sanitize(req.params.folder));
+
+ if (!fs.existsSync(directoryPath)) {
+ fs.mkdirSync(directoryPath, { recursive: true });
+ }
+
+ try {
+ const images = getImages(directoryPath);
+ return res.send(images);
+ } catch (error) {
+ console.error(error);
+ return res.status(500).send({ error: 'Unable to retrieve files' });
+ }
+});
+
+module.exports = { router };
diff --git a/src/endpoints/moving-ui.js b/src/endpoints/moving-ui.js
new file mode 100644
index 000000000..c095c7a11
--- /dev/null
+++ b/src/endpoints/moving-ui.js
@@ -0,0 +1,22 @@
+const path = require('path');
+const express = require('express');
+const sanitize = require('sanitize-filename');
+const writeFileAtomicSync = require('write-file-atomic').sync;
+
+const { jsonParser } = require('../express-common');
+const { DIRECTORIES } = require('../constants');
+
+const router = express.Router();
+
+router.post('/save', jsonParser, (request, response) => {
+ if (!request.body || !request.body.name) {
+ return response.sendStatus(400);
+ }
+
+ const filename = path.join(DIRECTORIES.movingUI, sanitize(request.body.name) + '.json');
+ writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
+
+ return response.sendStatus(200);
+});
+
+module.exports = { router };
diff --git a/src/endpoints/novelai.js b/src/endpoints/novelai.js
index a0dbeb459..e1158a304 100644
--- a/src/endpoints/novelai.js
+++ b/src/endpoints/novelai.js
@@ -265,8 +265,8 @@ router.post('/generate-image', jsonParser, async (request, response) => {
controlnet_strength: 1,
dynamic_thresholding: false,
legacy: false,
- sm: false,
- sm_dyn: false,
+ sm: request.body.sm ?? false,
+ sm_dyn: request.body.sm_dyn ?? false,
uncond_scale: 1,
},
}),
diff --git a/src/endpoints/quick-replies.js b/src/endpoints/quick-replies.js
new file mode 100644
index 000000000..c5921ad67
--- /dev/null
+++ b/src/endpoints/quick-replies.js
@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+const express = require('express');
+const sanitize = require('sanitize-filename');
+const writeFileAtomicSync = require('write-file-atomic').sync;
+
+const { jsonParser } = require('../express-common');
+const { DIRECTORIES } = require('../constants');
+
+const router = express.Router();
+
+router.post('/save', jsonParser, (request, response) => {
+ if (!request.body || !request.body.name) {
+ return response.sendStatus(400);
+ }
+
+ const filename = path.join(DIRECTORIES.quickreplies, sanitize(request.body.name) + '.json');
+ writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
+
+ return response.sendStatus(200);
+});
+
+router.post('/delete', jsonParser, (request, response) => {
+ if (!request.body || !request.body.name) {
+ return response.sendStatus(400);
+ }
+
+ const filename = path.join(DIRECTORIES.quickreplies, sanitize(request.body.name) + '.json');
+ if (fs.existsSync(filename)) {
+ fs.unlinkSync(filename);
+ }
+
+ return response.sendStatus(200);
+});
+
+module.exports = { router };
diff --git a/src/endpoints/themes.js b/src/endpoints/themes.js
new file mode 100644
index 000000000..4815c5c33
--- /dev/null
+++ b/src/endpoints/themes.js
@@ -0,0 +1,41 @@
+const express = require('express');
+const path = require('path');
+const fs = require('fs');
+const sanitize = require('sanitize-filename');
+const writeFileAtomicSync = require('write-file-atomic').sync;
+const { jsonParser } = require('../express-common');
+const { DIRECTORIES } = require('../constants');
+
+const router = express.Router();
+
+router.post('/save', jsonParser, (request, response) => {
+ if (!request.body || !request.body.name) {
+ return response.sendStatus(400);
+ }
+
+ const filename = path.join(DIRECTORIES.themes, sanitize(request.body.name) + '.json');
+ writeFileAtomicSync(filename, JSON.stringify(request.body, null, 4), 'utf8');
+
+ return response.sendStatus(200);
+});
+
+router.post('/delete', jsonParser, function (request, response) {
+ if (!request.body || !request.body.name) {
+ return response.sendStatus(400);
+ }
+
+ try {
+ const filename = path.join(DIRECTORIES.themes, sanitize(request.body.name) + '.json');
+ if (!fs.existsSync(filename)) {
+ console.error('Theme file not found:', filename);
+ return response.sendStatus(404);
+ }
+ fs.rmSync(filename);
+ return response.sendStatus(200);
+ } catch (error) {
+ console.error(error);
+ return response.sendStatus(500);
+ }
+});
+
+module.exports = { router };
diff --git a/src/endpoints/tokenizers.js b/src/endpoints/tokenizers.js
index 615042a96..e6fba800a 100644
--- a/src/endpoints/tokenizers.js
+++ b/src/endpoints/tokenizers.js
@@ -4,7 +4,7 @@ const express = require('express');
const { SentencePieceProcessor } = require('@agnai/sentencepiece-js');
const tiktoken = require('@dqbd/tiktoken');
const { Tokenizer } = require('@agnai/web-tokenizers');
-const { convertClaudePrompt, convertGooglePrompt } = require('./prompt-converters');
+const { convertClaudePrompt, convertGooglePrompt } = require('../prompt-converters');
const { readSecret, SECRET_KEYS } = require('./secrets');
const { TEXTGEN_TYPES } = require('../constants');
const { jsonParser } = require('../express-common');
@@ -250,7 +250,7 @@ async function loadClaudeTokenizer(modelPath) {
function countClaudeTokens(tokenizer, messages) {
// Should be fine if we use the old conversion method instead of the messages API one i think?
- const convertedPrompt = convertClaudePrompt(messages, false, false, false);
+ const convertedPrompt = convertClaudePrompt(messages, false, '', false, false, '', false);
// Fallback to strlen estimation
if (!tokenizer) {
@@ -398,7 +398,7 @@ router.post('/google/count', jsonParser, async function (req, res) {
accept: 'application/json',
'content-type': 'application/json',
},
- body: JSON.stringify({ contents: convertGooglePrompt(req.body) }),
+ body: JSON.stringify({ contents: convertGooglePrompt(req.body, String(req.query.model)) }),
};
try {
const response = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/${req.query.model}:countTokens?key=${readSecret(SECRET_KEYS.MAKERSUITE)}`, options);
diff --git a/src/endpoints/prompt-converters.js b/src/prompt-converters.js
similarity index 100%
rename from src/endpoints/prompt-converters.js
rename to src/prompt-converters.js