diff --git a/public/script.js b/public/script.js
index c9e76f522..a20c74c51 100644
--- a/public/script.js
+++ b/public/script.js
@@ -261,7 +261,7 @@ let fav_ch_checked = false;
//initialize global var for future cropped blobs
let currentCroppedAvatar = '';
-const durationSaveEdit = 200;
+const durationSaveEdit = 500;
const saveSettingsDebounced = debounce(() => saveSettings(), durationSaveEdit);
const saveCharacterDebounced = debounce(() => $("#create_button").trigger('click'), durationSaveEdit);
const getStatusDebounced = debounce(() => getStatus(), 90000);
@@ -446,7 +446,7 @@ function getTokenCount(str, padding = undefined) {
let tokenCount = 0;
jQuery.ajax({
async: false,
- type: 'POST', //
+ type: 'POST', //
url: `/tokenize_llama`,
data: JSON.stringify({ text: str }),
dataType: "json",
@@ -588,7 +588,7 @@ $.get("/csrf-token").then(async (data) => {
});
function checkOnlineStatus() {
- ///////// REMOVED LINES THAT DUPLICATE RA_CHeckOnlineStatus FEATURES
+ ///////// REMOVED LINES THAT DUPLICATE RA_CHeckOnlineStatus FEATURES
if (online_status == "no_connection") {
$("#online_status_indicator2").css("background-color", "red"); //Kobold
@@ -948,7 +948,7 @@ function printMessages() {
function clearChat() {
count_view_mes = 0;
extension_prompts = {};
- $("#chat").html("");
+ $("#chat").children().remove();
}
function deleteLastMessage() {
@@ -1030,13 +1030,14 @@ function getMessageFromTemplate({ mesId, characterName, isUser, avatarImg, bias,
return mes;
}
-function appendImageToMessage(mes, messageElement) {
+export function appendImageToMessage(mes, messageElement) {
if (mes.extra?.image) {
- const image = document.createElement("img");
- image.src = mes.extra?.image;
- image.title = mes.extra?.title || mes.title;
- image.classList.add("img_extra");
- messageElement.find(".mes_text").prepend(image);
+ const image = messageElement.find('.mes_img');
+ const isInline = !!mes.extra?.inline_image;
+ image.attr('src', mes.extra?.image);
+ image.attr('title', mes.extra?.title || mes.title);
+ messageElement.find(".mes_img_container").addClass("img_extra");
+ image.toggleClass("img_inline", isInline);
}
}
@@ -1094,7 +1095,7 @@ function addOneMessage(mes, { type = "normal", insertAfter = null, scroll = true
avatarImg = default_avatar;
}
}
- //old processing:
+ //old processing:
//if messge is from sytem, use the name provided in the message JSONL to proceed,
//if not system message, use name2 (char's name) to proceed
//characterName = mes.is_system || mes.force_avatar ? mes.name : name2;
@@ -1963,7 +1964,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// where it left off by removing the trailing newline at the end
// that was added by chat2 generator. This causes problems with
// instruct mode that could not have a trailing newline. So we're
- // removing a newline ONLY at the end of the string if it exists.
+ // removing a newline ONLY at the end of the string if it exists.
item = item.replace(/\n?$/, '');
//item = item.substr(0, item.length - 1);
}
@@ -2192,8 +2193,8 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
}
else {
jQuery.ajax({
- type: 'POST', //
- url: generate_url, //
+ type: 'POST', //
+ url: generate_url, //
data: JSON.stringify(generate_data),
beforeSend: function () {
@@ -4479,6 +4480,40 @@ export function cancelTtsPlay() {
}
}
+async function deleteMessageImage() {
+ const value = await callPopup("
Delete image from message?
This action can't be undone.
", 'confirm');
+
+ if (!value) {
+ return;
+ }
+
+ const mesBlock = $(this).closest('.mes');
+ const mesId = mesBlock.attr('mesid');
+ const message = chat[mesId];
+ delete message.extra.image;
+ delete message.extra.inline_image;
+ mesBlock.find('.mes_img_container').removeClass('img_extra');
+ mesBlock.find('.mes_img').attr('src', '');
+ saveChatConditional();
+}
+
+function enlargeMessageImage() {
+ const mesBlock = $(this).closest('.mes');
+ const mesId = mesBlock.attr('mesid');
+ const message = chat[mesId];
+ const imgSrc = message?.extra?.image;
+
+ if (!imgSrc) {
+ return;
+ }
+
+ const img = document.createElement('img');
+ img.classList.add('img_enlarged');
+ img.src = imgSrc;
+ $('#dialogue_popup').addClass('wide_dialogue_popup');
+ callPopup(img.outerHTML, 'text');
+}
+
window["SillyTavern"].getContext = function () {
return {
chat: chat,
@@ -6433,6 +6468,9 @@ $(document).ready(function () {
$('.code-copied').css({ 'display': 'none' });
});
+ $(document).on('click', '.mes_img_enlarge', enlargeMessageImage);
+ $(document).on('click', '.mes_img_delete', deleteMessageImage);
+
$(window).on('beforeunload', () => {
cancelTtsPlay();
if (streamingProcessor) {
diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 651629bcf..cdd2cf607 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -370,7 +370,8 @@ function RA_checkOnlineStatus() {
//Auto-connect to API (when set to kobold, API URL exists, and auto_connect is true)
function RA_autoconnect(PrevApi) {
- if (online_status === undefined) {
+ // secrets.js or script.js not loaded
+ if (SECRET_KEYS === undefined || online_status === undefined) {
setTimeout(RA_autoconnect, 100);
return;
}
@@ -404,7 +405,6 @@ function RA_autoconnect(PrevApi) {
}
if (!connection_made) {
-
RA_AC_retries++;
retry_delay = Math.min(retry_delay * 2, 30000); // double retry delay up to to 30 secs
//console.log('connection attempts: ' + RA_AC_retries + ' delay: ' + (retry_delay / 1000) + 's');
diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index b658dca06..579ca1cfa 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -7,7 +7,8 @@ import {
callPopup,
getRequestHeaders,
event_types,
- eventSource
+ eventSource,
+ appendImageToMessage
} from "../../../script.js";
import { getApiUrl, getContext, extension_settings, defaultRequestArgs, modules } from "../../extensions.js";
import { stringFormat, initScrollHeight, resetScrollHeight } from "../../utils.js";
@@ -41,24 +42,22 @@ const triggerWords = {
[generationMode.CHARACTER]: ['you'],
[generationMode.USER]: ['me'],
[generationMode.SCENARIO]: ['scene'],
+ [generationMode.FREE]: ['raw_last'],
[generationMode.NOW]: ['last'],
[generationMode.FACE]: ['face'],
}
const quietPrompts = {
+ /*OLD: [generationMode.CHARACTER]: "Pause your roleplay and provide comma-delimited list of phrases and keywords which describe {{char}}'s physical appearance and clothing. Ignore {{char}}'s personality traits, and chat history when crafting this description. End your response once the comma-delimited list is complete. Do not roleplay when writing this description, and do not attempt to continue the story.", */
+ [generationMode.CHARACTER]: "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait:']",
//face-specific prompt
[generationMode.FACE]: "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait:']",
//prompt for only the last message
- [generationMode.NOW]: "[Pause your roleplay and provide a brief description of the last chat message. Focus on visual details, clothing, actions. Ignore the emotions and thoughts of {{char}} and {{user}} as well as any spoken dialog. Do not roleplay as {{char}} while writing this description. Do not continue the roleplay story.]",
-
- [generationMode.CHARACTER]: "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait:']",
-
- /*OLD: [generationMode.CHARACTER]: "Pause your roleplay and provide comma-delimited list of phrases and keywords which describe {{char}}'s physical appearance and clothing. Ignore {{char}}'s personality traits, and chat history when crafting this description. End your response once the comma-delimited list is complete. Do not roleplay when writing this description, and do not attempt to continue the story.", */
-
[generationMode.USER]: "[Pause your roleplay and provide a detailed description of {{user}}'s appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. Ignore the rest of the story when crafting this description. Do not roleplay as {{char}}}} when writing this description, and do not attempt to continue the story.]",
[generationMode.SCENARIO]: "[Pause your roleplay and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not roleplay while writing this description.]",
- [generationMode.FREE]: "[Pause your roleplay and provide ONLY an echo this string back to me verbatim: {0}. Do not write anything after the string. Do not roleplay at all in your response.]",
+ [generationMode.NOW]: "[Pause your roleplay and provide a brief description of the last chat message. Focus on visual details, clothing, actions. Ignore the emotions and thoughts of {{char}} and {{user}} as well as any spoken dialog. Do not roleplay as {{char}} while writing this description. Do not continue the roleplay story.]",
+ [generationMode.FREE]: "[Pause your roleplay and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not roleplay at all in your response. Do not continue the roleplay story.]",
}
const helpString = [
@@ -69,8 +68,9 @@ const helpString = [
`
${m(j(triggerWords[generationMode.USER]))} – user character full body selfie`,
`
${m(j(triggerWords[generationMode.SCENARIO]))} – visual recap of the whole chat scenario`,
`
${m(j(triggerWords[generationMode.NOW]))} – visual recap of the last chat message`,
+ `
${m(j(triggerWords[generationMode.FREE]))} – visual recap of the last chat message with no summary`,
'',
- `Anything else would trigger a "free mode" to make SD generate whatever you prompted.
+ `Anything else would trigger a "free mode" to make SD generate whatever you prompted.
example: '/sd apple tree' would generate a picture of an apple tree.`,
].join('
');
@@ -340,7 +340,14 @@ function processReply(str) {
return str;
}
-async function generatePicture(_, trigger) {
+function getRawLastMessage(context) {
+ const lastMessage = context.chat.slice(-1)[0].mes,
+ characterDescription = context.characters[context.characterId].description,
+ situation = context.characters[context.characterId].scenario;
+ return `((${lastMessage})), (${situation}:0.7), (${characterDescription}:0.5)`
+}
+
+async function generatePicture(_, trigger, message, callback) {
if (!trigger || trigger.trim().length === 0) {
console.log('Trigger word empty, aborting');
return;
@@ -361,7 +368,7 @@ async function generatePicture(_, trigger) {
const context = getContext();
try {
- const prompt = processReply(await new Promise(
+ const prompt = trigger == 'raw_last' ? message || getRawLastMessage(context) : processReply(await new Promise(
async function promptPromise(resolve, reject) {
try {
await context.generate('quiet', { resolve, reject, quiet_prompt, force_name2: true, });
@@ -377,9 +384,9 @@ async function generatePicture(_, trigger) {
console.log('Processed Stable Diffusion prompt:', prompt);
if (extension_settings.sd.horde) {
- await generateHordeImage(prompt);
+ await generateHordeImage(prompt, callback);
} else {
- await generateExtrasImage(prompt);
+ await generateExtrasImage(prompt, callback);
}
} catch (err) {
console.trace(err);
@@ -391,7 +398,7 @@ async function generatePicture(_, trigger) {
}
}
-async function generateExtrasImage(prompt) {
+async function generateExtrasImage(prompt, callback) {
const url = new URL(getApiUrl());
url.pathname = '/api/image';
const result = await fetch(url, {
@@ -414,13 +421,13 @@ async function generateExtrasImage(prompt) {
if (result.ok) {
const data = await result.json();
const base64Image = `data:image/jpeg;base64,${data.image}`;
- sendMessage(prompt, base64Image);
+ callback ? callback(prompt, base64Image) : sendMessage(prompt, base64Image);
} else {
callPopup('Image generation has failed. Please try again.', 'text');
}
}
-async function generateHordeImage(prompt) {
+async function generateHordeImage(prompt, callback) {
const result = await fetch('/horde_generateimage', {
method: 'POST',
headers: getRequestHeaders(),
@@ -441,7 +448,7 @@ async function generateHordeImage(prompt) {
if (result.ok) {
const data = await result.text();
const base64Image = `data:image/webp;base64,${data}`;
- sendMessage(prompt, base64Image);
+ callback ? callback(prompt, base64Image) : sendMessage(prompt, base64Image);
} else {
callPopup('Image generation has failed. Please try again.', 'text');
}
@@ -468,6 +475,7 @@ async function sendMessage(prompt, image) {
}
function addSDGenButtons() {
+
const buttonHtml = `