mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'staging' into integrity
This commit is contained in:
@@ -43,6 +43,7 @@ export const USER_DIRECTORY_TEMPLATE = Object.freeze({
|
||||
vectors: 'vectors',
|
||||
backups: 'backups',
|
||||
sysprompt: 'sysprompt',
|
||||
reasoning: 'reasoning',
|
||||
});
|
||||
|
||||
/**
|
||||
|
@@ -48,6 +48,7 @@ export const CONTENT_TYPES = {
|
||||
MOVING_UI: 'moving_ui',
|
||||
QUICK_REPLIES: 'quick_replies',
|
||||
SYSPROMPT: 'sysprompt',
|
||||
REASONING: 'reasoning',
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -61,7 +62,7 @@ export function getDefaultPresets(directories) {
|
||||
const presets = [];
|
||||
|
||||
for (const contentItem of contentIndex) {
|
||||
if (contentItem.type.endsWith('_preset') || contentItem.type === 'instruct' || contentItem.type === 'context' || contentItem.type === 'sysprompt') {
|
||||
if (contentItem.type.endsWith('_preset') || ['instruct', 'context', 'sysprompt', 'reasoning'].includes(contentItem.type)) {
|
||||
contentItem.name = path.parse(contentItem.filename).name;
|
||||
contentItem.folder = getTargetByType(contentItem.type, directories);
|
||||
presets.push(contentItem);
|
||||
@@ -299,6 +300,8 @@ function getTargetByType(type, directories) {
|
||||
return directories.quickreplies;
|
||||
case CONTENT_TYPES.SYSPROMPT:
|
||||
return directories.sysprompt;
|
||||
case CONTENT_TYPES.REASONING:
|
||||
return directories.reasoning;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
@@ -30,6 +30,8 @@ function getPresetSettingsByAPI(apiId, directories) {
|
||||
return { folder: directories.context, extension: '.json' };
|
||||
case 'sysprompt':
|
||||
return { folder: directories.sysprompt, extension: '.json' };
|
||||
case 'reasoning':
|
||||
return { folder: directories.reasoning, extension: '.json' };
|
||||
default:
|
||||
return { folder: null, extension: null };
|
||||
}
|
||||
|
@@ -254,6 +254,7 @@ router.post('/get', (request, response) => {
|
||||
const instruct = readAndParseFromDirectory(request.user.directories.instruct);
|
||||
const context = readAndParseFromDirectory(request.user.directories.context);
|
||||
const sysprompt = readAndParseFromDirectory(request.user.directories.sysprompt);
|
||||
const reasoning = readAndParseFromDirectory(request.user.directories.reasoning);
|
||||
|
||||
response.send({
|
||||
settings,
|
||||
@@ -272,6 +273,7 @@ router.post('/get', (request, response) => {
|
||||
instruct,
|
||||
context,
|
||||
sysprompt,
|
||||
reasoning,
|
||||
enable_extensions: ENABLE_EXTENSIONS,
|
||||
enable_extensions_auto_update: ENABLE_EXTENSIONS_AUTO_UPDATE,
|
||||
enable_accounts: ENABLE_ACCOUNTS,
|
||||
|
@@ -95,6 +95,7 @@ const STORAGE_KEYS = {
|
||||
* @property {string} vectors - The directory where the vectors are stored
|
||||
* @property {string} backups - The directory where the backups are stored
|
||||
* @property {string} sysprompt - The directory where the system prompt data is stored
|
||||
* @property {string} reasoning - The directory where the reasoning templates are stored
|
||||
*/
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user