Commit Graph

421 Commits

Author SHA1 Message Date
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
Marc-Andre Ferland
bc56226a28 Grouped many endpoints into one 2022-10-14 03:42:43 -04:00
Marc-Andre Ferland
a6e5474fdb CSS waitingTaskLabel for task waiting to start 2022-10-14 00:56:04 -04:00
Marc-Andre Ferland
5ba1ae9ae4 Remove trailing coma in promptMatrix when activeTags is empty 2022-10-13 00:45:29 -04:00
Marc-Andre Ferland
197a89a37a Only comments changes to better describe buffering cases. 2022-10-12 03:08:25 -04:00
Marc-Andre Ferland
d336ead3b1 Updated old comments of doMakeImage to better reflect the updated reading process. 2022-10-12 02:57:09 -04:00
Marc-Andre Ferland
662644663e Improved redo when used with in-pictures editor 2022-10-12 02:32:00 -04:00
Marc-Andre Ferland
4c7819effb Corrected an issue when resuming background page on mobile and added comments to stream reader. 2022-10-12 00:33:00 -04:00
Marc-Andre Ferland
8b5b9ee8f1 Fix error on stopping tasks. 2022-10-11 23:15:06 -04:00
Marc-Andre Ferland
89b911a9dc Original code was missing a check on 'success' to abort failed tasks. 2022-10-11 22:04:41 -04:00
Marc-Andre Ferland
b673e216b6 In a batched task, keep all error messages.
If there are other batches in the task sent,
it should not remove previous errors.
2022-10-11 21:53:08 -04:00
Marc-Andre Ferland
a1b2f0ccf1 Reordered error checks to first check task status,
If none use connection status and the last step is now the generic message.
2022-10-11 20:10:40 -04:00
Marc-Andre Ferland
f269facf9d Stop hiding exceptions after read is complete. 2022-10-11 20:08:44 -04:00
Marc-Andre Ferland
5a36d280d7 Improve error display to always have some debug informations present. 2022-10-11 18:40:05 -04:00
Marc-Andre Ferland
c39563b123 Track read complete to read buffer until the end. 2022-10-11 18:38:23 -04:00
Marc-Andre Ferland
548149de8e Removed a nested try/catch that wasn't displaying all the informations.
Kept the outside try/catch that had better logging.
2022-10-11 16:42:27 -04:00
Marc-Andre Ferland
d6d4ce0ac4 Moved done check after data read in 'doMakeImage'. 2022-10-11 16:19:34 -04:00
Marc-Andre Ferland
83b0239791 Fixed an old hidden parsing crash that was there but hidden by the old try/catch block. 2022-10-11 15:32:06 -04:00
Marc-Andre Ferland
d1fa13d67a e.message wont start with 'JSON.parse' on mobile.
Removed message check but made the try/catch more narrow to not hide other errors.
2022-10-11 13:52:18 -04:00
Marc-Andre Ferland
3abd570678 Enable strict mode to throw errors on any undeclared variables. 2022-10-10 22:31:47 -04:00
Marc-Andre Ferland
b0b0781bd7 Use requestIdleCallback if available 2022-10-10 22:30:17 -04:00
Marc-Andre Ferland
1aa28ddee1 Improved Redo and DoubleSize 2022-10-10 22:29:15 -04:00
Marc-Andre Ferland
09b50badb1 Fix removing old tasks stopping the current render. 2022-10-10 22:28:34 -04:00
Marc-Andre Ferland
7060108a8b Don't hide errors if they are unexpected. 2022-10-10 22:27:49 -04:00
Marc-Andre Ferland
e6f0d5bf44 Fixed a few undeclared variables I found. 2022-10-10 22:27:15 -04:00
Marc-Andre Ferland
781effc34e Splitted ImgX2 into Redo and Double Size. 2022-10-10 04:06:15 -04:00
Marc-Andre Ferland
324c8f8146 Fixed showImages to clone batched reqBody and not reuse same objects. 2022-10-10 02:32:27 -04:00
Marc-Andre Ferland
27e372e38f Clone the complete task object instead of only reqBody.
Avoids altering already completed tasks for reruns.
2022-10-10 02:31:02 -04:00
Marc-Andre Ferland
87122ce211 Each output render need it own instance of reqBody to avoid altering the other runs after they are completed. 2022-10-09 21:18:27 -04:00
Marc-Andre Ferland
c0c6675423 Removed dead code 2022-10-09 21:16:42 -04:00
Marc-Andre Ferland
fa4aeb5261 Only replace existing seeds when needed. 2022-10-09 21:16:24 -04:00
Marc-Andre Ferland
4e51eeb998 Bug fixes for createTask, use task object, not UI infos. 2022-10-09 19:59:34 -04:00
Marc-Andre Ferland
a27c3f09b3 Renamed getStartUpscaleHandler to getStartNewTaskHandler and added new tasks types. 2022-10-09 19:58:16 -04:00
Marc-Andre Ferland
3e5f117066 Cleaned up button creation for new tasks 2022-10-09 19:56:51 -04:00
Marc-Andre Ferland
3753fb3ea4 Added upscale button with matching 'getStartUpscaleHandler' function. 2022-10-09 07:19:00 -04:00
Marc-Andre Ferland
d3e49cf1e9 Cleanup of 'createTask' 2022-10-09 07:17:43 -04:00
cmdr2
d93f3468d3
Merge pull request #303 from madrang/resize-inpainting-disable
Resize in-painting disable
2022-10-08 19:48:43 +05:30
cmdr2
83032e858a Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-10-08 18:22:13 +05:30
cmdr2
6855e314b3 Store the output format setting in localStorage 2022-10-08 18:22:01 +05:30
Marc-Andre Ferland
2c4a8619a8 Only 'resizeInpaintingEditor' if 'aspectRatio' has changed. 2022-10-08 08:42:25 -04:00
Marc-Andre Ferland
68dd9a29e8 Run 'resizeInpaintingEditor' once when 'maskSetting' is changed. 2022-10-08 07:56:01 -04:00
Marc-Andre Ferland
68c4b55945 Disable 'resizeInpaintingEditor' when 'maskSetting' is unchecked. 2022-10-08 07:55:24 -04:00
cmdr2
5f24e4d705 Increased the inpainting editor size; Fix a bug with the brush size not resetting 2022-10-08 16:53:47 +05:30
cmdr2
66c7b3fcb2 Don't use setAttribute to overwrite the style 2022-10-08 16:47:15 +05:30
cmdr2
1ffe29c657
Merge pull request #301 from madrang/resizeCanvas
Resize canvas following selected aspect ratio
2022-10-08 16:37:11 +05:30
cmdr2
6b7d4877e6 Initial implementation of prompt matrix - creates multiple task entries for the different permutations 2022-10-08 15:56:56 +05:30
Marc-Andre Ferland
80826eb500 Add min-width to .drawing-board-controls to keep the in-painting controls on one line. 2022-10-08 05:54:53 -04:00
Marc-Andre Ferland
11962facde resize 'inpaintingEditor' on change from 'widthField' and 'heightField' 2022-10-08 05:53:44 -04:00
cmdr2
7ae70d5a4d Don't delete the model variables twice 2022-10-08 13:58:44 +05:30
cmdr2
883dc72fc6 Unload the previous model while reloading 2022-10-08 13:19:18 +05:30
cmdr2
3b923e0d37 Didn't fix the ckpt bug properly 2022-10-08 12:48:37 +05:30
cmdr2
a208564f06 Wait for the model to load before changing the global 'model loaded' state 2022-10-08 12:35:23 +05:30
cmdr2
55d05ee590 Use euler_a and num_inference_steps 25 as the default 2022-10-07 23:54:42 +05:30
cmdr2
66f39e070b Read prompts from a text file; Allow specifying multiple prompts in the textbox by separating them by new lines 2022-10-07 23:46:56 +05:30
cmdr2
cec203a6db Allow saving in jpeg or png format; Default to saving in jpeg 2022-10-06 15:05:34 +05:30
cmdr2
cf8bb9efb0 Don't reload the model when using an initial image; Work in half-precision for txt2img as well, no change in the output image noticed 2022-10-06 14:42:47 +05:30
cmdr2
201a053025 Support an arbitrary number of custom models, placed in the models/stable-diffusion folder. Shows an option in the UI to select which model to use 2022-10-06 14:28:02 +05:30
cmdr2
ccfa32ce93 Report the error in the UI. Regression after switching to the task queue 2022-09-30 10:53:30 +05:30
cmdr2
196649c0e9 Use the correct seed from the response 2022-09-29 13:55:09 +05:30
cmdr2
12182ee04f Newer images go on top 2022-09-29 13:52:48 +05:30
cmdr2
5db64526cc Fix a bug where batches would overwrite the previous images inside a task 2022-09-29 13:43:25 +05:30
cmdr2
5c2ec70eb4 Hide the sampler field when an output image is used as the new input 2022-09-29 13:12:01 +05:30
cmdr2
24a2c6251f Remove log statement 2022-09-29 13:08:58 +05:30
cmdr2
0d035d9ae9 Remove unnecessary semicolons 2022-09-29 13:08:42 +05:30
cmdr2
a28f1294e2 Integrate with beta; Use the outputContainer for the task; Don't show the info while a live preview is generating; Use the local task container reference instead of a seed-based identifier (will fail if the seed is same across two tasks) 2022-09-29 13:01:18 +05:30
cmdr2
c2dec9eac4
Merge branch 'haka-fix' into main 2022-09-29 12:00:44 +05:30
cmdr2
b4c68a8ae5 Save the negative prompt in the text file 2022-09-28 18:33:08 +05:30
cmdr2
34023f66f0 Bump version 2022-09-28 15:10:24 +05:30
cmdr2
2696da7337 Allow using a custom ckpt model 2022-09-28 15:10:05 +05:30
cmdr2
553525a0fb Make the task entries collapsible 2022-09-28 13:44:48 +05:30
cmdr2
38ebb95e63 Bring the bell back 2022-09-28 13:17:45 +05:30
Haka
10c4bee1e5 Fix for show all images 2022-09-28 00:05:34 +03:00
cmdr2
32bafd8b01 Stop batched tasks properly 2022-09-27 20:05:22 +05:30
Haka
c1dea44fa6 Fix for live preview 2022-09-27 17:23:19 +03:00