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

Support ComfyUI hosted on relative URLs

Browse Source 
Closes #3208
This commit is contained in:
Cohee
2024-12-21 21:25:02 +02:00
parent 71d2530329
commit 5739efc59b
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/scripts/extensions/stable-diffusion/index.js
View File

@ -1111,7 +1111,8 @@ function onHrSecondPassStepsInput() {
} }
function onComfyUrlInput() { function onComfyUrlInput() {
extension_settings.sd.comfy_url = $('#sd_comfy_url').val(); // Remove trailing slashes
extension_settings.sd.comfy_url = String($('#sd_comfy_url').val() ?? '').replace(/\/$/, '');
saveSettingsDebounced(); saveSettingsDebounced();
} }

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

@ -365,7 +365,7 @@ const comfy = express.Router();
comfy.post('/ping', jsonParser, async (request, response) => { comfy.post('/ping', jsonParser, async (request, response) => {
try { try {
const url = new URL(request.body.url); const url = new URL(request.body.url);
url.pathname = '/system_stats'; url.pathname += '/system_stats';
const result = await fetch(url); const result = await fetch(url);
if (!result.ok) { if (!result.ok) {
@ -382,7 +382,7 @@ comfy.post('/ping', jsonParser, async (request, response) => {
comfy.post('/samplers', jsonParser, async (request, response) => { comfy.post('/samplers', jsonParser, async (request, response) => {
try { try {
const url = new URL(request.body.url); const url = new URL(request.body.url);
url.pathname = '/object_info'; url.pathname += '/object_info';
const result = await fetch(url); const result = await fetch(url);
if (!result.ok) { if (!result.ok) {
@ -401,7 +401,7 @@ comfy.post('/samplers', jsonParser, async (request, response) => {
comfy.post('/models', jsonParser, async (request, response) => { comfy.post('/models', jsonParser, async (request, response) => {
try { try {
const url = new URL(request.body.url); const url = new URL(request.body.url);
url.pathname = '/object_info'; url.pathname += '/object_info';
const result = await fetch(url); const result = await fetch(url);
if (!result.ok) { if (!result.ok) {
@ -430,7 +430,7 @@ comfy.post('/models', jsonParser, async (request, response) => {
comfy.post('/schedulers', jsonParser, async (request, response) => { comfy.post('/schedulers', jsonParser, async (request, response) => {
try { try {
const url = new URL(request.body.url); const url = new URL(request.body.url);
url.pathname = '/object_info'; url.pathname += '/object_info';
const result = await fetch(url); const result = await fetch(url);
if (!result.ok) { if (!result.ok) {
@ -449,7 +449,7 @@ comfy.post('/schedulers', jsonParser, async (request, response) => {
comfy.post('/vaes', jsonParser, async (request, response) => { comfy.post('/vaes', jsonParser, async (request, response) => {
try { try {
const url = new URL(request.body.url); const url = new URL(request.body.url);
url.pathname = '/object_info'; url.pathname += '/object_info';
const result = await fetch(url); const result = await fetch(url);
if (!result.ok) { if (!result.ok) {
@ -517,14 +517,14 @@ comfy.post('/delete-workflow', jsonParser, async (request, response) => {
comfy.post('/generate', jsonParser, async (request, response) => { comfy.post('/generate', jsonParser, async (request, response) => {
try { try {
const url = new URL(request.body.url); const url = new URL(request.body.url);
url.pathname = '/prompt'; url.pathname += '/prompt';
const controller = new AbortController(); const controller = new AbortController();
request.socket.removeAllListeners('close'); request.socket.removeAllListeners('close');
request.socket.on('close', function () { request.socket.on('close', function () {
if (!response.writableEnded && !item) { if (!response.writableEnded && !item) {
const interruptUrl = new URL(request.body.url); const interruptUrl = new URL(request.body.url);
interruptUrl.pathname = '/interrupt'; interruptUrl.pathname += '/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();
@ -544,7 +544,7 @@ comfy.post('/generate', jsonParser, async (request, response) => {
const id = data.prompt_id; const id = data.prompt_id;
let item; let item;
const historyUrl = new URL(request.body.url); const historyUrl = new URL(request.body.url);
historyUrl.pathname = '/history'; historyUrl.pathname += '/history';
while (true) { while (true) {
const result = await fetch(historyUrl); const result = await fetch(historyUrl);
if (!result.ok) { if (!result.ok) {
@ -569,7 +569,7 @@ comfy.post('/generate', jsonParser, async (request, response) => {
} }
const imgInfo = Object.keys(item.outputs).map(it => item.outputs[it].images).flat()[0]; const imgInfo = Object.keys(item.outputs).map(it => item.outputs[it].images).flat()[0];
const imgUrl = new URL(request.body.url); const imgUrl = new URL(request.body.url);
imgUrl.pathname = '/view'; imgUrl.pathname += '/view';
imgUrl.search = `?filename=${imgInfo.filename}&subfolder=${imgInfo.subfolder}&type=${imgInfo.type}`; imgUrl.search = `?filename=${imgInfo.filename}&subfolder=${imgInfo.subfolder}&type=${imgInfo.type}`;
const imgResponse = await fetch(imgUrl); const imgResponse = await fetch(imgUrl);
if (!imgResponse.ok) { if (!imgResponse.ok) {