Merge branch 'staging' into world_info_force_activate_expansion

a82dce7c87719975a496bb2e80c601a59126d07c

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/extensions/stable-diffusion/index.js+2 -4 Viewed

     str = str.replaceAll('"', '');
     str = str.replaceAll('“', '');
 -    str = str.replaceAll('.', ',');
     str = str.replaceAll('\n', ', ');
     str = str.normalize('NFD');
     str = str.replace(/[^a-zA-Z0-9\.,:_(){}<>[\]\-']+/g, ' ');
     str = str.replace(/\s+/g, ' '); // Collapse multiple whitespaces into one
     str = str.trim();

     });
     if (result.ok) {
         const data =return await result.json();
 -        return { format: 'jpg', data: data?.output?.choices?.[0]?.image_base64 };
     } else {
         const text = await result.text();
         throw new Error(text);

public/scripts/variables.js+2 -1 Viewed

             return '';
+        }
 -        const operandNumber = Number(operand);
 +        // parseFloat will return NaN for spaces.
 +        const operandNumber = parseFloat(operand);
         if (!isNaN(operandNumber)) {
             return operandNumber;

public/scripts/world-info.js+2 -2 Viewed

     } else if (sortRule === 'priority') {
         // First constant, then normal, then disabled.
         primarySort = (a, b) => {
             const aValue = a.constantdisable ? 02 : a.disableconstant ? 20 : 1;
             const bValue = b.constantdisable ? 02 : b.disableconstant ? 20 : 1;
             return aValue - bValue;
         };
     } else {

src/endpoints/backends/chat-completions.js+1 -1 Viewed

             ? (stream ? 'streamGenerateContent' : 'generateContent')
             : (isText ? 'generateText' : 'generateMessage');
         const generateResponse = await fetch(`${apiUrl.toString().replace(/\/$/, '')}/${apiVersion}/models/${model}:${responseType}?key=${apiKey}${stream ? '&alt=sse' : ''}`, {
             body: JSON.stringify(body),
             method: 'POST',
             headers: {

src/endpoints/stable-diffusion.js+9 -9 Viewed

         console.log('TogetherAI request:', request.body);
         const result = await fetch('https://api.together.xyz/apiv1/inferenceimages/generations', {
             method: 'POST',
             body: JSON.stringify({
 -                request_type: 'image-model-inference',
                 prompt: request.body.prompt,
                 negative_prompt: request.body.negative_prompt,
                 height: request.body.height,

                 n: 1,
                 // Limited to 10000 on playground, works fine with more.
                 seed: request.body.seed >= 0 ? request.body.seed : Math.floor(Math.random() * 10_000_000),
 -                // Don't know if that's supposed to be random or not. It works either way.
 -                sessionKey: getHexString(40),
             }),
             headers: {
                 'Content-Type': 'application/json',

         });
         if (!result.ok) {
             console.log('TogetherAI returned an error.', { body: await result.text() });
             return response.sendStatus(500);
+        }
         const data = await result.json();
         console.log('TogetherAI response:', data);
 -        if (data.status !== 'finished') {
 +        const choice = data?.data?.[0];
 -            console.log('TogetherAI job failed.');
 +        let b64_json = choice.b64_json;
 -            return response.sendStatus(500);
++
 +        if (!b64_json) {
 +            const buffer = await (await fetch(choice.url)).buffer();
 +            b64_json = buffer.toString('base64');
+        }
         return response.send({ format: 'jpg', data: b64_json });
     } catch (error) {
         console.log(error);
         return response.sendStatus(500);