Chat import
-
Import chats into TavernAI
+
Import chats into SillyTavern
To import Character.AI chats, use this tool: https://github.com/0x000011b/characterai-dumper .
diff --git a/public/notes/11.html b/public/notes/11.html
index 9afb1abd0..9d8521cb9 100644
--- a/public/notes/11.html
+++ b/public/notes/11.html
@@ -1,6 +1,6 @@
- It functions like a dynamic dictionary that only inserts relevant information from World Info entries when keywords associated with the entries are present in the message text.
- The TavernAI engine activates and seamlessly integrates the appropriate lore into the prompt, providing background information to the AI.
+ SillyTavern activates and seamlessly integrates the appropriate lore into the prompt, providing background information to the AI.
Scan Depth
Defines how many messages in the chat history should be scanned for World Info keys.
-
If set to 1, then TavernAI only scans the message you send and the most recent reply.
+
If set to 1, then SillyTavern only scans the message you send and the most recent reply.
This stacks up to 10 message pairs it total.
diff --git a/public/notes/2.html b/public/notes/2.html
index 726fa852c..96e9c14b0 100644
--- a/public/notes/2.html
+++ b/public/notes/2.html
@@ -1,6 +1,6 @@
-
KoboldAI Settings
Standard KoboldAI settings files are used here. To add your own settings, simply add the file .settings
- in TavernAI\public\KoboldAI Settings
+ in SillyTavern\public\KoboldAI Settings
Temperature
Value from 0.1 to 2.0. Lower value - the answers are more logical, but less creative. Higher value - the
@@ -34,7 +34,7 @@
The larger the parameter value, the longer the generation time takes.
Context size
How much will the AI remember. Context size also affects the speed of generation.Important : The setting of Context Size in TavernAI GUI overrides the setting for KoboldAI GUI
+ Important : The setting of Context Size in SillyTavern GUI overrides the setting for KoboldAI GUI
Advanced Settings
diff --git a/public/notes/6.html b/public/notes/6.html
index 99f6443f3..2985e29b4 100644
--- a/public/notes/6.html
+++ b/public/notes/6.html
@@ -1,6 +1,6 @@
-
TavernAI - Note - Novel AI API Key
+
NovelAI API Key
diff --git a/public/notes/7.html b/public/notes/7.html
index e5bab4e95..9f3bd288f 100644
--- a/public/notes/7.html
+++ b/public/notes/7.html
@@ -1,6 +1,6 @@
-
TavernAI - Note - NovelAI Settings
+
NovelAI Settings
@@ -13,7 +13,7 @@
NovelAI settings
- The files with the settings are here (TavernAI\public\NovelAI Settings).
Temperature
diff --git a/public/notes/8.html b/public/notes/8.html
index a97213a02..bc2af9c82 100644
--- a/public/notes/8.html
+++ b/public/notes/8.html
@@ -1,6 +1,6 @@
-
TavernAI - Note - NovelAI Models
+
NovelAI Models
diff --git a/public/notes/9.html b/public/notes/9.html
index d1e855643..d3cfd9abc 100644
--- a/public/notes/9.html
+++ b/public/notes/9.html
@@ -1,6 +1,6 @@
-
TavernAI - Note - Anchors
+
Anchors
diff --git a/public/notes/message_sound.html b/public/notes/message_sound.html
index a9d051585..e375db331 100644
--- a/public/notes/message_sound.html
+++ b/public/notes/message_sound.html
@@ -16,7 +16,7 @@
Message Sound
-
To play your own custom sound on receiving a new message from bot, replace the following MP3 file in your TavernAI folder:
+
To play your own custom sound on receiving a new message from bot, replace the following MP3 file in your SillyTavern folder:
public/sounds/message.mp3
@@ -24,7 +24,7 @@
Plays at 80% volume.
- If "Background Sound Only" option is enabled, the sound plays only if TavernAI window is unfocused .
+ If "Background Sound Only" option is enabled, the sound plays only if SillyTavern window is unfocused .
diff --git a/public/notes/multigen.html b/public/notes/multigen.html
index b95502813..b5306b8af 100644
--- a/public/notes/multigen.html
+++ b/public/notes/multigen.html
@@ -16,7 +16,7 @@
Multigen
-
TavernAI tries to create faster and longer responses by chaining the generation using smaller batches.
+
SillyTavern tries to create faster and longer responses by chaining the generation using smaller batches.
Default settings:
First batch = 50 tokens
Next batches = 30 tokens
diff --git a/public/script.js b/public/script.js
index 789a3deb3..73ad32b3d 100644
--- a/public/script.js
+++ b/public/script.js
@@ -158,15 +158,15 @@ export {
}
// API OBJECT FOR EXTERNAL WIRING
-window["TavernAI"] = {};
+window["SillyTavern"] = {};
let converter = new showdown.Converter({ emoji: "true" });
const gpt3 = new GPT3BrowserTokenizer({ type: 'gpt3' });
/* let bg_menu_toggle = false; */
-const systemUserName = "TavernAI";
+const systemUserName = "SillyTavern";
let default_user_name = "You";
let name1 = default_user_name;
-let name2 = "TavernAI";
+let name2 = "SillyTavern";
let chat = [];
let safetychat = [
{
@@ -248,7 +248,7 @@ const system_messages = {
is_user: false,
is_name: true,
mes: [
- 'Welcome to TavernAI! In order to begin chatting:',
+ 'Welcome to SillyTavern! In order to begin chatting:',
'
',
'Connect to one of the supported generation APIs ',
'Create or pick a character from the list ',
@@ -1231,6 +1231,7 @@ class StreamingProcessor {
let formattedText = messageFormating(processedText, chat[messageId].name, chat[messageId].is_system, chat[messageId].force_avatar);
const mesText = $(`#chat .mes[mesid="${messageId}"] .mes_text`);
mesText.html(formattedText);
+ this.setFirstSwipe(messageId);
}
scrollChatToBottom();
@@ -1257,6 +1258,14 @@ class StreamingProcessor {
showSwipeButtons();
}
+ setFirstSwipe(messageId) {
+ if (this.type !== 'swipe' && this.type !== 'impersonate') {
+ if (Array.isArray(chat[messageId]['swipes']) && chat[messageId]['swipes'].length === 1 && chat[messageId]['swipe_id'] === 0) {
+ chat[messageId]['swipes'][0] = chat[messageId]['mes'];
+ }
+ }
+ }
+
onStopStreaming() {
this.onErrorStreaming();
}
@@ -1274,11 +1283,12 @@ class StreamingProcessor {
this.isFinished = false;
this.generator = this.nullStreamingGeneration;
this.abortController = new AbortController();
+ this.firstMessageText = '...';
}
async generate() {
if (this.messageId == -1) {
- this.messageId = this.onStartStreaming('...');
+ this.messageId = this.onStartStreaming(this.firstMessageText);
await delay(1); // delay for message to be rendered
}
@@ -1327,6 +1337,7 @@ async function Generate(type, automatic_trigger, force_name2) {
if (isStreamingEnabled()) {
streamingProcessor = new StreamingProcessor(type, force_name2);
+ hideSwipeButtons();
}
else {
streamingProcessor = false;
@@ -1566,8 +1577,6 @@ async function Generate(type, automatic_trigger, force_name2) {
hordeAmountGen = adjustedParams.maxLength;
}
- let { worldInfoString, worldInfoBefore, worldInfoAfter } = getWorldInfoPrompt(chat2);
-
// Extension added strings
const allAnchors = getAllExtensionPrompts();
const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.AFTER_SCENARIO);
@@ -1575,12 +1584,13 @@ async function Generate(type, automatic_trigger, force_name2) {
/////////////////////// swipecode
if (type == 'swipe') {
-
console.log('pre swipe shift: ' + chat2.length);
console.log('shifting swipe chat2');
chat2.shift();
-
}
+
+ let { worldInfoString, worldInfoBefore, worldInfoAfter } = getWorldInfoPrompt(chat2);
+
console.log('post swipe shift:' + chat2.length);
var i = 0;
@@ -3444,7 +3454,7 @@ function isHordeGenerationNotAllowed() {
return false;
}
-window["TavernAI"].getContext = function () {
+window["SillyTavern"].getContext = function () {
return {
chat: chat,
characters: characters,
diff --git a/public/scripts/extensions.js b/public/scripts/extensions.js
index 181ec9b1c..c097a33c7 100644
--- a/public/scripts/extensions.js
+++ b/public/scripts/extensions.js
@@ -29,7 +29,7 @@ const extension_settings = {
let modules = [];
let activeExtensions = new Set();
-const getContext = () => window['TavernAI'].getContext();
+const getContext = () => window['SillyTavern'].getContext();
const getApiUrl = () => extension_settings.apiUrl;
const defaultRequestArgs = { method: 'GET', headers: { 'Bypass-Tunnel-Reminder': 'bypass' } };
let connectedToApi = false;
diff --git a/server.js b/server.js
index 421729412..1c18a9ad3 100644
--- a/server.js
+++ b/server.js
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
const yargs = require('yargs/yargs');
const { hideBin } = require('yargs/helpers');
@@ -16,6 +18,10 @@ const cliArguments = yargs(hideBin(process.argv))
describe: 'Path to your private key file.'
}).argv;
+// change all relative paths
+const process = require('process')
+process.chdir(__dirname)
+
const express = require('express');
const compression = require('compression');
const app = express();
@@ -48,10 +54,10 @@ const ExifReader = require('exifreader');
const exif = require('piexifjs');
const webp = require('webp-converter');
-const config = require(path.join(process.cwd(), './config.conf'));
+const config = require(path.join(__dirname, './config.conf'));
const server_port = process.env.SILLY_TAVERN_PORT || config.port;
-const whitelistPath = path.join(process.cwd(), "./whitelist.txt");
+const whitelistPath = path.join(__dirname, "./whitelist.txt");
let whitelist = config.whitelist;
if (fs.existsSync(whitelistPath)) {
@@ -202,8 +208,8 @@ app.use(function (req, res, next) { //Security
//clientIp = req.connection.remoteAddress.split(':').pop();
if (whitelistMode === true && !whitelist.includes(clientIp)) {
- console.log('Forbidden: Connection attempt from ' + clientIp + '. If you are attempting to connect, please add your IP address in whitelist or disable whitelist mode in config.conf in root of TavernAI folder.\n');
- return res.status(403).send('Forbidden : Connection attempt from ' + clientIp + ' . If you are attempting to connect, please add your IP address in whitelist or disable whitelist mode in config.conf in root of TavernAI folder.');
+ console.log('Forbidden: Connection attempt from ' + clientIp + '. If you are attempting to connect, please add your IP address in whitelist or disable whitelist mode in config.conf in root of SillyTavern folder.\n');
+ return res.status(403).send('Forbidden : Connection attempt from ' + clientIp + ' . If you are attempting to connect, please add your IP address in whitelist or disable whitelist mode in config.conf in root of SillyTavern folder.');
}
next();
});
@@ -230,7 +236,7 @@ app.use((req, res, next) => {
app.use(express.static(__dirname + "/public", { refresh: true }));
app.use('/backgrounds', (req, res) => {
- const filePath = decodeURIComponent(path.join(process.cwd(), 'public/backgrounds', req.url.replace(/%20/g, ' ')));
+ const filePath = decodeURIComponent(path.join(__dirname, 'public/backgrounds', req.url.replace(/%20/g, ' ')));
fs.readFile(filePath, (err, data) => {
if (err) {
res.status(404).send('File not found');
@@ -242,7 +248,7 @@ app.use('/backgrounds', (req, res) => {
});
app.use('/characters', (req, res) => {
- const filePath = decodeURIComponent(path.join(process.cwd(), charactersPath, req.url.replace(/%20/g, ' ')));
+ const filePath = decodeURIComponent(path.join(__dirname, charactersPath, req.url.replace(/%20/g, ' ')));
fs.readFile(filePath, (err, data) => {
if (err) {
res.status(404).send('File not found');
@@ -387,7 +393,7 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
if (!!request.header('X-Response-Streaming')) {
const fn_index = Number(request.header('X-Gradio-Streaming-Function'));
let isStreamingStopped = false;
- request.socket.on('close', function() {
+ request.socket.on('close', function () {
isStreamingStopped = true;
});
@@ -1617,18 +1623,18 @@ app.post("/importchat", urlencodedParser, function (request, response) {
const errors = [];
newChats.forEach(chat => fs.writeFile(
- chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + ' imported.jsonl',
- chat.map(JSON.stringify).join('\n'),
- 'utf8',
- (err) => err ?? errors.push(err)
- )
+ chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + ' imported.jsonl',
+ chat.map(JSON.stringify).join('\n'),
+ 'utf8',
+ (err) => err ?? errors.push(err)
+ )
);
if (0 < errors.length) {
response.send('Errors occurred while writing character files. Errors: ' + JSON.stringify(errors));
}
- response.send({res: true});
+ response.send({ res: true });
} else {
response.send({ error: true });
}
@@ -1859,7 +1865,7 @@ app.post('/deletegroup', jsonParser, async (request, response) => {
const POE_DEFAULT_BOT = 'a2';
-async function getPoeClient(token, useCache=false) {
+async function getPoeClient(token, useCache = false) {
let client = new poe.Client(false, useCache);
await client.init(token);
return client;
@@ -1925,7 +1931,7 @@ app.post('/generate_poe', jsonParser, async (request, response) => {
if (streaming) {
let isStreamingStopped = false;
- request.socket.on('close', function() {
+ request.socket.on('close', function () {
isStreamingStopped = true;
client.abortController.abort();
});
@@ -1991,17 +1997,17 @@ app.get('/get_sprites', jsonParser, function (request, response) {
try {
if (fs.existsSync(spritesPath) && fs.statSync(spritesPath).isDirectory()) {
sprites = fs.readdirSync(spritesPath)
- .filter(file => {
- const mimeType = mime.lookup(file);
- return mimeType && mimeType.startsWith('image/');
- })
- .map((file) => {
- const pathToSprite = path.join(spritesPath, file);
- return {
- label: path.parse(pathToSprite).name.toLowerCase(),
- path: `/characters/${name}/${file}`,
- };
- });
+ .filter(file => {
+ const mimeType = mime.lookup(file);
+ return mimeType && mimeType.startsWith('image/');
+ })
+ .map((file) => {
+ const pathToSprite = path.join(spritesPath, file);
+ return {
+ label: path.parse(pathToSprite).name.toLowerCase(),
+ path: `/characters/${name}/${file}`,
+ };
+ });
}
}
catch (err) {
@@ -2171,12 +2177,42 @@ app.post("/getstatus_openai", jsonParser, function (request, response_getstatus_
});
});
+// Shamelessly stolen from Agnai
+app.post("/openai_usage", jsonParser, async function (_, response) {
+ if (!request.body) return response.sendStatus(400);
+ const key = request.body.key;
+ const api_url = new URL(request.body.reverse_proxy || api_openai).toString();
+
+ const headers = {
+ 'Content-Type': 'application/json',
+ Authorization: `Bearer ${key}`,
+ };
+
+ const date = new Date();
+ date.setDate(1);
+ const start_date = date.toISOString().slice(0, 10);
+
+ date.setMonth(date.getMonth() + 1);
+ const end_date = date.toISOString().slice(0, 10);
+
+ try {
+ const res = await getAsync(
+ `${api_url}/dashboard/billing/usage?start_date=${start_date}&end_date=${end_date}`,
+ { headers },
+ );
+ return response.send(res);
+ }
+ catch {
+ return response.sendStatus(400);
+ }
+});
+
app.post("/generate_openai", jsonParser, function (request, response_generate_openai) {
if (!request.body) return response_generate_openai.sendStatus(400);
const api_url = new URL(request.body.reverse_proxy || api_openai).toString();
const controller = new AbortController();
- request.socket.on('close', function() {
+ request.socket.on('close', function () {
controller.abort();
});
@@ -2352,8 +2388,10 @@ const setupTasks = async function () {
if (!is_colab) await convertWebp();
console.log('Launching...');
+
if (autorun) open(tavernUrl);
- console.log('TavernAI started: ' + tavernUrl);
+ console.log('SillyTavern started: ' + tavernUrl);
+
if (fs.existsSync('public/characters/update.txt') && !is_colab) {
convertStage1();
}