@@ -2507,11 +2548,6 @@
-
diff --git a/public/script.js b/public/script.js
index 842746dcf..950e0392b 100644
--- a/public/script.js
+++ b/public/script.js
@@ -49,6 +49,7 @@ import {
editGroup,
deleteGroupChat,
renameGroupChat,
+ importGroupChat,
} from "./scripts/group-chats.js";
import {
@@ -106,7 +107,7 @@ import {
setPoeOnlineStatus,
} from "./scripts/poe.js";
-import { debounce, delay, restoreCaretPosition, saveCaretPosition, end_trim_to_sentence } from "./scripts/utils.js";
+import { debounce, delay, restoreCaretPosition, saveCaretPosition, end_trim_to_sentence, countOccurrences, isOdd } from "./scripts/utils.js";
import { extension_settings, loadExtensionSettings } from "./scripts/extensions.js";
import { executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "./scripts/slash-commands.js";
import {
@@ -226,7 +227,6 @@ let safetychat = [
];
let chat_create_date = 0;
-let prev_selected_char = null;
const default_ch_mes = "Hello";
let count_view_mes = 0;
let mesStr = "";
@@ -293,7 +293,7 @@ const system_messages = {
mes: [
`Hi there! The following chat formatting commands are supported:
*I used to roll the dice.
Feel the fear in my enemies' eyes* | None |
|
| Author's Note | Built-in extension that allows you to append notes that will be added to the context and steer the story and character in a specific direction. Because it's sent after the character description, it has a lot of weight. Thanks Ali឵#2222 for pitching the idea! | None |  |
| Character Backgrounds | Built-in extension to assign unique backgrounds to specific chats or groups. | None | 
|
+| Stable Diffusion | Use local of cloud-based Stable Diffusion webUI API to generate images. 5 presets included ('you', 'your face', 'me', 'the story', and 'the last message'. Free mode also supported via `/sd (anything_here_)` command in the chat input bar. Most common StableDiffusion generation settings are customizable within the SillyTavern UI. | None | 
|
+| Text-to-Speech | AI-generated voice will read back character messages on demand, or automatically read new messages they arrive. Supports ElevenLabs, Silero, and your device's TTS service. | None | 
|
## UI/CSS/Quality of Life tweaks by RossAscends
diff --git a/server.js b/server.js
index 03e80abcd..4bfc42268 100644
--- a/server.js
+++ b/server.js
@@ -63,7 +63,9 @@ const utf8Encode = new TextEncoder();
const utf8Decode = new TextDecoder('utf-8', { ignoreBOM: true });
const commandExistsSync = require('command-exists').sync;
+const characterCardParser = require('./src/character-card-parser.js');
const config = require(path.join(process.cwd(), './config.conf'));
+
const server_port = process.env.SILLY_TAVERN_PORT || config.port;
const whitelistPath = path.join(process.cwd(), "./whitelist.txt");
@@ -145,7 +147,6 @@ const tokenizersCache = {};
function getTiktokenTokenizer(model) {
if (tokenizersCache[model]) {
- console.log('Using the cached tokenizer instance for', model);
return tokenizersCache[model];
}
@@ -913,61 +914,7 @@ async function tryReadImage(img_url, crop) {
}
async function charaRead(img_url, input_format) {
- let format;
- if (input_format === undefined) {
- if (img_url.indexOf('.webp') !== -1) {
- format = 'webp';
- } else {
- format = 'png';
- }
- } else {
- format = input_format;
- }
-
- switch (format) {
- case 'webp':
- try {
- const exif_data = await ExifReader.load(fs.readFileSync(img_url));
- let char_data;
-
- if (exif_data['UserComment']['description']) {
- let description = exif_data['UserComment']['description'];
- if (description === 'Undefined' && exif_data['UserComment'].value && exif_data['UserComment'].value.length === 1) {
- description = exif_data['UserComment'].value[0];
- }
- try {
- json5.parse(description);
- char_data = description;
- } catch {
- const byteArr = description.split(",").map(Number);
- const uint8Array = new Uint8Array(byteArr);
- const char_data_string = utf8Decode.decode(uint8Array);
- char_data = char_data_string;
- }
- } else {
- console.log('No description found in EXIF data.');
- return false;
- }
- return char_data;
- }
- catch (err) {
- console.log(err);
- return false;
- }
- case 'png':
- const buffer = fs.readFileSync(img_url);
- const chunks = extract(buffer);
-
- const textChunks = chunks.filter(function (chunk) {
- return chunk.name === 'tEXt';
- }).map(function (chunk) {
- return PNGtext.decode(chunk.data);
- });
- var base64DecodedData = Buffer.from(textChunks[0].text, 'base64').toString('utf8');
- return base64DecodedData;//textChunks[0].text;
- default:
- break;
- }
+ return characterCardParser.parse(img_url, input_format);
}
app.post("/getcharacters", jsonParser, function (request, response) {
@@ -1754,6 +1701,17 @@ app.post("/exportcharacter", jsonParser, async function (request, response) {
return response.sendStatus(400);
});
+app.post("/importgroupchat", urlencodedParser, function (request, response) {
+ try {
+ const filedata = request.file;
+ const chatname = humanizedISO8601DateTime();
+ fs.copyFileSync(`./uploads/${filedata.filename}`, (`${directories.groupChats}/${chatname}.jsonl`));
+ return response.send({ res: chatname });
+ } catch (error) {
+ console.error(error);
+ return response.send({ error: true });
+ }
+});
app.post("/importchat", urlencodedParser, function (request, response) {
if (!request.body) return response.sendStatus(400);
@@ -1763,9 +1721,8 @@ app.post("/importchat", urlencodedParser, function (request, response) {
let avatar_url = (request.body.avatar_url).replace('.png', '');
let ch_name = request.body.character_name;
if (filedata) {
-
if (format === 'json') {
- fs.readFile('./uploads/' + filedata.filename, 'utf8', (err, data) => {
+ fs.readFile(`./uploads/${filedata.filename}`, 'utf8', (err, data) => {
if (err) {
console.log(err);
@@ -1782,7 +1739,6 @@ app.post("/importchat", urlencodedParser, function (request, response) {
user_name: 'You',
character_name: ch_name,
create_date: humanizedISO8601DateTime(),
-
},
...history.msgs.map(
(message) => ({
@@ -1803,7 +1759,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
const errors = [];
newChats.forEach(chat => fs.writeFile(
- chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + ' imported.jsonl',
+ `${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()} imported.jsonl`,
chat.map(JSON.stringify).join('\n'),
'utf8',
(err) => err ?? errors.push(err)
@@ -1832,8 +1788,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
let jsonData = json5.parse(line);
if (jsonData.user_name !== undefined || jsonData.name !== undefined) {
- //console.log(humanizedISO8601DateTime()+':/importchat copying chat as '+ch_name+' - '+humanizedISO8601DateTime()+'.jsonl');
- fs.copyFile('./uploads/' + filedata.filename, chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + '.jsonl', (err) => { //added character name and replaced Date.now() with humanizedISO8601DateTime
+ fs.copyFile(`./uploads/${filedata.filename}`, (`${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()}.jsonl`), (err) => {
if (err) {
response.send({ error: true });
return console.log(err);
@@ -1849,9 +1804,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
rl.close();
});
}
-
}
-
});
app.post('/importworldinfo', urlencodedParser, (request, response) => {
@@ -1919,7 +1872,7 @@ app.post('/uploaduseravatar', urlencodedParser, async (request, response) => {
const crop = tryParse(request.query.crop);
let rawImg = await jimp.read(pathToUpload);
- if (typeof crop == 'object') {
+ 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);
}
@@ -2746,8 +2699,12 @@ const setupTasks = async function () {
}
if (listen && !config.whitelistMode && !config.basicAuthMode) {
- console.error('Your SillyTavern is currently unsecurely open to the public. Enable whitelisting or basic authentication.');
- process.exit(1);
+ if (config.securityOverride)
+ console.warn("Security has been override. If it's not a trusted network, change the settings.");
+ else {
+ console.error('Your SillyTavern is currently unsecurely open to the public. Enable whitelisting or basic authentication.');
+ process.exit(1);
+ }
}
if (true === cliArguments.ssl)
diff --git a/src/character-card-parser.js b/src/character-card-parser.js
new file mode 100644
index 000000000..e97a66bf0
--- /dev/null
+++ b/src/character-card-parser.js
@@ -0,0 +1,72 @@
+const fs = require('fs');
+const json5 = require('json5');
+const ExifReader = require('exifreader');
+
+const extract = require('png-chunks-extract');
+const PNGtext = require('png-chunk-text');
+
+const utf8Decode = new TextDecoder('utf-8', { ignoreBOM: true });
+
+const parse = async (cardUrl, format) => {
+ let fileFormat;
+ if (format === undefined) {
+ if (cardUrl.indexOf('.webp') !== -1)
+ fileFormat = 'webp';
+ else
+ fileFormat = 'png';
+ }
+ else
+ fileFormat = format;
+
+ switch (fileFormat) {
+ case 'webp':
+ try {
+ const exif_data = await ExifReader.load(fs.readFileSync(cardUrl));
+ let char_data;
+
+ if (exif_data['UserComment']['description']) {
+ let description = exif_data['UserComment']['description'];
+ if (description === 'Undefined' && exif_data['UserComment'].value && exif_data['UserComment'].value.length === 1) {
+ description = exif_data['UserComment'].value[0];
+ }
+
+ try {
+ json5.parse(description);
+ char_data = description;
+ } catch {
+ const byteArr = description.split(",").map(Number);
+ const uint8Array = new Uint8Array(byteArr);
+ const char_data_string = utf8Decode.decode(uint8Array);
+ char_data = char_data_string;
+ }
+ }
+ else {
+ console.log('No description found in EXIF data.');
+ return false;
+ }
+
+ return char_data;
+ }
+ catch (err) {
+ console.log(err);
+ return false;
+ }
+ case 'png':
+ const buffer = fs.readFileSync(cardUrl);
+ const chunks = extract(buffer);
+
+ const textChunks = chunks.filter(function (chunk) {
+ return chunk.name === 'tEXt';
+ }).map(function (chunk) {
+ return PNGtext.decode(chunk.data);
+ });
+
+ return Buffer.from(textChunks[0].text, 'base64').toString('utf8');
+ default:
+ break;
+ }
+};
+
+module.exports = {
+ parse: parse
+};
-
-
- {{text}} - sets a one-time behavioral bias for the AI. Resets when you send the next message. +
- {{text}} - sets a one-time behavioral bias for the AI. Resets when you send the next message.
*I used to roll the dice.
Feel the fear in my enemies' eyes* | None |
|
| Author's Note | Built-in extension that allows you to append notes that will be added to the context and steer the story and character in a specific direction. Because it's sent after the character description, it has a lot of weight. Thanks Ali឵#2222 for pitching the idea! | None |  |
| Character Backgrounds | Built-in extension to assign unique backgrounds to specific chats or groups. | None | |
+| Stable Diffusion | Use local of cloud-based Stable Diffusion webUI API to generate images. 5 presets included ('you', 'your face', 'me', 'the story', and 'the last message'. Free mode also supported via `/sd (anything_here_)` command in the chat input bar. Most common StableDiffusion generation settings are customizable within the SillyTavern UI. | None | |
+| Text-to-Speech | AI-generated voice will read back character messages on demand, or automatically read new messages they arrive. Supports ElevenLabs, Silero, and your device's TTS service. | None | |
## UI/CSS/Quality of Life tweaks by RossAscends
diff --git a/server.js b/server.js
index 03e80abcd..4bfc42268 100644
--- a/server.js
+++ b/server.js
@@ -63,7 +63,9 @@ const utf8Encode = new TextEncoder();
const utf8Decode = new TextDecoder('utf-8', { ignoreBOM: true });
const commandExistsSync = require('command-exists').sync;
+const characterCardParser = require('./src/character-card-parser.js');
const config = require(path.join(process.cwd(), './config.conf'));
+
const server_port = process.env.SILLY_TAVERN_PORT || config.port;
const whitelistPath = path.join(process.cwd(), "./whitelist.txt");
@@ -145,7 +147,6 @@ const tokenizersCache = {};
function getTiktokenTokenizer(model) {
if (tokenizersCache[model]) {
- console.log('Using the cached tokenizer instance for', model);
return tokenizersCache[model];
}
@@ -913,61 +914,7 @@ async function tryReadImage(img_url, crop) {
}
async function charaRead(img_url, input_format) {
- let format;
- if (input_format === undefined) {
- if (img_url.indexOf('.webp') !== -1) {
- format = 'webp';
- } else {
- format = 'png';
- }
- } else {
- format = input_format;
- }
-
- switch (format) {
- case 'webp':
- try {
- const exif_data = await ExifReader.load(fs.readFileSync(img_url));
- let char_data;
-
- if (exif_data['UserComment']['description']) {
- let description = exif_data['UserComment']['description'];
- if (description === 'Undefined' && exif_data['UserComment'].value && exif_data['UserComment'].value.length === 1) {
- description = exif_data['UserComment'].value[0];
- }
- try {
- json5.parse(description);
- char_data = description;
- } catch {
- const byteArr = description.split(",").map(Number);
- const uint8Array = new Uint8Array(byteArr);
- const char_data_string = utf8Decode.decode(uint8Array);
- char_data = char_data_string;
- }
- } else {
- console.log('No description found in EXIF data.');
- return false;
- }
- return char_data;
- }
- catch (err) {
- console.log(err);
- return false;
- }
- case 'png':
- const buffer = fs.readFileSync(img_url);
- const chunks = extract(buffer);
-
- const textChunks = chunks.filter(function (chunk) {
- return chunk.name === 'tEXt';
- }).map(function (chunk) {
- return PNGtext.decode(chunk.data);
- });
- var base64DecodedData = Buffer.from(textChunks[0].text, 'base64').toString('utf8');
- return base64DecodedData;//textChunks[0].text;
- default:
- break;
- }
+ return characterCardParser.parse(img_url, input_format);
}
app.post("/getcharacters", jsonParser, function (request, response) {
@@ -1754,6 +1701,17 @@ app.post("/exportcharacter", jsonParser, async function (request, response) {
return response.sendStatus(400);
});
+app.post("/importgroupchat", urlencodedParser, function (request, response) {
+ try {
+ const filedata = request.file;
+ const chatname = humanizedISO8601DateTime();
+ fs.copyFileSync(`./uploads/${filedata.filename}`, (`${directories.groupChats}/${chatname}.jsonl`));
+ return response.send({ res: chatname });
+ } catch (error) {
+ console.error(error);
+ return response.send({ error: true });
+ }
+});
app.post("/importchat", urlencodedParser, function (request, response) {
if (!request.body) return response.sendStatus(400);
@@ -1763,9 +1721,8 @@ app.post("/importchat", urlencodedParser, function (request, response) {
let avatar_url = (request.body.avatar_url).replace('.png', '');
let ch_name = request.body.character_name;
if (filedata) {
-
if (format === 'json') {
- fs.readFile('./uploads/' + filedata.filename, 'utf8', (err, data) => {
+ fs.readFile(`./uploads/${filedata.filename}`, 'utf8', (err, data) => {
if (err) {
console.log(err);
@@ -1782,7 +1739,6 @@ app.post("/importchat", urlencodedParser, function (request, response) {
user_name: 'You',
character_name: ch_name,
create_date: humanizedISO8601DateTime(),
-
},
...history.msgs.map(
(message) => ({
@@ -1803,7 +1759,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
const errors = [];
newChats.forEach(chat => fs.writeFile(
- chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + ' imported.jsonl',
+ `${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()} imported.jsonl`,
chat.map(JSON.stringify).join('\n'),
'utf8',
(err) => err ?? errors.push(err)
@@ -1832,8 +1788,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
let jsonData = json5.parse(line);
if (jsonData.user_name !== undefined || jsonData.name !== undefined) {
- //console.log(humanizedISO8601DateTime()+':/importchat copying chat as '+ch_name+' - '+humanizedISO8601DateTime()+'.jsonl');
- fs.copyFile('./uploads/' + filedata.filename, chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + '.jsonl', (err) => { //added character name and replaced Date.now() with humanizedISO8601DateTime
+ fs.copyFile(`./uploads/${filedata.filename}`, (`${chatsPath + avatar_url}/${ch_name} - ${humanizedISO8601DateTime()}.jsonl`), (err) => {
if (err) {
response.send({ error: true });
return console.log(err);
@@ -1849,9 +1804,7 @@ app.post("/importchat", urlencodedParser, function (request, response) {
rl.close();
});
}
-
}
-
});
app.post('/importworldinfo', urlencodedParser, (request, response) => {
@@ -1919,7 +1872,7 @@ app.post('/uploaduseravatar', urlencodedParser, async (request, response) => {
const crop = tryParse(request.query.crop);
let rawImg = await jimp.read(pathToUpload);
- if (typeof crop == 'object') {
+ 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);
}
@@ -2746,8 +2699,12 @@ const setupTasks = async function () {
}
if (listen && !config.whitelistMode && !config.basicAuthMode) {
- console.error('Your SillyTavern is currently unsecurely open to the public. Enable whitelisting or basic authentication.');
- process.exit(1);
+ if (config.securityOverride)
+ console.warn("Security has been override. If it's not a trusted network, change the settings.");
+ else {
+ console.error('Your SillyTavern is currently unsecurely open to the public. Enable whitelisting or basic authentication.');
+ process.exit(1);
+ }
}
if (true === cliArguments.ssl)
diff --git a/src/character-card-parser.js b/src/character-card-parser.js
new file mode 100644
index 000000000..e97a66bf0
--- /dev/null
+++ b/src/character-card-parser.js
@@ -0,0 +1,72 @@
+const fs = require('fs');
+const json5 = require('json5');
+const ExifReader = require('exifreader');
+
+const extract = require('png-chunks-extract');
+const PNGtext = require('png-chunk-text');
+
+const utf8Decode = new TextDecoder('utf-8', { ignoreBOM: true });
+
+const parse = async (cardUrl, format) => {
+ let fileFormat;
+ if (format === undefined) {
+ if (cardUrl.indexOf('.webp') !== -1)
+ fileFormat = 'webp';
+ else
+ fileFormat = 'png';
+ }
+ else
+ fileFormat = format;
+
+ switch (fileFormat) {
+ case 'webp':
+ try {
+ const exif_data = await ExifReader.load(fs.readFileSync(cardUrl));
+ let char_data;
+
+ if (exif_data['UserComment']['description']) {
+ let description = exif_data['UserComment']['description'];
+ if (description === 'Undefined' && exif_data['UserComment'].value && exif_data['UserComment'].value.length === 1) {
+ description = exif_data['UserComment'].value[0];
+ }
+
+ try {
+ json5.parse(description);
+ char_data = description;
+ } catch {
+ const byteArr = description.split(",").map(Number);
+ const uint8Array = new Uint8Array(byteArr);
+ const char_data_string = utf8Decode.decode(uint8Array);
+ char_data = char_data_string;
+ }
+ }
+ else {
+ console.log('No description found in EXIF data.');
+ return false;
+ }
+
+ return char_data;
+ }
+ catch (err) {
+ console.log(err);
+ return false;
+ }
+ case 'png':
+ const buffer = fs.readFileSync(cardUrl);
+ const chunks = extract(buffer);
+
+ const textChunks = chunks.filter(function (chunk) {
+ return chunk.name === 'tEXt';
+ }).map(function (chunk) {
+ return PNGtext.decode(chunk.data);
+ });
+
+ return Buffer.from(textChunks[0].text, 'base64').toString('utf8');
+ default:
+ break;
+ }
+};
+
+module.exports = {
+ parse: parse
+};