Merge branch 'staging' into es-modules

90eef29982af6bededc929e225651eac6a3c8ffa

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(/[^a-zA-Z0-9\.,:_(){}<>[\]\-']+/g, ' ');
     str = str.replace(/\s+/g, ' '); // Collapse multiple whitespaces into one
     str = str.trim();

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

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

             ? (stream ? 'streamGenerateContent' : 'generateContent')
             : (isText ? 'generateText' : 'generateMessage');
-        const generateResponse = await fetch(`${apiUrl}/${apiVersion}/models/${model}:${responseType}?key=${apiKey}${stream ? '&alt=sse' : ''}`, {
+        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/api/inference', {
+        const result = await fetch('https://api.together.xyz/v1/images/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.');
+            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(data);
+        return response.send({ format: 'jpg', data: b64_json });
     } catch (error) {
         console.log(error);
         return response.sendStatus(500);