holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,209 Commits 12 Branches 36 Tags 62 MiB
840348b4eb
Commit Graph

494 Commits

Author SHA1 Message Date
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
Marc-Andre Ferland
fcdb086daf Fixed is_alive to work with devices that can change name after init. 2022-10-18 20:33:37 -04:00
rbertus2000
d2d9c2dd0f fixed corresponding txt file id 2022-10-19 01:17:44 +02:00
rbertus2000
4241fb9386 fixed img_id for parallel renders 2022-10-18 22:38:37 +02:00
Marc-Andre Ferland
cfd6751777 Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu 2022-10-18 13:21:26 -04:00
Marc-Andre Ferland
5e461e9b6b Fixed is_alive with render_threads that can update the device name after starting. 2022-10-18 13:21:15 -04:00
cmdr2
946dfdf7b8 Bring back the upscale/double/redo buttons 2022-10-18 22:29:15 +05:30
cmdr2
4da9843479 Move image modifiers JS to a separate file 2022-10-18 22:28:04 +05:30
cmdr2
eccb3c643d Separate the inpainting editor JS into a separate file 2022-10-18 22:09:11 +05:30
cmdr2
bfa5a51ce8 Use a local copy of fontawesome, to allow working offline 2022-10-18 21:40:17 +05:30
cmdr2
9066ad6cdf Use locally hosted fonts, to be able to work offline 2022-10-18 21:06:56 +05:30
cmdr2
f7b513dff2 Refactor the CSS and JS into separate files, attempt 1 2022-10-18 20:18:56 +05:30
cmdr2
2f2bddf020 Allow empty prompts; Allow collapsing a results box for an empty prompt 2022-10-18 19:02:34 +05:30
cmdr2
ac7a5488ee Disable the upscale/redo/double size buttons temporarily, so that the release can proceed to main 2022-10-18 18:50:47 +05:30
cmdr2
6de93d4fbb Reduce the padding around the screen edges 2022-10-18 16:28:18 +05:30
cmdr2
8a312f76c5
Merge pull request #352 from madrang/HTTPException-fix 
Replaced 'return HTTPException' by 'raise HTTPException'
 2022-10-18 16:23:31 +05:30
cmdr2
4a956b5a55 Make the label 10pt 2022-10-18 16:20:35 +05:30
cmdr2
83d6c3ba88 Fix the broken 'time remaining' counter 2022-10-18 16:12:17 +05:30
cmdr2
b23bc4a5b6 Don't disable the random field when the output image is used as the new init image 2022-10-18 14:49:39 +05:30
Marc-Andre Ferland
940236b4a4 Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu 2022-10-18 03:23:42 -04:00
Marc-Andre Ferland
372484f976 Fixed theme loading with extensions. 2022-10-18 03:21:59 -04:00
Marc-Andre Ferland
3c8692d06c Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into multi-gpu 2022-10-18 02:52:50 -04:00
Marc-Andre Ferland
04fe81e001 Merge branch 'HTTPException-fix' into multi-gpu 
# Conflicts:
#	ui/server.py
 2022-10-18 02:36:57 -04:00
Malcolm Diller
d2215c2ba9 removed accent hue in a couple places where it didnt need to be specified 2022-10-17 23:36:05 -07:00
Marc-Andre Ferland
89b1b6e242 Replaced 'return HTTPException' by 'raise HTTPException' 2022-10-18 02:30:30 -04:00
Malcolm Diller
e476d68848 fixed a couple things and added some more themes 2022-10-17 23:19:22 -07:00
Malcolm Diller
da8835bc77 updated to behave better and apply variables that are dependant 2022-10-17 23:00:08 -07:00
Malcolm Diller
f170c2611c Merge branch 'beta' into mdiller_themes 2022-10-17 22:23:02 -07:00
Malcolm Diller
351b17d1d9 added a theme dropdown box 2022-10-17 22:22:27 -07:00
cmdr2
926e3e2712
Merge pull request #351 from madrang/fix-bug332 
Force encoding to utf-8 on text file operations Fixes #332
 2022-10-18 09:40:54 +05:30
Marc-Andre Ferland
578b3ba4f4 Force encoding to utf-8 on text file operations Fixes #332 
# Conflicts:
#	ui/server.py
 2022-10-17 23:15:36 -04:00
Marc-Andre Ferland
5b0b582039 Force encoding to utf-8 on text file operations Fixes #332 2022-10-17 22:38:29 -04:00
Marc-Andre Ferland
e24be913e5 Merge branch 'beta' into multi-gpu 2022-10-17 21:35:24 -04:00
Marc-Andre Ferland
4d3358ba66 Fixed file path bugs introduced by mistake and made img_id sequential based on time for better sorting of renders. 2022-10-17 21:29:14 -04:00
Marc-Andre Ferland
ffe40fa3a3 Fixed file path bugs introduced by mistake and made img_id sequential based on time for better sorting of renders. 2022-10-17 21:27:15 -04:00
Marc-Andre Ferland
87f93b34a3 Fixed a typo when adding a comment. 2022-10-17 14:44:53 -04:00
cmdr2
03bd9a5731 Temporary fix for lagging progress updates check 2022-10-17 21:53:46 +05:30
cmdr2
cb82170187 Fix the bug where custom models weren't getting picked up 2022-10-17 21:22:05 +05:30
cmdr2
5b9e16af83 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-10-17 18:40:14 +05:30
cmdr2
7b1b2a4bef Enable auto-save of settings by default 2022-10-17 18:40:04 +05:30
cmdr2
320acfae89 Cosmetic tweaks to loading status 2022-10-17 18:04:46 +05:30
cmdr2
22bf3618ea Bump version 2022-10-17 17:56:52 +05:30
cmdr2
5f1593f4d0 Style the busy and waiting colors 2022-10-17 17:52:55 +05:30
cmdr2
9af75bf9b2 Don't throw an error if a task was stopped before it started processing 2022-10-17 17:41:27 +05:30
cmdr2
344fa729a5 Don't stop another session's task when the 'Stop All Tasks' button is pressed 2022-10-17 17:36:20 +05:30
cmdr2
24dfc09f35
Merge branch 'beta' into task-queue-rendering 2022-10-17 15:22:54 +05:30
cmdr2
e533bc0847
Merge pull request #330 from madrang/use_cpu_fix 
Update use_cpu on Redo and Double Size to move renders to/from cpu and gpu after starting.
 2022-10-17 15:22:13 +05:30
cmdr2
306333ceba
Merge pull request #345 from cmdr2/main 
Update the troubleshooting link to the new wiki page
 2022-10-17 15:17:05 +05:30
cmdr2
e96312b470 Update the troubleshooting link to the new wiki page 2022-10-17 15:16:31 +05:30
cmdr2
ee80aa26db Lighter color on hover for input elements 2022-10-17 14:34:48 +05:30
cmdr2
a45e667e9c Fix a bug (after merge) where the image info wouldn't get set 2022-10-17 14:19:16 +05:30
cmdr2
1b4a2369bb Don't save prompts by default 2022-10-17 13:48:06 +05:30
cmdr2
224483f6ac Rearrange the prompts box - move the prompt load button to the top, hide negative prompts behind a collapsible 2022-10-17 13:45:08 +05:30
cmdr2
c61574b782 Fix typo while merging b1dd4069db to beta 2022-10-17 13:04:33 +05:30
Marc-Andre Ferland
c92129ac63 Improved detection of missing cuda:0 and added warning to console about how to fix. 2022-10-17 03:32:23 -04:00
cmdr2
6c71d95932 Bump version 2022-10-17 13:01:31 +05:30
ZacTheHac
dc402f5f0e Downloaded images named with their correct prompt and settings 2022-10-17 12:57:45 +05:30
cmdr2
188894c837 Push back the auto-save settings change by @mdiller 2022-10-17 12:44:05 +05:30
cmdr2
fb4fbd23d8
Revert "Auto-saving Settings" 2022-10-17 11:40:01 +05:30
cmdr2
f58b2383b9 Revert "Fix typo while merging" 
This reverts commit 05caf1fe28.
 2022-10-17 11:39:51 +05:30
cmdr2
05caf1fe28 Fix typo while merging 2022-10-17 11:36:02 +05:30
cmdr2
1ec023b435
Merge branch 'beta' into mdiller_beta 2022-10-17 11:34:50 +05:30
cmdr2
edf2b2df6f Bump version; Shrink the size of the editor panel and font size 2022-10-17 11:21:35 +05:30
Marc-Andre Ferland
554b67a2f0 Fixing bug in is_alive. 2022-10-17 01:05:51 -04:00
Marc-Andre Ferland
012243a880 Process GPU tasks on CPU when there are no cuda devices at all. 2022-10-17 01:05:27 -04:00
Marc-Andre Ferland
d4a348a2b2 Process GFPGANer on cuda:0 when possible, otherwise use cpu. 2022-10-16 23:12:46 -04:00
Marc-Andre Ferland
1d4c5cc96f Added clear error response when submitting tasks that requires GFPGANer if cuda:0 and cpu rendering is disabled. 2022-10-16 23:07:55 -04:00
Marc-Andre Ferland
41bfb96b6b Fixed bug in task_manager.is_alive and added way to check for first device. 2022-10-16 23:06:41 -04:00
Marc-Andre Ferland
994d62ac65 Added a clear error message when targeting CPU if not enabled in config. 2022-10-16 22:26:05 -04:00
Marc-Andre Ferland
7c72608e1c First draft for Multi-GPU support 2022-10-16 21:41:39 -04:00
Marc-Andre Ferland
2edc06c662 Forgot to update UI if failed to get new server state 2022-10-16 21:32:59 -04:00
Malcolm Diller
f80602b51a tweaked styling of the size hint for the image 2022-10-15 18:39:56 -07:00
Malcolm Diller
58d8a5ce46 added support for theming buttons 2022-10-15 18:34:59 -07:00
Malcolm Diller
72a65218be updated some of the styling and positioning of some stuff 2022-10-15 18:04:41 -07:00
Malcolm Diller
1b0d5b710e fixed styling to work properly for mobile 2022-10-15 17:26:52 -07:00
Malcolm Diller
2a25ac0847 reorganized colors to make them themeable 2022-10-15 16:41:38 -07:00
Malcolm Diller
9aefdf35a1 fixed bug with prompt strength showing up during non-img2img stuff 2022-10-15 15:30:04 -07:00
Malcolm Diller
231961c017 removed newline from end of mainjs file 2022-10-15 15:25:36 -07:00
Malcolm Diller
ee621fa091 pruned out all the auto-settings saving stuff 2022-10-15 15:23:48 -07:00
Malcolm Diller
a69a04cfb6 reorganized and fixed the auto-save settings stuff so its all in its own file 2022-10-15 15:10:42 -07:00
Malcolm Diller
b1aed344c7 moved auto-save settings stuff to new file and removed ui changes from main.js. this not done, just first step 2022-10-15 14:54:34 -07:00
Malcolm Diller
3e08d665c7 removed non-settings related stuff from html 2022-10-15 14:46:18 -07:00
Malcolm Diller
4a94c86433 removed stuff from styling that wasnt settings-related 2022-10-15 14:41:57 -07:00
Marc-Andre Ferland
982b5221b1 Improved serverState tracking 2022-10-15 05:48:12 -04:00
Marc-Andre Ferland
cbdf03450d Added timeout to critical locking tasks with matching exception 2022-10-15 05:31:17 -04:00
Marc-Andre Ferland
7625e591fe Fixed output_dir not liking the move to JSONResponse 2022-10-15 04:47:12 -04:00
Marc-Andre Ferland
8fdb1e7ec9 Improved locking and logging when cleaning old cached sessions. 2022-10-15 04:39:45 -04:00
Marc-Andre Ferland
d3b28c42e6 Better error handling with cache.put 2022-10-15 04:08:17 -04:00
Marc-Andre Ferland
1b32423881 Renamed a missing ServerStates to task_manager.ServerStates 2022-10-15 03:32:00 -04:00
Marc-Andre Ferland
7de699c7fa Moved a lot of code into task_manager.py 2022-10-15 03:28:20 -04:00
Marc-Andre Ferland
e9f9670eb5 Changed '/get' from a query to a path parameter 2022-10-15 01:32:53 -04:00
Marc-Andre Ferland
3d4e961320 time.time() is in seconds not ms. 2022-10-15 00:51:06 -04:00
Marc-Andre Ferland
ff3db04ab7 temp_images needs twice the size if show_only_filtered_image is false 2022-10-14 23:21:44 -04:00
Marc-Andre Ferland
c7f6763c48 Runtime cleanup and moved apply_filters to it's own function 2022-10-14 23:20:57 -04:00
ZacTheHac
b1dd4069db Downloaded images named with their correct prompt and settings 2022-10-14 19:46:31 -07:00
Malcolm Diller
58c647d433 updated to fix the formatting to make for a cleaner diff in the pull request 2022-10-14 17:30:54 -07:00
Malcolm Diller
333ea4aa53 added a bunch of changes including cleaning up styling and inputs and adding auto-saving settings. see PR for more info. 2022-10-14 17:30:54 -07:00
cmdr2
3ad59da2a9 Move negative prompt box next to the main prompt box 2022-10-14 23:01:23 +05:30
cmdr2
2d9b211eeb Reduce the size of the prompt header in the task list 2022-10-14 22:58:36 +05:30
Marc-Andre Ferland
4f5a352985 Update use_cpu using UI on Redo and Double Size 2022-10-14 12:08:22 -04:00
Marc-Andre Ferland
6ae3b77c2f LoadingModel detection 2022-10-14 06:03:18 -04:00
Marc-Andre Ferland
4a7260b1be StopAsyncIteration should not trigger HTTP500. 
Now returns faster into the ready state.
 2022-10-14 05:20:44 -04:00
Marc-Andre Ferland
f91c77bdc6 Failed task go immediately into the buffer state with the error. 2022-10-14 04:47:13 -04:00
Marc-Andre Ferland
476e938d23 Forgot a color change for batched tasks. taskStatusLabel could have class activeTaskLabel replace by waitingTaskLabel again. 2022-10-14 04:18:34 -04:00
Marc-Andre Ferland
1ec9d986bb Render queue first draft 2022-10-14 03:47:25 -04:00
Marc-Andre Ferland
4b88cfa51a More simple time check 2022-10-14 03:43:33 -04:00