Commit Graph

599 Commits

Author SHA1 Message Date
Marc-Andre Ferland
099727d671 Added auto unload to CPU if GPUs are active. 2022-10-29 18:57:10 -04:00
Marc-Andre Ferland
6229cdb1ba Added a missing device_name 2022-10-29 17:47:45 -04:00
Marc-Andre Ferland
b7a663ed20 Implement complete device selection in the backend. 2022-10-29 17:34:53 -04:00
Marc-Andre Ferland
3bd97352ba Don't reset reqBody, only replace using req as we use a new task object created from UI inputs.
Fix plugins needing to specify many params or they would be missing in the render request.
2022-10-29 14:47:58 -04:00
cmdr2
5e22360cb1 Change the JS/CSS version 2022-10-29 18:10:23 +05:30
Marc-Andre Ferland
03757632cf Missing .lower() cause CUDA:0 to fail check where cuda:0 works. 2022-10-29 04:33:14 -04:00
cmdr2
e818f5a93f Bump version 2022-10-29 12:29:28 +05:30
cmdr2
ab9b08770a
Merge pull request #417 from mdiller/mdiller_parameters
Moved System Settings & Reworked into "Parameters"
2022-10-29 12:04:21 +05:30
Marc-Andre Ferland
9f5202fee3 Improved readability and comments. 2022-10-29 00:43:02 -04:00
Marc-Andre Ferland
902ccbd203 Don't try to start cuda:0 if auto used cpu mode. 2022-10-29 00:36:26 -04:00
Marc-Andre Ferland
4675da4d16 Display warning on start failure.
Removes spam from exception and continue starting other devices.
2022-10-28 22:53:55 -04:00
Marc-Andre Ferland
86da27a7a1 Moved wait outside lock and now returns false on failure. 2022-10-28 22:52:00 -04:00
Marc-Andre Ferland
fc2a6567da Moved import before use of runtime.thread_data.device 2022-10-28 22:51:04 -04:00
Malcolm Diller
7c611d9b62 added some shadow and animation to popups 2022-10-28 18:41:41 -07:00
Malcolm Diller
784c7465d1 updated settings labels 2022-10-28 18:31:46 -07:00
Malcolm Diller
301af7bd7a added parameters 2022-10-28 18:25:54 -07:00
Malcolm Diller
09c11a385d normalized popups 2022-10-28 16:48:32 -07:00
cmdr2
ef6f491d94 Write lines, please 2022-10-28 22:42:11 +05:30
cmdr2
9dcef00fbb New lines for config.sh 2022-10-28 22:35:04 +05:30
cmdr2
e781e5dd43 Need to wrap the filter() output in a list 2022-10-28 22:30:05 +05:30
cmdr2
d3e672d811 Replace os-specific newlines with writelines() 2022-10-28 22:23:52 +05:30
cmdr2
dad1554ec2 Fix a bug where config.bat would not get written properly 2022-10-28 21:07:18 +05:30
cmdr2
30bf96c6cd Fix a bug where beta wouldn't switch properly because the config.bat/sh files weren't being written 2022-10-28 21:00:25 +05:30
cmdr2
a8c16e39b8 Support custom VAE files; Use vae-ft-mse-840000-ema-pruned as the default VAE, which can be overridden by putting a .vae.pt file inside models/stable-diffusion with the same name as the ckpt model file. The UI / System Settings allows setting the default VAE model to use 2022-10-28 20:06:44 +05:30
Marc-Andre Ferland
26562e445f Set online after preload. Move ident to include in if check. 2022-10-28 04:09:34 -04:00
cmdr2
2432491bfc
Merge pull request #411 from madrang/beta
Apply force_full_precision if was set on device_select.
2022-10-28 11:50:16 +05:30
Marc-Andre Ferland
c52fc843f6 Comment... 2022-10-28 02:09:11 -04:00
Marc-Andre Ferland
02240bda25 Moved up to not duplicate if statement. 2022-10-28 02:05:48 -04:00
Marc-Andre Ferland
0185ef7c83 Apply force_full_precision if was set on device_select. 2022-10-28 02:02:09 -04:00
Malcolm Diller
7d29b9901c updated progressbar to end more consistently 2022-10-27 22:47:08 -07:00
cmdr2
ae553dfed3
Merge pull request #410 from madrang/beta
Only default to cpu on auto or current when cuda not available.
2022-10-28 10:43:28 +05:30
Marc-Andre Ferland
71c6beadb4 Only default to cpu on auto or current.
Not when a specific device was requested.
2022-10-28 01:09:38 -04:00
cmdr2
d939629c09 Bump version 2022-10-28 10:39:23 +05:30
cmdr2
0a569146a8
Merge pull request #406 from mdiller/mdiller_progressbar
Fixed/Implemented Progressbar
2022-10-28 10:34:03 +05:30
Marc-Andre Ferland
22a11769fa Enable preload on cpu when no other devices are alive. 2022-10-27 21:57:50 -04:00
Marc-Andre Ferland
7dc7ba9977 Removed old comments. 2022-10-27 21:47:44 -04:00
Marc-Andre Ferland
fa4059a4b9 Removed all async code since now start_render_thread wait for init to complete making this useless. 2022-10-27 21:40:16 -04:00
Marc-Andre Ferland
7f4786f9dd Wait until device is fully ready before proceding. 2022-10-27 20:27:21 -04:00
Malcolm Diller
5a6e7a46d1 added progressbar 2022-10-27 17:03:09 -07:00
cmdr2
0dfaf9159d Put back the check to only preload on GPU 2022-10-28 00:04:33 +05:30
cmdr2
9ad1e0d529 Allow the user to specify any disk path to the model, in the config 2022-10-27 23:39:29 +05:30
cmdr2
389e3397ec Preload the model even in the CPU mode 2022-10-27 23:17:41 +05:30
cmdr2
284b95213e Fix a bug where the device wouldn't get set if no cuda-compatible hardware was found 2022-10-27 22:59:55 +05:30
cmdr2
952854f64e Revert 554650c18d 2022-10-27 22:59:17 +05:30
cmdr2
554650c18d Fix a bug where the device wouldn't get set if no cuda-compatible hardware was found 2022-10-27 22:51:45 +05:30
cmdr2
01a2fa7c2d Fix a bug where the default model would not load if the user hadn't already configured a custom model (e.g. in a fresh installation); Check for the model in the models/stable-diffusion folder first, before checking in the direct folder 2022-10-27 22:34:23 +05:30
cmdr2
7c5bbca2fa Bump version 2022-10-27 20:49:05 +05:30
cmdr2
3fb5d886dc
Merge pull request #398 from madrang/mGpu-crashHandling
mGpu crash handling
2022-10-27 13:44:26 +05:30
cmdr2
b57cd8d5c2
Merge pull request #397 from madrang/mGpu-fixtype
Fix TypeError: string indices must be integers
2022-10-27 13:44:19 +05:30
Marc-Andre Ferland
d3df113fb0 When reduced_memory is True, on crash only move model back to Cpu. 2022-10-26 16:52:31 -04:00
Marc-Andre Ferland
06c2ab045a Fix TypeError: string indices must be integers 2022-10-26 16:14:29 -04:00
cmdr2
ec14429238
Merge pull request #348 from madrang/multi-gpu
Multi gpu
2022-10-26 19:33:44 +05:30
cmdr2
c024b39c8b Get ready for installer_umamba 2022-10-26 12:55:39 +05:30
Marc-Andre Ferland
ae40b6ba8c Missed a is_alive check in the conversion. 2022-10-25 03:00:50 -04:00
Marc-Andre Ferland
d482427e0d Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu 2022-10-25 02:51:31 -04:00
Marc-Andre Ferland
c41baf3aeb Moved img_id creation inside save image loop. 2022-10-25 02:10:52 -04:00
cmdr2
dd7cb74edc Tweak reset-image-settin
gs button some more
2022-10-25 11:12:34 +05:30
cmdr2
4eed2c7582 Tweak the position of the reset-image-settings button 2022-10-25 11:11:37 +05:30
cmdr2
100e830e04 Bust the cache for included media 2022-10-25 11:03:07 +05:30
cmdr2
6285980f98
Merge pull request #377 from madrang/beta
Missing '?' in case renderRequest is ever undefined.
2022-10-25 10:44:37 +05:30
cmdr2
a5d19cd31f
Update index.html 2022-10-25 10:32:55 +05:30
cmdr2
9c9998b468
Merge pull request #364 from mdiller/mdiller_settings
Settings Refactor
2022-10-25 10:32:38 +05:30
Marc-Andre Ferland
189d31cc29 Specify update_ttl on all get_cached_task calls. 2022-10-24 05:12:08 -04:00
Marc-Andre Ferland
d178f3d1b9 Missing 'e' 2022-10-23 15:01:11 -04:00
Marc-Andre Ferland
6e9d73ec64 Fixe forgotten current_state_error, is now in task_manager 2022-10-23 15:00:36 -04:00
Marc-Andre Ferland
fc875651d3 Removed unused vars 2022-10-23 05:00:21 -04:00
Marc-Andre Ferland
0d62123a0b Replaced missing gpu_name by device_name 2022-10-22 21:28:12 -04:00
Marc-Andre Ferland
28fed6281f Merge branch 'beta' into multi-gpu 2022-10-22 21:20:02 -04:00
Marc-Andre Ferland
1ec95d42ba Missing '?' in case renderRequest is ever undefined. 2022-10-22 21:19:42 -04:00
Marc-Andre Ferland
8adf965d0b Formatting changes. 2022-10-22 19:02:02 -04:00
Marc-Andre Ferland
364e364429 Added get_cached_task to replace task_cache.tryGet in server.py
Now updated cache TTL on /stream and temp images endpoints.
Keep images alive longer when browser keeps reading the endpoints.
2022-10-22 13:52:13 -04:00
Marc-Andre Ferland
46a46877ed Missing model_path replaced by model_name 2022-10-22 13:49:23 -04:00
cmdr2
5ee05e3aaa
Merge pull request #376 from cmdr2/beta
Custom Modifiers; Try to fix the 503 error bug; Show the number of images being created in the Make Image button
2022-10-22 22:27:05 +05:30
Marc-Andre Ferland
1199c431ff Removed a new line by mistake. Formatting... 2022-10-22 12:51:43 -04:00
Marc-Andre Ferland
2c1a897c4e Missing newline. 2022-10-22 12:50:53 -04:00
Marc-Andre Ferland
305f2fa448 In case of failure, display error in renderRequest.detail 2022-10-22 12:32:41 -04:00
Marc-Andre Ferland
b051685727 More logging for each state and improved handling. 2022-10-22 12:31:14 -04:00
Marc-Andre Ferland
344dd92c85 Improved checks on '/render' requests 2022-10-22 12:29:01 -04:00
Marc-Andre Ferland
4167c65acf Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu 2022-10-22 12:17:12 -04:00
Marc-Andre Ferland
cd6d49860f Missing a 'r' in progress 2022-10-22 01:23:39 -04:00
Marc-Andre Ferland
8a10fcf7ea updated print statement. 2022-10-22 00:34:33 -04:00
cmdr2
7580bb21c3
Fix upscale multiple images bug 2022-10-22 08:38:19 +05:30
Marc-Andre Ferland
3b5f96a133 Fixed stopping tasks and more cleaning. 2022-10-21 22:45:19 -04:00
Marc-Andre Ferland
ce2b711b1f Newlines... 2022-10-21 21:44:15 -04:00
Marc-Andre Ferland
667fb438cb Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu
# Conflicts:
#	ui/media/js/main.js
2022-10-21 21:10:02 -04:00
Marc-Andre Ferland
7befa94e6d More comments and cleanup. 2022-10-21 20:56:24 -04:00
Malcolm Diller
32d7835119 added a simple tooltip to the reset button 2022-10-21 17:44:04 -07:00
Malcolm Diller
726abf6e65 removed some extra comment stuff 2022-10-21 17:31:57 -07:00
Malcolm Diller
c154a4bdc8 removed second auto-savecss reference 2022-10-21 17:30:09 -07:00
Marc-Andre Ferland
88ef1a3c5b Moved time before model.to 2022-10-21 20:22:34 -04:00
Malcolm Diller
5453925e26 Merge branch 'beta' into mdiller_settings 2022-10-21 17:16:50 -07:00
Malcolm Diller
537e314b49 updated to consume the old settings nicely 2022-10-21 17:13:13 -07:00
Marc-Andre Ferland
ccb7a553c2 Memory improvements 2022-10-21 19:34:29 -04:00
rbertus2000
1696a5c8e1 modifyCurrentRequest with rest parameters 2022-10-21 23:04:42 +02:00
rbertus2000
816cf8f702 fix multiple images with upscale/fix face button 2022-10-21 22:40:26 +02:00
cmdr2
e8167541af Show a tip regarding custom modifiers 2022-10-21 21:35:20 +05:30
cmdr2
329360aa5b Show the number of images it'll make in the Make Image button 2022-10-21 15:18:05 +05:30
cmdr2
eb1a276e60 Move the image modifers toolbar back to the top 2022-10-21 14:54:45 +05:30
cmdr2
a53bac1a94 Fix a bug where a null value for custom modifiers would break 2022-10-21 14:43:32 +05:30
cmdr2
93bf93d3a1 Fix a bug where a null value for custom modifiers would break 2022-10-21 14:42:02 +05:30
cmdr2
4174c8c25c Increase version 2022-10-21 14:36:51 +05:30
cmdr2
48a88a8624 Custom modifiers 2022-10-21 14:08:16 +05:30
Marc-Andre Ferland
1442748f58 When starting with profiler cuda devices are slower to init. 2022-10-21 03:53:26 -04:00
cmdr2
d17e216f91 Replace the thumbnail image for glass caustics image modifier 2022-10-21 13:08:23 +05:30
Marc-Andre Ferland
56ed4fe6f2 Fix VisualStudio Type Warning. 2022-10-21 01:30:49 -04:00
cmdr2
9a71e9ba86
Merge pull request #369 from cmdr2/main
Merge main
2022-10-21 09:57:53 +05:30
cmdr2
ef478a4a9e Remove the message about system-related settings 2022-10-21 09:41:31 +05:30
Marc-Andre Ferland
807e9573fb Check result status, not json object. 2022-10-20 20:36:45 -04:00
Marc-Andre Ferland
849d1d7ebd Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu
# Conflicts:
#	ui/media/js/main.js
#	ui/sd_internal/runtime.py
#	ui/server.py
2022-10-20 20:08:23 -04:00
cmdr2
090dfff730 Refactor the time delays into constants and mention the units 2022-10-20 17:22:01 +05:30
cmdr2
d8753adc4e Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-10-20 16:05:28 +05:30
cmdr2
2e17ea99e2 Don't cache ui plugins in the browser 2022-10-20 16:05:18 +05:30
cmdr2
9d16898926
Merge branch 'beta' into merge 2022-10-20 15:57:46 +05:30
cmdr2
f4bcc1f2e5 Bug fix - autosave wasn't saving the changes in the textboxes next to guidance scale and prompt strength sliders 2022-10-20 15:26:18 +05:30
cmdr2
63e8614ace Refactor the image button code 2022-10-20 15:10:34 +05:30
cmdr2
5d686b146d Remove the new label from Upscale 2022-10-20 12:14:09 +05:30
Malcolm Diller
d08f090800 Merge branch 'beta' into mdiller_settings 2022-10-19 21:17:56 -07:00
Malcolm Diller
8554473c21 the rest of the fking owl 2022-10-19 21:12:01 -07:00
rbertus2000
01fb1bde8b fix seed for parallel renders with filters applied 2022-10-19 23:16:51 +02:00
cmdr2
29e32ffc42 Mark the new upscale button as new 2022-10-19 22:08:58 +05:30
cmdr2
88bd60a083 Button to draw another 25 steps 2022-10-19 22:08:42 +05:30
cmdr2
48b7b725b0 Add a button to fix faces on generated images 2022-10-19 22:02:59 +05:30
cmdr2
8d8c932d8c Bump version 2022-10-19 21:59:15 +05:30
cmdr2
253d355bd2 New upscale button for images; Fix a bug where the string seed would get appended with numbers 2022-10-19 21:58:51 +05:30
cmdr2
e287df1320 Allow loading UI plugins from a /plugins/ URL path, which loads files ending with .plugin.js inside the plugins/ui folder 2022-10-19 21:34:40 +05:30
cmdr2
bae0bec1cc Change the image buttons plugins to a list instead of a dict 2022-10-19 21:21:19 +05:30
cmdr2
602686a5d2 Move the current implementation of upscale/redo/double size into a custom plugin 2022-10-19 20:27:06 +05:30
cmdr2
af05d94198 Allow plugin buttons for image overlay to decide whether they should be displayed or not 2022-10-19 20:10:45 +05:30
cmdr2
5fa3a7ca44 UI-side plugin system; Use PLUGINS['IMAGE_INFO_BUTTONS'] to add additional buttons on the generated images 2022-10-19 19:50:05 +05:30
cmdr2
9609350789 Rework the API for image buttons 2022-10-19 18:23:34 +05:30
cmdr2
9c1e73ffff Fix missing auto-save.css include 2022-10-19 18:10:22 +05:30
cmdr2
50741c70c0 Add a 'Make Similar Images' button 2022-10-19 17:26:35 +05:30
Marc-Andre Ferland
fc8660df78 Faster response on invalid settings when CPU was specified with GFPGANer. 2022-10-19 05:19:16 -04:00
Marc-Andre Ferland
4e5ddca3bd Display the failure detail when there is one at that step.
Was checking the json object, not the server response.
2022-10-19 05:10:37 -04:00
Marc-Andre Ferland
3bdc90451a Dont preload on cpu. 2022-10-19 04:34:54 -04:00
Marc-Andre Ferland
a036b2981a Removed forgotten mention of CPU in message to user. 2022-10-19 04:31:57 -04:00
Marc-Andre Ferland
8fae83dab7 Print value to console for better debug from logs. 2022-10-19 04:26:09 -04:00
cmdr2
083f9dd29b Bump version 2022-10-19 13:50:36 +05:30
cmdr2
7d5fabbd25 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-10-19 13:50:17 +05:30
cmdr2
105f071847 Expand curly braces in prompts, for e.g. 'hello {foo,bar}' => 'hello foo' and 'hello bar' 2022-10-19 13:50:05 +05:30
Marc-Andre Ferland
ef68e5b13d Added warning about validating config. 2022-10-19 04:16:46 -04:00
Marc-Andre Ferland
21afe077d7 Removed Cpu from the devices allowed to run GFPGANer.
Added clear error for the user.
2022-10-19 03:02:26 -04:00
Malcolm Diller
48222ce44c updated to make autosaving on by default and updated some of the new logic 2022-10-18 22:13:45 -07:00
cmdr2
0922ba938c Remove unnecessary tabs 2022-10-19 09:59:18 +05:30
Marc-Andre Ferland
3fc66ec525 Removed empty lines left over from merge. 2022-10-19 00:27:51 -04:00
cmdr2
44191cd908 Merge pull request #357 from rbertus2000/beta
fixed img_id for parallel renders
2022-10-19 09:57:05 +05:30
Marc-Andre Ferland
0da0c6bd77 Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu 2022-10-19 00:26:09 -04:00
Marc-Andre Ferland
6098b196dc Text header, comments and better validations. 2022-10-18 23:58:55 -04:00
Malcolm Diller
0922349344 made some updates and moved some stuff to auto-save js 2022-10-18 20:49:58 -07:00
Marc-Andre Ferland
53cdeeff03 More fixes to devices changing names. 2022-10-18 21:08:04 -04:00