diff --git a/public/scripts/reasoning.js b/public/scripts/reasoning.js
index 76f1f0852..83154437d 100644
--- a/public/scripts/reasoning.js
+++ b/public/scripts/reasoning.js
@@ -215,6 +215,10 @@ export class ReasoningHandler {
}
this.updateDom(messageId);
+
+ if (power_user.reasoning.auto_expand && this.state !== ReasoningState.Hidden) {
+ this.messageReasoningDetailsDom.open = true;
+ }
}
/**
diff --git a/public/scripts/secrets.js b/public/scripts/secrets.js
index f2e27f3e2..261c31480 100644
--- a/public/scripts/secrets.js
+++ b/public/scripts/secrets.js
@@ -41,6 +41,7 @@ export const SECRET_KEYS = {
GENERIC: 'api_key_generic',
DEEPSEEK: 'api_key_deepseek',
SERPER: 'api_key_serper',
+ FALAI: 'api_key_falai',
};
const INPUT_MAP = {
diff --git a/public/style.css b/public/style.css
index 5ae78dc1c..19cf020d5 100644
--- a/public/style.css
+++ b/public/style.css
@@ -362,9 +362,14 @@ input[type='checkbox']:focus-visible {
}
.mes_reasoning_details .mes_reasoning_summary {
+ list-style: none;
margin-right: calc(var(--mes-right-spacing) * -1);
}
+.mes_reasoning_details summary::-webkit-details-marker {
+ display: none;
+}
+
.mes_reasoning *:last-child {
margin-bottom: 0;
}
@@ -378,7 +383,7 @@ input[type='checkbox']:focus-visible {
}
.mes_reasoning_details .mes_reasoning em {
- color: color-mix(in srgb, var(--SmartThemeEmColor) 67%, var(--SmartThemeBlurTintColor) 33%)
+ color: color-mix(in srgb, var(--SmartThemeEmColor) 67%, var(--SmartThemeBlurTintColor) 33%);
}
.mes_reasoning_header_block {
@@ -403,7 +408,7 @@ input[type='checkbox']:focus-visible {
}
/* TWIMC: Remove with custom CSS to show the icon */
-.mes_reasoning_header > .icon-svg {
+.mes_reasoning_header>.icon-svg {
display: none;
}
diff --git a/server.js b/server.js
index e62562e56..18f5cba1a 100644
--- a/server.js
+++ b/server.js
@@ -30,6 +30,7 @@ import bodyParser from 'body-parser';
// net related library imports
import fetch from 'node-fetch';
+import ipRegex from 'ip-regex';
// Unrestrict console logs display limit
util.inspect.defaultOptions.maxArrayLength = null;
@@ -59,6 +60,7 @@ import basicAuthMiddleware from './src/middleware/basicAuth.js';
import whitelistMiddleware from './src/middleware/whitelist.js';
import multerMonkeyPatch from './src/middleware/multerMonkeyPatch.js';
import initRequestProxy from './src/request-proxy.js';
+import getCacheBusterMiddleware from './src/middleware/cacheBuster.js';
import {
getVersion,
getConfigValue,
@@ -130,6 +132,8 @@ if (process.versions && process.versions.node && process.versions.node.match(/20
const DEFAULT_PORT = 8000;
const DEFAULT_AUTORUN = false;
const DEFAULT_LISTEN = false;
+const DEFAULT_LISTEN_ADDRESS_IPV6 = '[::]';
+const DEFAULT_LISTEN_ADDRESS_IPV4 = '0.0.0.0';
const DEFAULT_CORS_PROXY = false;
const DEFAULT_WHITELIST = true;
const DEFAULT_ACCOUNTS = false;
@@ -185,6 +189,14 @@ const cliArguments = yargs(hideBin(process.argv))
type: 'boolean',
default: null,
describe: `SillyTavern is listening on all network interfaces (Wi-Fi, LAN, localhost). If false, will limit it only to internal localhost (127.0.0.1).\nIf not provided falls back to yaml config 'listen'.\n[config default: ${DEFAULT_LISTEN}]`,
+ }).option('listenAddressIPv6', {
+ type: 'string',
+ default: null,
+ describe: 'Set SillyTavern to listen to a specific IPv6 address. If not set, it will fallback to listen to all.\n[config default: [::] ]',
+ }).option('listenAddressIPv4', {
+ type: 'string',
+ default: null,
+ describe: 'Set SillyTavern to listen to a specific IPv4 address. If not set, it will fallback to listen to all.\n[config default: 0.0.0.0 ]',
}).option('corsProxy', {
type: 'boolean',
default: null,
@@ -254,6 +266,10 @@ const server_port = cliArguments.port ?? process.env.SILLY_TAVERN_PORT ?? getCon
const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN)) && !cliArguments.ssl;
/** @type {boolean} */
const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);
+/** @type {string} */
+const listenAddressIPv6 = cliArguments.listenAddressIPv6 ?? getConfigValue('listenAddress.ipv6', DEFAULT_LISTEN_ADDRESS_IPV6);
+/** @type {string} */
+const listenAddressIPv4 = cliArguments.listenAddressIPv4 ?? getConfigValue('listenAddress.ipv4', DEFAULT_LISTEN_ADDRESS_IPV4);
/** @type {boolean} */
const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY);
const enableWhitelist = cliArguments.whitelist ?? getConfigValue('whitelistMode', DEFAULT_WHITELIST);
@@ -500,7 +516,7 @@ if (!disableCsrf) {
// Static files
// Host index page
-app.get('/', (request, response) => {
+app.get('/', getCacheBusterMiddleware(), (request, response) => {
if (shouldRedirectToLogin(request)) {
const query = request.url.split('?')[1];
const redirectUrl = query ? `/login?${query}` : '/login';
@@ -708,13 +724,13 @@ app.use('/api/azure', azureRouter);
const tavernUrlV6 = new URL(
(cliArguments.ssl ? 'https://' : 'http://') +
- (listen ? '[::]' : '[::1]') +
+ (listen ? (ipRegex.v6({ exact: true }).test(listenAddressIPv6) ? listenAddressIPv6 : '[::]') : '[::1]') +
(':' + server_port),
);
const tavernUrl = new URL(
(cliArguments.ssl ? 'https://' : 'http://') +
- (listen ? '0.0.0.0' : '127.0.0.1') +
+ (listen ? (ipRegex.v4({ exact: true }).test(listenAddressIPv4) ? listenAddressIPv4 : '0.0.0.0') : '127.0.0.1') +
(':' + server_port),
);
@@ -837,15 +853,15 @@ const postSetupTasks = async function (v6Failed, v4Failed, useIPv6, useIPv4) {
const plainGoToLog = removeColorFormatting(goToLog);
console.log(logListen);
+ if (listen) {
+ console.log();
+ console.log('To limit connections to internal localhost only ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false".');
+ console.log('Check the "access.log" file in the SillyTavern directory to inspect incoming connections.');
+ }
console.log('\n' + getSeparator(plainGoToLog.length) + '\n');
console.log(goToLog);
console.log('\n' + getSeparator(plainGoToLog.length) + '\n');
- if (listen) {
- console.log(
- '[::] or 0.0.0.0 means SillyTavern is listening on all network interfaces (Wi-Fi, LAN, localhost). If you want to limit it only to internal localhost ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false". Check "access.log" file in the SillyTavern directory if you want to inspect incoming connections.\n',
- );
- }
if (basicAuthMode) {
if (perUserBasicAuth && !enableAccounts) {
@@ -1083,7 +1099,7 @@ async function verifySecuritySettings() {
}
if (!enableAccounts) {
- logSecurityAlert('Your SillyTavern is currently insecurely open to the public. Enable whitelisting, basic authentication or user accounts.');
+ logSecurityAlert('Your current SillyTavern configuration is insecure (listening to non-localhost). Enable whitelisting, basic authentication or user accounts.');
}
const users = await getAllEnabledUsers();
diff --git a/src/constants.js b/src/constants.js
index 30f6f2da0..66697fed4 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -304,6 +304,7 @@ export const TOGETHERAI_KEYS = [
export const OLLAMA_KEYS = [
'num_predict',
'num_ctx',
+ 'num_batch',
'stop',
'temperature',
'repeat_penalty',
diff --git a/src/endpoints/backends/text-completions.js b/src/endpoints/backends/text-completions.js
index e58474ed4..c5da6280d 100644
--- a/src/endpoints/backends/text-completions.js
+++ b/src/endpoints/backends/text-completions.js
@@ -373,6 +373,10 @@ router.post('/generate', jsonParser, async function (request, response) {
if (request.body.api_type === TEXTGEN_TYPES.OLLAMA) {
const keepAlive = getConfigValue('ollama.keepAlive', -1);
+ const numBatch = getConfigValue('ollama.batchSize', -1);
+ if (numBatch > 0) {
+ request.body['num_batch'] = numBatch;
+ }
args.body = JSON.stringify({
model: request.body.model,
prompt: request.body.prompt,
diff --git a/src/endpoints/characters.js b/src/endpoints/characters.js
index 8c39575ed..294a195dc 100644
--- a/src/endpoints/characters.js
+++ b/src/endpoints/characters.js
@@ -839,6 +839,9 @@ router.post('/edit', urlencodedParser, validateAvatarUrlMiddleware, async functi
invalidateThumbnail(request.user.directories, 'avatar', request.body.avatar_url);
await writeCharacterData(newAvatarPath, char, targetFile, request, crop);
fs.unlinkSync(newAvatarPath);
+
+ // Bust cache to reload the new avatar
+ response.setHeader('Clear-Site-Data', '"cache"');
}
return response.sendStatus(200);
diff --git a/src/endpoints/secrets.js b/src/endpoints/secrets.js
index 5683da4d8..a7f0094ba 100644
--- a/src/endpoints/secrets.js
+++ b/src/endpoints/secrets.js
@@ -50,6 +50,7 @@ export const SECRET_KEYS = {
TAVILY: 'api_key_tavily',
NANOGPT: 'api_key_nanogpt',
BFL: 'api_key_bfl',
+ FALAI: 'api_key_falai',
GENERIC: 'api_key_generic',
DEEPSEEK: 'api_key_deepseek',
SERPER: 'api_key_serper',
diff --git a/src/endpoints/stable-diffusion.js b/src/endpoints/stable-diffusion.js
index 2d611dc6b..dd6dc9adf 100644
--- a/src/endpoints/stable-diffusion.js
+++ b/src/endpoints/stable-diffusion.js
@@ -1228,6 +1228,131 @@ bfl.post('/generate', jsonParser, async (request, response) => {
}
});
+const falai = express.Router();
+
+falai.post('/models', jsonParser, async (_request, response) => {
+ try {
+ const modelsUrl = new URL('https://fal.ai/api/models?categories=text-to-image');
+ const result = await fetch(modelsUrl);
+
+ if (!result.ok) {
+ console.warn('FAL.AI returned an error.', result.status, result.statusText);
+ throw new Error('FAL.AI request failed.');
+ }
+
+ const data = await result.json();
+
+ if (!Array.isArray(data)) {
+ console.warn('FAL.AI returned invalid data.');
+ throw new Error('FAL.AI request failed.');
+ }
+
+ const models = data
+ .filter(x => !x.title.toLowerCase().includes('inpainting') &&
+ !x.title.toLowerCase().includes('control') &&
+ !x.title.toLowerCase().includes('upscale'))
+ .sort((a, b) => a.title.localeCompare(b.title))
+ .map(x => ({ value: x.modelUrl.split('fal-ai/')[1], text: x.title }));
+ return response.send(models);
+ } catch (error) {
+ console.error(error);
+ return response.sendStatus(500);
+ }
+});
+
+falai.post('/generate', jsonParser, async (request, response) => {
+ try {
+ const key = readSecret(request.user.directories, SECRET_KEYS.FALAI);
+
+ if (!key) {
+ console.warn('FAL.AI key not found.');
+ return response.sendStatus(400);
+ }
+
+ const requestBody = {
+ prompt: request.body.prompt,
+ image_size: { 'width': request.body.width, 'height': request.body.height },
+ num_inference_steps: request.body.steps,
+ seed: request.body.seed ?? null,
+ guidance_scale: request.body.guidance,
+ enable_safety_checker: false,
+ };
+
+ console.debug('FAL.AI request:', requestBody);
+
+ const result = await fetch(`https://queue.fal.run/fal-ai/${request.body.model}`, {
+ method: 'POST',
+ body: JSON.stringify(requestBody),
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': `Key ${key}`,
+ },
+ });
+
+ if (!result.ok) {
+ console.warn('FAL.AI returned an error.');
+ return response.sendStatus(500);
+ }
+
+ /** @type {any} */
+ const taskData = await result.json();
+ const { status_url } = taskData;
+
+ const MAX_ATTEMPTS = 100;
+ for (let i = 0; i < MAX_ATTEMPTS; i++) {
+ await delay(2500);
+
+ const statusResult = await fetch(status_url, {
+ headers: {
+ 'Authorization': `Key ${key}`,
+ },
+ });
+
+ if (!statusResult.ok) {
+ const text = await statusResult.text();
+ console.warn('FAL.AI returned an error.', text);
+ return response.sendStatus(500);
+ }
+
+ /** @type {any} */
+ const statusData = await statusResult.json();
+
+ if (statusData?.status === 'IN_QUEUE' || statusData?.status === 'IN_PROGRESS') {
+ continue;
+ }
+
+ if (statusData?.status === 'COMPLETED') {
+ const resultFetch = await fetch(statusData?.response_url, {
+ method: 'GET',
+ headers: {
+ 'Authorization': `Key ${key}`,
+ },
+ });
+ const resultData = await resultFetch.json();
+
+ if (resultData.detail !== null && resultData.detail !== undefined) {
+ throw new Error('FAL.AI failed to generate image.', { cause: `${resultData.detail[0].loc[1]}: ${resultData.detail[0].msg}` });
+ }
+
+ const imageFetch = await fetch(resultData?.images[0].url, {
+ headers: {
+ 'Authorization': `Key ${key}`,
+ },
+ });
+
+ const fetchData = await imageFetch.arrayBuffer();
+ const image = Buffer.from(fetchData).toString('base64');
+ return response.send({ image: image });
+ }
+
+ throw new Error('FAL.AI failed to generate image.', { cause: statusData });
+ }
+ } catch (error) {
+ console.error(error);
+ return response.status(500).send(error.cause || error.message);
+ }
+});
+
router.use('/comfy', comfy);
router.use('/together', together);
router.use('/drawthings', drawthings);
@@ -1237,3 +1362,4 @@ router.use('/blockentropy', blockentropy);
router.use('/huggingface', huggingface);
router.use('/nanogpt', nanogpt);
router.use('/bfl', bfl);
+router.use('/falai', falai);
diff --git a/src/middleware/cacheBuster.js b/src/middleware/cacheBuster.js
new file mode 100644
index 000000000..5c38d2da1
--- /dev/null
+++ b/src/middleware/cacheBuster.js
@@ -0,0 +1,28 @@
+import crypto from 'node:crypto';
+import { DEFAULT_USER } from '../constants.js';
+
+/**
+ * Middleware to bust the browser cache for the current user.
+ * @returns {import('express').RequestHandler}
+ */
+export default function getCacheBusterMiddleware() {
+ /**
+ * @type {Set} Handles/User-Agents that have already been busted.
+ */
+ const keys = new Set();
+
+ return (request, response, next) => {
+ const handle = request.user?.profile?.handle || DEFAULT_USER.handle;
+ const userAgent = request.headers['user-agent'] || '';
+ const hash = crypto.createHash('sha256').update(userAgent).digest('hex');
+ const key = `${handle}-${hash}`;
+
+ if (keys.has(key)) {
+ return next();
+ }
+
+ keys.add(key);
+ response.setHeader('Clear-Site-Data', '"cache"');
+ next();
+ };
+}