rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into staging

Browse Source
This commit is contained in:
Cohee
2025-01-02 00:41:05 +02:00
parent 5db7a9cf1e beb4328714
commit 612fda4cfc
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/endpoints/stable-diffusion.js
View File

@ -106,8 +106,10 @@ router.post('/upscalers', jsonParser, async (request, response) => {
router.post('/vaes', jsonParser, async (request, response) => { router.post('/vaes', jsonParser, async (request, response) => {
try { try {
const autoUrl = urlJoin(request.body.url, '/sdapi/v1/sd-vae'); const autoUrl = new URL(request.body.url);
const forgeUrl = urlJoin(request.body.url, '/sdapi/v1/sd-modules'); autoUrl.pathname = '/sdapi/v1/sd-vae';
const forgeUrl = new URL(request.body.url);
forgeUrl.pathname = '/sdapi/v1/sd-modules';
const requestInit = { const requestInit = {
method: 'GET', method: 'GET',
@ -295,7 +297,8 @@ router.post('/set-model', jsonParser, async (request, response) => {
router.post('/generate', jsonParser, async (request, response) => { router.post('/generate', jsonParser, async (request, response) => {
try { try {
try { try {
const optionsUrl = urlJoin(request.body.url, '/sdapi/v1/options'); const optionsUrl = new URL(request.body.url);
optionsUrl.pathname = '/sdapi/v1/options';
const optionsResult = await fetch(optionsUrl, { headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } }); const optionsResult = await fetch(optionsUrl, { headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
if (optionsResult.ok) { if (optionsResult.ok) {
const optionsData = /** @type {any} */ (await optionsResult.json()); const optionsData = /** @type {any} */ (await optionsResult.json());
@ -313,14 +316,16 @@ router.post('/generate', jsonParser, async (request, response) => {
request.socket.removeAllListeners('close'); request.socket.removeAllListeners('close');
request.socket.on('close', function () { request.socket.on('close', function () {
if (!response.writableEnded) { if (!response.writableEnded) {
const interruptUrl = urlJoin(request.body.url, '/sdapi/v1/interrupt'); const interruptUrl = new URL(request.body.url);
interruptUrl.pathname = '/sdapi/v1/interrupt';
fetch(interruptUrl, { method: 'POST', headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } }); fetch(interruptUrl, { method: 'POST', headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
} }
controller.abort(); controller.abort();
}); });
console.log('SD WebUI request:', request.body); console.log('SD WebUI request:', request.body);
const txt2imgUrl = urlJoin(request.body.url, '/sdapi/v1/txt2img'); const txt2imgUrl = new URL(request.body.url);
txt2imgUrl.pathname = '/sdapi/v1/txt2img';
const result = await fetch(txt2imgUrl, { const result = await fetch(txt2imgUrl, {
method: 'POST', method: 'POST',
body: JSON.stringify(request.body), body: JSON.stringify(request.body),