Remove forge override from non-forge SD requests

de6c8c1501e48459f39d796c07f431a62761aaee

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

Parents: e0af5ff35384805c0ccd07af8c5e9843f3fc5001

src/endpoints/stable-diffusion.js+17 -7 Viewed

 import { sync as writeFileAtomicSync } from 'write-file-atomic';
 import FormData from 'form-data';
 import urlJoin from 'url-join';
 +import _ from 'lodash';
 import { delay, getBasicAuthHeader, tryParse } from '../util.js';
 import { jsonParser } from '../express-common.js';

 router.post('/generate', jsonParser, async (request, response) => {
     try {
 -        console.log('SD WebUI request:', request.body);
 +        try {
 +            const optionsUrl = urlJoin(request.body.url, '/sdapi/v1/options');
 +            const optionsResult = await fetch(optionsUrl, { headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
 +            const optionsData = /** @type {any} */ (await optionsResult.json());
 +            const isForge = 'forge_preset' in optionsData;
 -        const url = new URL(request.body.url);
 +            if (!isForge) {
 -        url.pathname = '/sdapi/v1/txt2img';
 +                _.unset(request.body, 'override_settings.forge_additional_modules');
 +            }
 +        } catch (error) {
 +            console.log('SD WebUI failed to get options:', error);
 +        }
         const controller = new AbortController();
         request.socket.removeAllListeners('close');
         request.socket.on('close', function () {
             if (!response.writableEnded) {
                 const urlinterruptUrl = new URLurlJoin(request.body.url, '/sdapi/v1/interrupt');
 -                url.pathname = '/sdapi/v1/interrupt';
 +                fetch(interruptUrl, { method: 'POST', headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
 -                fetch(url, { method: 'POST', headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
+            }
             controller.abort();
         });
 -        const result = await fetch(url, {
 +        console.log('SD WebUI request:', request.body);
 +        const txt2imgUrl = urlJoin(request.body.url, '/sdapi/v1/txt2img');
 +        const result = await fetch(txt2imgUrl, {
             method: 'POST',
             body: JSON.stringify(request.body),
             headers: {