From 1bc4229fdf82e33a8ea6a33d6dabb3223c2d2b1a Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 16 Jan 2025 10:31:46 -0500 Subject: [PATCH] increase gallery timeouts Signed-off-by: Vladimir Mandic --- installer.py | 2 +- javascript/gallery.js | 12 ++++++++++-- modules/processing_args.py | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/installer.py b/installer.py index 57503bcf5..1e62ddd2a 100644 --- a/installer.py +++ b/installer.py @@ -876,7 +876,7 @@ def install_packages(): if args.profile: pr = cProfile.Profile() pr.enable() - log.info('Verifying packages') + # log.info('Install: verifying packages') clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git") install(clip_package, 'clip', quiet=True) install('open-clip-torch', no_deps=True, quiet=True) diff --git a/javascript/gallery.js b/javascript/gallery.js index 32f261e12..7433391f6 100644 --- a/javascript/gallery.js +++ b/javascript/gallery.js @@ -331,13 +331,21 @@ async function fetchFiles(evt) { // fetch file-by-file list over websockets el.files.innerHTML = ''; if (!url) return; if (ws && ws.readyState === WebSocket.OPEN) ws.close(); // abort previous request - ws = new WebSocket(`${url}/sdapi/v1/browser/files`); - await wsConnect(ws); + let wsConnected = false; + try { + ws = new WebSocket(`${url}/sdapi/v1/browser/files`); + wsConnected = await wsConnect(ws, 30000); + } catch (err) { + log('gallery: ws connect error', err); + return; + } + log(`gallery: connected=${wsConnected} state=${ws?.readyState} url=${ws?.url}`); el.status.innerText = `Folder | ${evt.target.name}`; const t0 = performance.now(); let numFiles = 0; let t1 = performance.now(); let fragment = document.createDocumentFragment(); + ws.onmessage = (event) => { numFiles++; t1 = performance.now(); diff --git a/modules/processing_args.py b/modules/processing_args.py index 81f4ae5d3..509ba77e2 100644 --- a/modules/processing_args.py +++ b/modules/processing_args.py @@ -180,8 +180,8 @@ def set_pipeline_args(p, model, prompts:list, negative_prompts:list, prompts_2:t if not chi: args['complex_human_instruction'] = None if 'use_resolution_binning' in possible: - args['use_resolution_binning'] = True - p.extra_generation_params["Binning"] = True + args['use_resolution_binning'] = False + # p.extra_generation_params["Binning"] = True if prompt_parser_diffusers.embedder is not None and not prompt_parser_diffusers.embedder.scheduled_prompt: # not scheduled so we dont need it anymore prompt_parser_diffusers.embedder = None