Commit Graph

924 Commits

Author SHA1 Message Date
cmdr2
1309f1480c Tabs to spaces 2023-01-10 19:48:36 +05:30
cmdr2
12ba5b8096
Merge pull request #753 from JeLuF/modeldir
Recursive scanning for models
2023-01-10 19:29:27 +05:30
cmdr2
1da4b3d94a
Not all browsers return the PerformanceEntry object on performance.measure(). Fix credit @JeLuf 2023-01-10 10:01:24 +05:30
patriceac
18aca98e41
Fix image editor display
Fix for the cut off controls
2023-01-09 09:29:31 -08:00
JeLuF
a88afb0956 Add paths to the value field 2023-01-09 18:24:04 +01:00
patriceac
bfa1f57930
Fix rendering of very large images
See comments for screenshots.
2023-01-09 09:21:16 -08:00
cmdr2
3ed4d792b3 Check whether the browser supports performance.measure/mark before calling them. Fixes https://github.com/cmdr2/stable-diffusion-ui/pull/757 2023-01-09 19:41:10 +05:30
cmdr2
a17a9044ad Check whether the browser supports performance.measure/mark before calling them. Fixes https://github.com/cmdr2/stable-diffusion-ui/pull/757 2023-01-09 19:33:23 +05:30
cmdr2
73af7f5481 Use a boolean .includes() instead of a regex match() for checking string contains 2023-01-09 19:19:30 +05:30
cmdr2
57ead7f0c0
Merge pull request #752 from patriceac/patch-14
Fix parsing of text file tasks
2023-01-09 19:16:36 +05:30
cmdr2
b11aa4833d
Merge pull request #724 from patriceac/img2img-settings-restoration
Img2img settings restoration
2023-01-09 18:36:32 +05:30
patriceac
8d9cd0e30b
Fix display of very large images 2023-01-07 15:04:07 -08:00
JeLuF
9532928998 Recursive scanning for models 2023-01-07 19:04:15 +01:00
patriceac
420f7549a2
Fix parsing of text file tasks
parseContent(text) doesn't check the text content being passed actually described a task, which causes some corner case scenarios to break (image task settings are incorrectly cleared because an empty image task is created).
2023-01-07 00:47:30 -08:00
AssassinJN
567c02bf5d
return taskEntry.id on createTask
I would like to have createTask return the taskEntry.id in order to allow for watchers or callbacks to be able to reference tasks by id more easily.
2023-01-04 10:04:52 -05:00
JeLuF
d5e76e662f Enforce a autosave directory 2022-12-30 21:05:25 +01:00
Malcolm Diller
f75adc1e22 added fill tool and updated as requested in pull request 2022-12-30 01:07:46 -08:00
patriceac
813edec808 Removing one more unnecessary custom event 2022-12-29 09:43:12 -08:00
patriceac
21e3299b7a Applying changes from latest CR
- Replaced custom event with load event
- Removed the custom event dispatch
2022-12-29 09:26:32 -08:00
patriceac
f7193966fb Addressing Cmdr2's comments and more
Only triggers events when there actually was a state  change. Also opportunistically removed the hardcoded delay in favor of an even-driven flow, which makes the whole thing more robust and much more reactive.
2022-12-29 01:16:44 -08:00
patriceac
58c7f3ba15
ESC keyboard shortcut to close the image editor 2022-12-28 23:50:56 -08:00
cmdr2
b86617e3af
Merge pull request #720 from patriceac/restore-inactive-modifiers
Proper restoration of inactive image modifiers
2022-12-29 10:28:28 +05:30
cmdr2
f9b9ecf754
Merge branch 'beta' into patch-8 2022-12-29 10:26:48 +05:30
cmdr2
af43a92a2f
Merge pull request #725 from patriceac/patch-9
Limit the size of zoomed-in source images
2022-12-29 10:18:17 +05:30
cmdr2
4dbdc642f9
Merge pull request #726 from patriceac/patch-10
Persist the processing order toggle across sessions
2022-12-29 10:17:24 +05:30
patriceac
ae31813239
Restore the original prompt if provided
Restore the original prompt if provided... including if it's empty now that empty prompts are allowed if there are modifiers.
2022-12-28 18:52:18 -08:00
patriceac
f6b3cde286
Persist the process order toggle across sessions
🤷
2022-12-28 17:50:18 -08:00
patriceac
0f05f9c32c
Limit the size of zoomed-in source images
If the source image has a high enough resolution it won't fit on the screen when hovering over it. This simple fix limits the max size so the user always has a chance to see the full image.
2022-12-28 17:30:59 -08:00
patriceac
89170af721 Proper source image unloading 2022-12-28 17:00:38 -08:00
patriceac
5fddae589b Reverting duplicate hypernetwork fix 2022-12-28 16:54:36 -08:00
patriceac
19c16af5fa Fix img2img task restoration
Fix source image, mask, and color profile restoration for use settings, copy/paste, and d&d.
2022-12-28 16:43:35 -08:00
patriceac
019f8f69f4
Fix restoration of hypernetwork dropdown
Fix for https://discord.com/channels/1014774730907209781/1014774732018683928/1055508538228748368
2022-12-28 15:55:59 -08:00
patriceac
ad8d1f77df Proper restoration of inactive image modifiers
Inactive image modifiers (right click on image tag) are not properly restored by Use Settings and Copy/Paste settings. This PR fixes that.
2022-12-28 13:41:36 -08:00
patriceac
2859c94fea
Applying Madrang's suggestion 2022-12-27 23:36:43 -08:00
patriceac
dbcce2ee5d
Default to 4x in taskConfig 2022-12-27 23:27:25 -08:00
cmdr2
15a4682665 Fix broken drag-and-drop for text files and clipboard paste 2022-12-27 17:06:46 +05:30
cmdr2
852e129f9c Support upscaling by 2x or 4x (previously only supported 4x) 2022-12-27 16:20:16 +05:30
cmdr2
6eb2d800fa Tweak low GPU wording 2022-12-27 14:58:08 +05:30
cmdr2
0a2c70595d Turbo be gone 2022-12-27 14:51:03 +05:30
cmdr2
f364958c13
Merge pull request #705 from patriceac/fix-cut-off-tooltips-display
Fix cut off tooltips display
2022-12-27 10:26:46 +05:30
cmdr2
e65150647d
Merge pull request #708 from patriceac/patch-6
Add icon to "Process newest jobs first" setting
2022-12-27 10:25:45 +05:30
patriceac
871b96a450
Add icon to "Process newest jobs first" setting 2022-12-26 19:10:37 -08:00
patriceac
48a3254ad2 Adding image modifiers events
Adding events to allow plugins to listen for image modifiers loaded and refreshed events respectively.
2022-12-26 12:16:36 -08:00
patriceac
2c0bdd6377 Fix cut off tooltips display 2022-12-26 10:04:36 -08:00
cmdr2
19ee87d2cd
Merge pull request #692 from JeLuF/remove-result
Add "Remove" button to each image's hover menu (Fixes #682)
2022-12-26 17:38:00 +05:30
patriceac
0bfb9d00c8 Fix copy image settings to clipboard
Regression was caused by the processing of the legacy turbo field, which I understand to now be obsolete.
2022-12-26 02:10:36 -08:00
cmdr2
102e5623f7 Merge branch 'beta' into refactor 2022-12-24 23:14:02 +05:30
cmdr2
84bddee2ce Treat none as a boolean false in drag-and-drop 2022-12-24 19:41:36 +05:30
Marc-Andre Ferland
04d67a24b6 Don't allow the results to be collapsed when clicking draghandle 2022-12-24 04:55:28 -05:00
Marc-Andre Ferland
55049ba9d2 Add a debounce delay to allow mobile to bouble tap. 2022-12-24 04:42:43 -05:00
cmdr2
b7a76d4212 Merge branch 'beta' into refactor 2022-12-24 13:45:53 +05:30
JeLuF
4eae540086
Add "Remove" button to each image's hover menu 2022-12-24 01:02:38 +01:00
JeLuF
21108650f7
add findClosestAncestor
Function to find the closest ancestor of an element that matches the selection criterion
2022-12-24 00:58:52 +01:00
cmdr2
cf2408013e
Measure the click-to-render-request latency, only if the click button was used 2022-12-23 10:54:40 +05:30
cmdr2
c2bcf89f9a Merge branch 'beta' into refactor 2022-12-22 15:42:04 +05:30
cmdr2
21394b7d45 Reduce the delay between clicking 'Make Image' and making the render call to the server. Was nearly 4-5 seconds, now it's about 250-300ms. This is a hacky workaround until a better solution is found 2022-12-22 15:22:25 +05:30
cmdr2
6e07b2354f Fix an unnecessary error when a task header is clicked 2022-12-22 13:42:47 +05:30
Malcolm Diller
5474d1786f updated inpainter to not auto-clear itself whenever you draw etc 2022-12-21 16:35:03 -08:00
Malcolm Diller
7f36473544 added a fill action 2022-12-21 16:20:07 -08:00
Malcolm Diller
9d19698bf3 fixed opacity on inpainter to be 100% by default so no weird erasing 2022-12-21 16:09:56 -08:00
Malcolm Diller
582b2d936f fixed theme css properties not being updated properly 2022-12-21 16:03:52 -08:00
JeLuF
e47e54de3f Only activate the dragOver event listener when dragging tasks 2022-12-19 20:34:06 +01:00
AssassinJN
54f9e9bfe9
adding drag and drop styles
Add functions required for adding styles to imageTaskContainer to show where images will be dropped.
2022-12-19 13:45:42 -05:00
AssassinJN
e1875c872c
classes for drag and drop
Added classes for drag and drop.
2022-12-19 13:44:15 -05:00
cmdr2
bf6c222a3b
Merge pull request #641 from JeLuF/pause
Pause button
2022-12-19 11:52:55 +05:30
cmdr2
6afcf7570a
Merge pull request #671 from patriceac/allow-empty-prompts
Allow empty prompts (image modifiers only)
2022-12-19 11:50:18 +05:30
cmdr2
c3126f7b4d
Merge pull request #673 from jsuelwald/patch-1
Change time display on job
2022-12-19 11:48:38 +05:30
JeLuF
64a751ad79
Merge branch 'beta' into pause 2022-12-19 00:55:56 +01:00
JeLuF
39350d554b Remove old code 2022-12-19 00:32:13 +01:00
JeLuF
8f4e03550c Add drag handle 2022-12-19 00:14:57 +01:00
jsuelwald
22ffd25619
Change time display on job
Change "Processed 1 image in 150.65 seconds" to "Processed 1 Image in 2 minutes 30 seconds" to be consistent with the approx. time remaining while rendering
2022-12-18 07:20:42 +01:00
patriceac
127949c56b Allow empty prompts (image modifiers only)
Allows empty prompts as long as there are image modifiers. This allows the user to craft prompts just by using image modifiers if they so wish.
2022-12-17 17:06:07 -08:00
patriceac
1cae39b105 Fire an event when a collapsible is toggled
Need an event to know that a collapsible got toggled to be able to resize the panels accordingly. Thanks!
2022-12-17 03:05:43 -08:00
cmdr2
c4548d9396
Merge pull request #669 from JeLuF/hover
CSS only initimg hover, 'use as input' button
2022-12-17 09:50:46 +05:30
cmdr2
aea70e3dd4
Merge pull request #668 from JeLuF/imgedit
Fix img resize issues, add redo/undo buttons
2022-12-17 09:50:07 +05:30
JeLuF
3b01e65e11 CSS only initimg hover, 'use as input' button 2022-12-17 01:30:30 +01:00
JeLuF
341c810bbb Fix img resize issues, add redo/undo buttons 2022-12-17 00:29:54 +01:00
cmdr2
aa8b50280b Remove the test_sd2 flag, the code now works with SD 2.0 2022-12-16 15:31:55 +05:30
patriceac
62553dc0fa Fire an event upon tab change
Fire an event upon tab change.
2022-12-16 01:45:58 -08:00
cmdr2
25639cc3f8 Tweak Memory Usage setting text; Fix a bug with the memory usage setting comparison 2022-12-16 14:11:55 +05:30
cmdr2
7982a9ae25 Change the performance field to GPU Memory Usage instead, and use the 'balanced' profile by default, since it's just 5% slower than 'high', and uses nearly 50% less VRAM 2022-12-16 11:34:49 +05:30
cmdr2
aa01fd058e Set performance level (low, medium, high) instead of a Turbo field. The previous Turbo field is equivalent to 'Medium' performance now 2022-12-15 23:30:06 +05:30
cmdr2
fb075a0013 Fix whitespace 2022-12-14 16:53:50 +05:30
cmdr2
d1738baf44 Merge branch 'beta' into refactor 2022-12-14 16:53:23 +05:30
cmdr2
7eb29fa91b Fix: errors were overwritten by the time taken in the UI 2022-12-14 16:52:46 +05:30
cmdr2
12e0194c7f Allow None as the value type in dnd parsing 2022-12-14 16:30:08 +05:30
cmdr2
d1ac90e16d [metadata parsing] Support loading the flat JSON format saved by the next backend; Set the dropdown to None if the value is undefined or null in the metadata 2022-12-14 15:43:24 +05:30
cmdr2
7dc7f70582 Allow parsing .safetensors stable diffusion model path in the metadata parser 2022-12-14 10:34:36 +05:30
cmdr2
84d606408a Prompt is now a keyword in the new metadata format generated from diffusionkit 2022-12-14 10:31:19 +05:30
cmdr2
0dbce101ac sampler -> sampler_name 2022-12-14 10:21:44 +05:30
cmdr2
cb81e2aacd Fix a bug where the metadata output format wouldn't get sent to the backend 2022-12-14 10:18:01 +05:30
cmdr2
80bc80dc2c
removeTask() 2022-12-13 12:02:43 +05:30
cmdr2
ceff4f06c1 Merge branch 'beta' into refactor 2022-12-12 20:43:29 +05:30
cmdr2
92030a3917 Don't collapse the task entry if 'Stop Task' is pressed 2022-12-12 19:56:27 +05:30
cmdr2
5c4e6f7e96 Tweak editor width 2022-12-12 19:42:43 +05:30
cmdr2
8c032579b8 Hide the hypernetwork strength slider if no hypernetwork model is selected; Support drag-n-drop for hypernetwork models 2022-12-12 19:31:59 +05:30
cmdr2
b53935bfd4 Revert "Scrolling panes (#632)"
This reverts commit e3184622e8.
2022-12-12 19:03:16 +05:30
cmdr2
25f488c6e1 Merge branch 'beta' into refactor 2022-12-12 15:47:13 +05:30
cmdr2
fb32a38d96 Rename sampler to sampler_name in the API 2022-12-12 15:21:02 +05:30
cmdr2
d0e50584ea Expose the metadata format option in the UI 2022-12-12 14:06:20 +05:30
Marc-Andre Ferland
9947c3bcfb
Start timer to IDLE_COOLDOWN before idleEventPromise completes. (#649) 2022-12-12 11:12:11 +05:30
JeLuF
8faf6b9f52
Don't allow to make zero images, make at least one. (#647) 2022-12-12 11:11:33 +05:30
cmdr2
0aa7968503 Move color correction to diffusionkit; Rename color correction to 'Preserve color profile' 2022-12-11 19:34:07 +05:30
JeLuF
bd1bc78953 Use onIdle(), move pause button, quick resume without using the promise 2022-12-11 14:57:01 +01:00
cmdr2
6ce6dc3ff6 Get rid of the ugly copying around (and maintaining) of multiple request-related fields. Split into two objects: task-related fields, and render-related fields. Also remove the ability for request-defined full-precision. Full-precision can now be forced by using a USE_FULL_PRECISION environment variable 2022-12-11 18:16:29 +05:30
JeLuF
e6346775e7 Merge branch 'beta' into pause 2022-12-11 11:19:48 +01:00
patriceac
af5c68051a
Fix for the tooltips being cutoff (#636) 2022-12-11 12:59:23 +05:30
Marc-Andre Ferland
5b7cd11de8
Added support for Async events (#643)
* Added support for async events callbacks

* Don't fire IDLE event if the first callback hasn't completed execution.
2022-12-11 11:22:52 +05:30
cmdr2
d3c3496e55
Merge pull request #639 from madrang/newEngine
Check if window is defined. Not all JS execution environments have it.
2022-12-11 11:19:11 +05:30
cmdr2
c08c8b2789
Merge pull request #638 from JeLuF/initimg
show initimg in task list
2022-12-11 11:18:10 +05:30
cmdr2
069315e434
Merge pull request #642 from patriceac/patch-5
Fixing a typo
2022-12-11 11:16:24 +05:30
JeLuF
38951f5581 Pause button - check whether function is defined before calling it 2022-12-11 02:49:49 +01:00
patriceac
b5329ee93d
Fixing a typo
Yeah, I know... What can I say? I have my OCD too. 👀
2022-12-10 17:45:14 -08:00
JeLuF
c568bca69e Pause button 2022-12-11 02:31:23 +01:00
Marc-Andre Ferland
7b2be12587 Check if window is defined. Not all JS execution environments have it. 2022-12-10 18:26:48 -05:00
JeLuF
099fde2652 show initimg in task list 2022-12-10 17:17:37 +01:00
Marc-Andre Ferland
83e5410945 Fix (typeof stepUpdate !== 'object') not completing the task on stop. 2022-12-10 00:52:27 -05:00
patriceac
e3184622e8
Scrolling panes (#632)
Decouple the editor and the preview panes. Scrollbars color updated as well as requested.
2022-12-09 23:11:39 +05:30
patriceac
28f822afe0
Fix tags not being properly applied to prompt matrix (#610)
There is an issue on the beta where if you use pipe ( | ) in the prompt to make a prompt matrix, the optional prompts are only applied when the last prompt in the matrix is used.
2022-12-09 23:04:25 +05:30
cmdr2
79cc84b611 Option to apply color correction (balances the histogram) during inpainting; Refactor the runtime to use a general-purpose dict 2022-12-09 19:39:56 +05:30
Marc-Andre Ferland
854e3d3576
Fix reading value from undefined. (#631) 2022-12-09 16:34:59 +05:30
cmdr2
f4a6910ab4 Work-in-progress: refactored the end-to-end codebase. Missing: hypernetworks, turbo config, and SD 2. Not tested yet 2022-12-08 21:39:09 +05:30
Marc-Andre Ferland
ba2c966329
First draft of multi-task in a single session. (#622) 2022-12-08 11:12:46 +05:30
cmdr2
273525e6f9 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-12-07 13:12:02 +05:30
cmdr2
064a4938c1 Don't show prompt strength when the app starts 2022-12-07 13:11:49 +05:30
Marc-Andre Ferland
182236e742
Hypernets mergefixes (#625)
* Add hypernetwork args definition in the engine.

* Add the values to reqBody

* Don't load hypernetwork.py with SD2 until it's compatible.
2022-12-07 12:35:36 +05:30
cmdr2
d4a378827f Paint editor - translucent mask, more brush size options 2022-12-07 12:27:40 +05:30
Guillaume Mercier
cbe91251ac
Hypernetwork support (#619)
* Update README.md

* Update README.md

* Make on_sd_start.sh executable

* Merge pull request #542 from patriceac/patch-1

Fix restoration of model and VAE

* Merge pull request #541 from patriceac/patch-2

Fix restoration of parallel output setting

* Hypernetwork support

Adds support for hypernetworks. Hypernetworks are stored in /models/hypernetworks

* forgot to remove unused code

Co-authored-by: cmdr2 <secondary.cmdr2@gmail.com>
2022-12-07 11:24:16 +05:30
Marc-Andre Ferland
1283c6483d
Use the reqBody exposed to events to allow plugins to change the request. (#620) 2022-12-07 09:34:04 +05:30
Marc-Andre Ferland
7984327d81
Fixed tasks buttons by replacing the error with a warning when setting properties to undefined. (#618) 2022-12-06 21:49:05 +05:30
cmdr2
ef90832aea
engine.js (#615)
* New engine.js first draft.

* Small fixes...

* Bump version for cache...

* Improved cancellation code.

* Cleaning

* Wrong argument used in Task.waitUntil

* session_id needs to always match SD.sessionId

* Removed passing explicit Session ID from UI.
Use SD.sessionID to replace.

* Cleaning... Removed a disabled line and a hardcoded value.

* Fix return if tasks are still waiting.

* Added checkbox to reverse processing order.

* Fixed progress not displaying properly.

* Renamed reverse label.

* Only hide progress bar inside onCompleted.

* Thanks to rbertus2000 for helping testing and debugging!

* Resolve async promises when used optionally.

* when removed var should have used let, not const.

* Renamed getTaskErrorHandler to onTaskErrorHandler to better reflect actual implementation.

* Switched to the unsafer and less git friendly end of lines comma as requested in review.

* Raised SERVER_STATE_VALIDITY_DURATION to 90 seconds to match the changes to Beta.

* Added logging.

* Added one more hook before those inside the SD engine.

* Added selftest.plugin.js as part of core.

* Removed a tests that wasn't yet implemented...

* Groupped task stopping and abort in single function.

* Added optional test for plugins.

* Allow prompt text to be selected.

* Added comment.

* Improved isServerAvailable for better mobile usage and added comments for easier debugging.

* Comments...

* Normalized EVENT_STATUS_CHANGED to follow the same pattern as the other events.

* Disable plugins if editorModifierTagsList is not defined.

* Adds a new ServiceContainer to register IOC handlers.

* Added expect test for a missing dependency in a ServiceContainer

* Moved all event code in it's own sub class for easier reuse.

* Removed forgotten unused var...

* Allow getPrompts to be reused be plugins.

* Renamed EventSource to GenericEventSource to avoid redefining an existing class name.

* Added missing time argument to debounce

* Added output_quality to engine.js

* output_quality need to be an int.

* Fixed typo.

* Replaced the default euler_a by dpm2 to work with both SD1.# and SD2

* Remove generic completed tasks from plugins on generator complete.

* dpm2 starts at step 2, replaced with plms to start at step 1.

* Merge error

* Merge error

* changelog

Co-authored-by: Marc-Andre Ferland <madrang@gmail.com>
2022-12-06 17:04:08 +05:30
cmdr2
ff43dac2a7 Open the color box when the custom label is clicked 2022-12-06 16:17:45 +05:30
cmdr2
47c8eb304f Revert the button styling 2022-12-06 15:36:52 +05:30
Malcolm Diller
cb618efb98
Image Editor Updates (#612)
* fixed tools for image editor to be more modular and made cursor an actual cursor change

* fixed eraser cursor positioning

* updated opacity to not have a 100 option

* separated clear into an actions section

* added history support for image editor. ctrl-z and ctrl-y both work now

* removed extra console log debugging stuff

* updated buttons style

* updated the button ui on the main page as requested

* updated with a bunch of bugfixes
2022-12-06 13:56:51 +05:30
JeLuF
e7ca8090fd
Make JPEG Output quality user controllable (#607)
Add a slider to the image options for the JPEG quality
For PNG images, the slider is hidden.
2022-12-05 11:02:33 +05:30
Marc-Andre Ferland
f701b8dc29
Simplify onUpscaleClick (#602)
* Simplified onUpscaleClick code.

* Updated fix with comment as to what it's fixing.

* Move the fix to enqueueImageVariationTask
2022-12-05 10:46:10 +05:30
patriceac
bd10a850fa
Fix upscaling when a source image is set (#593)
* Fix upscaling when a source image is set

If you have an image selected (img2img) then clicking Upscale on another unrelated image, the image for img2img is used and you get something very unexpected.

* Fix for img2img and mask gens
2022-12-03 22:25:14 +05:30
JeLuF
0f96688a54
Highlight artist modifiers when clicked (#596)
Artist modifiers, with the exception of Artstation (the first one), don't have the outline when selected. All the other modifiers, above or below, seem to work as intended

https://discord.com/channels/1014774730907209781/1014774732018683927/1048343258775949322
2022-12-03 22:18:57 +05:30
JeLuF
8eeca90d55
Fix weird scrolling when using a pen (#588)
With a pen, typing on a browser page, waiting a short moment, and then moving the pen scrolls the page.
Call event.preventDefault() to disable this default behaviour for events in the canvas area.
2022-12-02 14:40:21 +05:30
cmdr2
1c8ab9e1b4 Temporarily set the display: flex style only on the image editor buttons 2022-12-01 16:59:12 +05:30
cmdr2
6094cd8578 Fix the 'load from file' button that had moved to the next line' 2022-12-01 16:10:20 +05:30
Malcolm Diller
277140f218
Image Editor (#574)
* started implementing hamunii's image editor, and added a hamunii theme

* fixed so active tab is main tab

* added some testing stuff for image ediotr

* re-implemented canvas drawing myself. just need to add layer stuff now

* moved everything to an image editor class and implement it so it actually works nicely now

* fixed a couple weird bugs and cleaned up the background image and sharpness stuff

* cleaned up a lot of stuff about the editor, added tools, buttons, made it mostly work in the current ui

* added inpainting support

* updated with more nice changes/updates to the inpainting and drawing editor

* made some more fixes and touchups to the image editor

* removed a bunch of semicolons

* remove old image inpainting system

* updated to work properly on mobile

* made a minor bugfix

* fixed img_size_box alignment

* Update index.html

Co-authored-by: cmdr2 <secondary.cmdr2@gmail.com>
Co-authored-by: cmdr2 <shashank.shekhar.global@gmail.com>
2022-12-01 16:01:09 +05:30
patriceac
ca9413ccf4
Toggle image modifiers plugin (#558)
* Toggle image modifiers plugin

Right-click on image modifiers to temporarily turn them off without removing them. To quickly iterate and experiment with various combinations.

Please note this plugin required a minor tweak in getPrompts() to add support for image modifier inactive state.

* Fix tag matching

Co-authored-by: cmdr2 <secondary.cmdr2@gmail.com>
2022-12-01 15:10:36 +05:30
cmdr2
c9a0d090cb
Merge pull request #569 from patriceac/Fix-seed-behavior
Tweak the seed behavior
2022-12-01 15:03:21 +05:30
cmdr2
1ead764a02
Merge branch 'beta' into Custom-modifiers-as-a-plugin 2022-12-01 14:57:39 +05:30
cmdr2
45f7b35954
Merge pull request #581 from patriceac/Hotfix-for-repeat-image-modifiers-handling
Hotfix for repeat image modifiers
2022-12-01 14:47:15 +05:30
cmdr2
3b554d881a Styling changes for the confirm dialog 2022-12-01 13:54:49 +05:30
patriceac
40ebf468d3 Hotfix for repeat image modifiers
As per Discord conversation, this PR fixed the image modifiers behavior when a modifier appears more than once, and also fixes a regression introduced by ((weighted modifiers)).
2022-11-30 22:13:13 -08:00
cmdr2
da3e7a2eb8 Fix the broken image close button 2022-11-30 21:14:18 +05:30
cmdr2
1949d8a50c Tweak modifiers help msg 2022-11-30 16:32:43 +05:30
cmdr2
7c50b8bf94
Merge branch 'beta' into Mouse-wheel-behavior-fixes 2022-11-30 16:22:45 +05:30
cmdr2
141ff74ece
Merge pull request #557 from madrang/webmanifest
Added web manifest to allow installing the Url as a web app.
2022-11-30 16:19:04 +05:30
cmdr2
6d131d9d8e
Merge branch 'beta' into Fix-UI-display-when-removing-the-last-task 2022-11-30 16:14:28 +05:30
cmdr2
4e0b33e6a4
Merge pull request #566 from patriceac/Visual-feedback-on-buttons
Visual feedback on button click
2022-11-30 16:11:08 +05:30
cmdr2
a2c8c99215
Merge pull request #541 from patriceac/patch-2
Fix restoration of parallel output setting
2022-11-30 15:53:30 +05:30
cmdr2
465676e9ea
Merge pull request #542 from patriceac/patch-1
Fix restoration of model and VAE
2022-11-30 15:51:31 +05:30
cmdr2
4348333497 Don't register listeners for an autosave setting, if they've already been registered 2022-11-30 15:45:30 +05:30
cmdr2
029509ebad Unify IP info with devices, into a system_info table 2022-11-30 14:34:24 +05:30
cmdr2
b96b55c5ce
Merge branch 'beta' into serverip 2022-11-30 14:00:12 +05:30
Marc-Andre Ferland
1f5aba010e Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into webmanifest
# Conflicts:
#	ui/index.html
2022-11-30 03:29:46 -05:00
cmdr2
f0b3bea4e3 Also confirm before the 'Stop All' button acts; Tweak wording of confirm dialog 2022-11-30 13:54:42 +05:30
cmdr2
0b96fa112d
Merge branch 'beta' into confirm 2022-11-30 13:47:08 +05:30
cmdr2
159c3edfe3 Simplify the logic for toggling modifier cards, no need to loop through the cards, since we already have the card object in hand 2022-11-30 13:33:20 +05:30
cmdr2
f74fa8657b
Merge pull request #518 from patriceac/patch-6
Fix duplicate custom modifiers activation states
2022-11-30 13:27:14 +05:30
cmdr2
648b142a4b
Merge pull request #571 from madrang/tabs-css
Add a new css rule for screens smaller than 500px.
2022-11-30 13:24:38 +05:30
cmdr2
ff9430b8a2 Tabs to 4 spaces 2022-11-30 12:18:34 +05:30
cmdr2
0ea38db7ef Show the SD 2.0 setting only to beta users 2022-11-30 12:05:46 +05:30
patriceac
a69d4c279e Make seed field behavior deterministic
Copying the image settings while 'Random' is enabled would cause the seed to be randomized. This was misleading as what I see wasn't what I would get.
2022-11-29 19:04:42 -08:00
cmdr2
2706149399 Tweak left padding of editor panel 2022-11-29 15:27:13 +05:30
Marc-Andre Ferland
a99209b674 Add a new css rule for screens smaller than 500px. 2022-11-28 20:23:17 -05:00
patriceac
69f14edd80 Tweak the seed behavior
Update the seed *before* starting the processing, so interrupting the processing retains the seed being used for the batch being currently processed.

The idea behind that is that if I like the gen I'm currently seeing and want to build on top of it, I can create a new task with the same seed without having to wait for the current task to complete.
2022-11-28 01:19:31 -08:00
patriceac
14714b950d Slight improvement of detection logic 2022-11-28 00:14:12 -08:00
Marc-Andre Ferland
8583bb8d7b Improved tabs flow on small screens. 2022-11-27 20:37:20 -05:00
patriceac
d48951fe00 Visual feedback on button click
When there are too many tasks and the top of the list is not visible, there is no visual feedback that a task has been successfully added to the queue.

Adding a subtle visual feedback on buttons upon click to reflect that the mouse event was taken into account.
2022-11-27 16:26:01 -08:00
Marc-Andre Ferland
99bdcfa0a5 Set theme-color from the current selected theme. 2022-11-27 15:49:54 -05:00
patriceac
e64e1a92e6 Fix UI display when removing the last task
Clear All button properly shows the "welcome message", but Remove the last task would just result in a blank Preview pane.
2022-11-27 12:42:51 -08:00
patriceac
e278e639a3 Fix removal of image modifiers with non-zero weights
Properly handles removal of image modifiers that had (((modifiers))) or [[[modifiers]]] updated at runtime.
2022-11-27 03:00:19 -08:00
Marc-Andre Ferland
9c91f57b19 Added web manifest to allow installing the Url as a web app. 2022-11-26 15:51:26 -05:00
cmdr2
ea7b28c9d5 Placeholder changes for SD 2.0 support, haven't tested yet 2022-11-25 12:17:44 +05:30
patriceac
472ab4a9ce
Fix restoration of parallel output setting 2022-11-24 14:15:27 -08:00
patriceac
fca84e3edf
Fix restoration of model and VAE
😅
2022-11-24 13:47:35 -08:00
JeLuF
6eff591df7 System settings to disable the 'Are you sure?'-dialogs 2022-11-23 23:05:30 +01:00
JeLuF
3452d7852a
Merge branch 'beta' into serverip 2022-11-23 11:28:05 +01:00
JeLuF
f1fa10badd Show network addresses in system settings
Users sometimes struggle to get the IP address of their PC. This PR adds a button to the system settings pane that will list the server's IP
addresses.
2022-11-23 11:25:36 +01:00
patriceac
c56a2adbcb Custom modifiers as a plugin 2022-11-22 19:04:20 -08:00
JeLuF
a486f20892
Merge branch 'beta' into confirm 2022-11-22 21:33:18 +01:00
JeLuF
49535deb2e Confirm 'Clear All' and 'Stop Task'
Ask for a confimation before clearing the results pane or stopping a render task. The dialog can be skipped by holding down the shift key while clicking on the button.
2022-11-22 21:27:36 +01:00
Marc-Andre Ferland
3169485f33 Fixing file drag and drop. 2022-11-22 11:11:06 -05:00
patriceac
e8dd930a50
Add support for custom modifiers to d&d and clipboard
Add support for custom modifiers to d&d and clipboard and remove now-redundant code in restoreTaskToUI.
2022-11-22 00:06:43 -08:00
cmdr2
31c049ebfe Version css 2022-11-22 11:09:01 +05:30
cmdr2
7097175c6f CSS tweak for logo and version 2022-11-22 11:07:50 +05:30
cmdr2
80ecb82cc2 Reduce the width of the editor sidebar, regression 2022-11-21 18:42:07 +05:30
cmdr2
923c889de8
Merge pull request #495 from madrang/pasteFix
Fix pasting in Firefox.
2022-11-21 16:15:24 +05:30
cmdr2
b51407486a
Merge pull request #517 from patriceac/patch-5
Fix duplicate custom modifiers restoration
2022-11-21 16:05:17 +05:30
cmdr2
a689b34ed1
Merge pull request #506 from patriceac/patch-2
VAE support in Use Settings
2022-11-21 16:02:51 +05:30
cmdr2
e96b9005ca
Merge pull request #514 from JeLuF/checkinput
Prevent empty fields in make image request
2022-11-21 12:36:23 +05:30
patriceac
cbc48e31e1
Fix duplicate custom modifiers activation states
Fixing activation state for custom modifier cards sharing the same tag where only one of the cards gets (de)activated.
2022-11-19 19:25:28 -08:00
patriceac
577dd9048f
Fix duplicate custom modifiers restoration
Fix for duplicate image modifiers when restoring a task in which several custom modifier cards share the same tag.
2022-11-19 19:21:36 -08:00
JeLuF
ae409dd0ec Prevent empty fields in make image request
Prevent render jobs to fail with HTTP 422 due to empty fields in the image settings.
https://discord.com/channels/1014774730907209781/1043481789706031215/1043481789706031215
https://discord.com/channels/1014774730907209781/1014774732018683927/1042768986871443516

minor change, no CHANGE.md entry
2022-11-19 21:00:41 +01:00
JeLuF
6c156380f9 Add network settings to the UI
Allow users to choose the uvicorn port
Allow users to restrict uvicorn to only listen on localhost
2022-11-19 17:10:45 +01:00
patriceac
2111a81d18
Proper PR for VAE support in Use Settings 2022-11-19 00:56:44 -08:00
cmdr2
d03521bf12 Use as Input -> Use these settings 2022-11-18 21:11:34 +05:30
cmdr2
3eb1919c81 Fix the missing (beta) label next to the version number 2022-11-18 19:38:16 +05:30
cmdr2
a6e3c272e2 Tweak CSS for button press color 2022-11-18 17:14:58 +05:30
cmdr2
4000f98ba4
Merge pull request #490 from JeLuF/ui1
Visual feedback for the save button in the system settings
2022-11-18 17:10:04 +05:30
cmdr2
d06fd404ae Font size of negative prompt textbox 2022-11-18 17:09:42 +05:30
cmdr2
c6f0e19e2f
Merge pull request #493 from JeLuF/negative
Textarea for negative prompts
2022-11-18 17:07:37 +05:30
cmdr2
9c3d946de0 Theme tweaks 2022-11-18 17:01:20 +05:30
cmdr2
ace3102601 Reduce the size of the toggle switches 2022-11-18 16:24:49 +05:30
cmdr2
0067e46192
Merge pull request #501 from mdiller/mdiller_fancyswitches
Better Toggle Inputs & Updated Settings UI
2022-11-18 16:17:54 +05:30
cmdr2
921711a679 Don't crash if an invalid model file is beign scanned 2022-11-18 16:12:45 +05:30
cmdr2
1f815d7562
Merge branch 'beta' into scanner 2022-11-18 16:01:50 +05:30
cmdr2
f74c57449e Cosmetic changes to Use Settings 2022-11-18 15:54:47 +05:30
cmdr2
a697bd935a Refactor the Use Settings code, and move that to the common restoreTask() function 2022-11-18 15:38:17 +05:30
cmdr2
f67758eaf3 Bring back some styling that was removed accidentally by the PR merge 2022-11-18 14:58:21 +05:30
cmdr2
7ffeb3964b
Merge pull request #463 from patriceac/beta
Adding Use Settings
2022-11-18 14:40:04 +05:30
Malcolm Diller
45086a4b6e updated hamunii theme name to gnomie 2022-11-17 22:25:55 -08:00
Malcolm Diller
2db0023653 updated themes to work nicely with the new stuff 2022-11-17 20:15:39 -08:00
Malcolm Diller
bfc21220a7 added hamunii theme 2022-11-17 18:13:08 -08:00
Malcolm Diller
507491fbec added fancy switches and updated the ui of the settings tab 2022-11-17 17:58:09 -08:00
Marc-Andre Ferland
e052610184 Removed debugging log calls. 2022-11-17 02:45:09 -05:00
cmdr2
f2367932e1 Style code tags in the What's New markdown 2022-11-17 13:13:01 +05:30
Marc-Andre Ferland
3a18606385 Disable when targeting input elements. 2022-11-17 02:36:14 -05:00
Marc-Andre Ferland
e25a94e815 Bug fix, forgot to await promise. 2022-11-17 02:20:01 -05:00
Marc-Andre Ferland
c13f662e2d Use the document paste event for pasting json and text data. 2022-11-17 02:16:20 -05:00
Marc-Andre Ferland
1364fd5c45 Fix pasting in Firefox.
Should not display button.
https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/readText#browser_compatibility
2022-11-17 01:44:11 -05:00
cmdr2
cc3186a683 Highlight the Save settings button when pressed 2022-11-17 11:01:10 +05:30
cmdr2
0c93c4754d Tabs to spaces 2022-11-17 10:49:22 +05:30
JeLuF
8cebb53147 Textarea for negative prompts 2022-11-16 23:35:27 +01:00
JeLuF
3e18f2f09c Picklescan of model files
During getModel(), the server picklescans the model files for potential
malicious code in the pickled python objects. If a malicious file is
found, the web UI will show a big red error message, the makeImage
button will be disabled, and the user must remove the malicious file
and reload the UI page.
2022-11-16 22:34:02 +01:00
JeLuF
5429a509c6 Visual feedback for the save button in the system settings 2022-11-16 20:52:40 +01:00
cmdr2
18d9d2602a Add a 'What's New?' tab as a core plugin, which fetches the contents of CHANGES.md from the app's release branch 2022-11-16 16:54:28 +05:30
patriceac
9764d9109f Merge remote-tracking branch 'upstream/main' into beta 2022-11-16 00:29:52 -08:00
cmdr2
a59bac4b40 UI setting for preventing browser autostart 2022-11-16 12:43:46 +05:30
cmdr2
04f201933b space apart the stop button 2022-11-16 11:33:05 +05:30
cmdr2
e99d54d1f6 Merge main 2022-11-16 11:19:10 +05:30
cmdr2
f124cf8318
Make the task config summary labels bold 2022-11-15 16:06:35 +05:30
cmdr2
5cf763d51f Add a 'Save' button in settings, to avoid starting/stopping threads while a user is still modifying their GPU settings 2022-11-15 12:22:55 +05:30
cmdr2
6530e45178
Merge pull request #478 from madrang/beta
Changed update_render_threads to use SetAppConfigRequest.
2022-11-15 11:04:52 +05:30
Marc-Andre Ferland
ffe0eb1544 Changed update_render_threads to use SetAppConfigRequest to set which devices are active.
Keep ImageRequest.render_device for affinity only. (Send a task to an already active device.)
2022-11-14 21:54:24 -05:00
JeLuF
288e8a65f3
Incr. Server State Validtiy to 90s
By default, healthCheck() is run every 5s. On background tabs, this may get extended. My tests have shown pings every 60s. The ping was older than 10s, so the condition in line 490 evaluates to `false` and the client tries to access the stream before the server is ready. By increasing the validity this can be avoided - at least until the browser runs the healthcheck even less often.

See https://discord.com/channels/1014774730907209781/1041811939380178964/1041812021018120262 for the analysis.
2022-11-14 23:18:03 +01:00
JeLuF
f22f57495e Fix system info for CPU mode 2022-11-14 17:55:36 +01:00
cmdr2
8786a9d21d Fix border color of the image task container 2022-11-14 21:25:57 +05:30
cmdr2
f06a97d30b Move system info into settings 2022-11-14 21:21:48 +05:30
cmdr2
64ff1ecbb6 Formatting for mem free 2022-11-14 21:02:17 +05:30
cmdr2
8707f88c07 Show mem free info 2022-11-14 20:35:47 +05:30
cmdr2
0cb2f19e29 Mark multi GPU as experimental in the UI 2022-11-14 20:06:20 +05:30
cmdr2
125a50ae87 Include the gpu id in the gpu list and system info 2022-11-14 20:01:57 +05:30
cmdr2
31617ae340 Show a system info tab, which shows the active GPUs 2022-11-14 19:53:40 +05:30
cmdr2
257cd34101
Merge branch 'beta' into beta 2022-11-14 19:06:35 +05:30
cmdr2
ab6ec3a9b7 Fix - setting can be null sometimes (autosave) 2022-11-14 18:10:23 +05:30
cmdr2
39814a89b6 Fix - setting can be null sometimes (autosave) 2022-11-14 18:09:25 +05:30
cmdr2
24fbbf8aa8 Remove unused variables 2022-11-14 16:26:16 +05:30
cmdr2
1d2b3a4ed8 Hide/show the GPUs list depending on whether auto is selected 2022-11-14 13:14:33 +05:30
cmdr2
f904945d40 Disable the GPU list if auto is enabled 2022-11-14 13:02:36 +05:30
cmdr2
ea03fd22db Start on multiple GPUs by default (top 75 percentile by free_mem); UI selection for 'cpu' or 'auto' or a list of specific GPUs, which is now linked to the backend; Dynamically start/stop render threads for the devices, without requiring a full program restart 2022-11-14 11:23:22 +05:30
JeLuF
e561e4de0b Visual feedback for the copy and paste icons 2022-11-14 01:58:24 +01:00
JeLuF
1c3d5cd851 Add paste button next to copy button 2022-11-14 01:23:04 +01:00
patriceac
332f2b0678 Hotfix for CSS layout regression 2022-11-12 19:04:23 -08:00
cmdr2
fa16ca4eec
Update auto-save.js 2022-11-12 17:39:26 +05:30
cmdr2
98aefad249
Skip if a setting isn't present 2022-11-12 17:24:48 +05:30
cmdr2
cd5f847b55 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-11-11 12:03:14 +05:30
cmdr2
a25544baea Fix the editor width on Chrome 2022-11-11 12:02:58 +05:30
patriceac
39b6c5d6f4 Merge remote-tracking branch 'upstream/beta' into beta 2022-11-10 22:30:28 -08:00
cmdr2
f954542dda
Merge pull request #461 from JeLuF/dontleave
Add event listener beforeunload
2022-11-11 10:58:15 +05:30
cmdr2
64952a536c Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-11-11 10:47:52 +05:30
cmdr2
65e0d5f511 Attempt to fix horizontal resizing of the prompt textbox, thanks @Bilbo 2022-11-11 10:44:52 +05:30
patriceac
903acff924 Adding Use Settings 2022-11-10 18:36:39 -08:00
JeLuF
5a06946469 Add event listener beforeunload
When closing the window, a warning is shown if there are any render results.
2022-11-10 23:23:20 +01:00
cmdr2
baef31b2c7 Send 'auto' as the render_device from the UI
, if no GPU is selected and CPU is unchecked)
2022-11-10 22:23:15 +05:30
cmdr2
3f26d03166 Show GPU list in the UI only if the PC has more than 1 GPU 2022-11-10 16:34:01 +05:30
cmdr2
1fed3ad532 Don't propagate events in the Stop Task button 2022-11-10 15:33:39 +05:30
cmdr2
929b245f5f Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-11-10 14:59:11 +05:30
cmdr2
0da6354825 Press Ctrl+Enter to start a task 2022-11-10 14:59:01 +05:30
JeLuF
93a2e91694 Use theme variable for bottom border design 2022-11-10 00:44:42 +01:00
JeLuF
4913dc1aad Replace hr by border-bottom 2022-11-09 23:57:48 +01:00
JeLuF
087df18fea Add Wiki links to help&community page 2022-11-09 23:42:56 +01:00
cmdr2
058ce6fe82 UI-side changes for selecting multiple GPUs, and keeping the Use CPU option synchronized with the backend. This change isn't ready to be shipped, it still needs python-side changes to support the req.render_device config 2022-11-09 19:17:44 +05:30
cmdr2
6c1dda47c0 Don't change the page when something other than an image or text file is dropped into the page (or an image is dropped outside the init image box) 2022-11-09 15:21:41 +05:30
cmdr2
bca98269bb Fix a bug where the custom image modifiers button would close the modifiers panel 2022-11-09 13:46:50 +05:30
cmdr2
1bebaf933d Bring back the old style panels for image settings and modifiers 2022-11-09 13:43:43 +05:30
Malcolm Diller
3ff213b3e8 removed status on mobile 2022-11-08 21:51:12 -08:00
Malcolm Diller
69c7f22053 Merge branch 'beta' into mdiller_ui_reorganize 2022-11-08 21:22:22 -08:00
Malcolm Diller
75a964167a hid the now shown collapsible handle 2022-11-08 21:00:56 -08:00
cmdr2
c5768c81e1
Merge pull request #453 from patriceac/beta
Fix modifier and system settings popup position
2022-11-09 10:23:12 +05:30
Malcolm Diller
4eb2b818e7 shrank system settings a bit so it fits on monible 2022-11-08 20:47:55 -08:00
Malcolm Diller
d061eb2c64 updated to work decently for mobile 2022-11-08 20:37:49 -08:00
Malcolm Diller
69aa115178 updated the about tab to be help and community, and fixed footer to act nicely 2022-11-08 20:19:31 -08:00
Malcolm Diller
e175b87384 updated so tabs work now, and we have a settings tab and an about tab 2022-11-08 19:54:41 -08:00
Malcolm Diller
f216ee739a updated with latest updates for this support 2022-11-08 19:22:14 -08:00
JeLuF
38afc6e6f8 Fix: Uncaught TypeError: Cannot set properties of null 2022-11-08 19:05:28 +01:00
cmdr2
a86b6bfbd6 Fix a bug with drag-and-drop where the upscale dropdown would not get enabled/disabled based on the setting 2022-11-08 18:46:55 +05:30
cmdr2
1176ddcc85 Fix a bug in drag-and-drop where an empty Negative Prompt line would result in the next line getting assigned to negative prompts; Simplify the drag-and-drop text file parsing logic to use a single algorithm, the files are small enough that we don't need over-optimization and confuse new developers 2022-11-08 18:44:11 +05:30
cmdr2
fa080e380c Fix a bug where images could no longer be dragged and dropped onto the initial image box 2022-11-08 18:14:26 +05:30
cmdr2
302cf5b10b Show a tooltip over the ? help buttons 2022-11-08 17:49:46 +05:30
cmdr2
e2a9e81dbc Show tooltips on 'Copy Image Settings' 2022-11-08 17:40:47 +05:30
cmdr2
9bc7521de0 Make custom VAE an Image Setting, rather than a System Setting; Don't load a VAE into memory by default 2022-11-08 16:54:15 +05:30
patriceac
a68ebd2b76 Fixing the popup position on larger screens
Fixing the popup position on larger screens; Smaller screens still get the current rendering experience.
2022-11-08 02:17:26 -08:00
patriceac
47f7c938ae Update main.css 2022-11-07 23:15:59 -08:00
Marc-Andre Ferland
3576214920 Remove prompt_strength and init_image when not using in-painting 2022-11-05 13:39:19 -04:00
Marc-Andre Ferland
f964fe3750 Add on/off support for parsing boolean. 2022-11-05 13:33:38 -04:00
cmdr2
82d764000a Fix https://github.com/cmdr2/stable-diffusion-ui/issues/441 - numerical validation 2022-11-04 19:54:59 +05:30
cmdr2
749c72e6a6 Fix https://github.com/cmdr2/stable-diffusion-ui/issues/441 - numerical validation 2022-11-04 19:48:34 +05:30
Marc-Andre Ferland
d04aa89812 Fix 'Use Upscaling' dropdown getting blank on False. 2022-11-03 20:34:51 -04:00
Marc-Andre Ferland
d5f854d376 Fix use_face_correction not disabling on false 2022-11-03 20:34:12 -04:00
Marc-Andre Ferland
c3cc75feff Adds a list of properties to not export by default. 2022-11-03 03:16:20 -04:00
Marc-Andre Ferland
d2e6011089 Windows paths... 2022-11-03 03:12:11 -04:00
Marc-Andre Ferland
5a18144366 Enable/disable seedField when updating randomSeedField.checked 2022-11-03 03:11:58 -04:00
cmdr2
8a0a22bfb0
Merge pull request #427 from madrang/dragNdrop
Add support for drag&drop for the text files made by the backend
2022-11-03 11:41:21 +05:30
Marc-Andre Ferland
950b226374 Moved copy icon css to main.css 2022-11-03 02:09:42 -04:00
Marc-Andre Ferland
045ad78bb9 Added calls to update sliders. 2022-11-02 10:53:48 -04:00
Marc-Andre Ferland
c0350e5be7 Moved file ext to a var. 2022-11-02 10:45:51 -04:00
cmdr2
2b3e38f77e
Merge pull request #421 from madrang/beta
Fix plugins needing to specify many params or they would be missing in the render request.
2022-11-02 12:34:45 +05:30
Malcolm Diller
484e53cc08 made first large swathe of changes for ui reorganization 2022-11-01 23:03:05 -07:00
Marc-Andre Ferland
93b3419737 Better human formatted JSON 2022-11-01 04:54:38 -04:00
Marc-Andre Ferland
268d7495cc Naming... 2022-10-31 01:13:04 -04:00
Marc-Andre Ferland
ce16e61e63 Adds a copy as JSON button. 2022-10-31 01:02:23 -04:00
Marc-Andre Ferland
f92bca58fa Lines endings... 2022-10-31 01:01:56 -04:00
Marc-Andre Ferland
83d541b60d Fixed model parsing... 2022-10-30 23:41:26 -04:00
Marc-Andre Ferland
965efc3a13 Restore old values if invalid values for the dropdown was used. 2022-10-30 23:35:42 -04:00
Marc-Andre Ferland
d656c34bd4 Add support for drag&drop for the text files made by the backend and also supports JSON. 2022-10-30 23:21:39 -04:00
ayunami2000
bc2f9204e9 Improve UI on mobile devices 2022-10-30 18:16:31 -04:00
Marc-Andre Ferland
a922a93016 Can work with one or more params, don't need a minimum of two.
Still works just the same.
2022-10-30 14:09:12 -04:00
patriceac
f08a875cd2
Update main.js
Fix parsing of Set and Permute operators in custom tags.
2022-10-30 00:26:53 -07:00
patriceac
d492d3f738
Update main.js
Fixing the parsing of Set and Permute operators in custom tags.
2022-10-30 00:22:01 -07: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
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
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
Malcolm Diller
7d29b9901c updated progressbar to end more consistently 2022-10-27 22:47:08 -07:00
Malcolm Diller
5a6e7a46d1 added progressbar 2022-10-27 17:03:09 -07: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
6285980f98
Merge pull request #377 from madrang/beta
Missing '?' in case renderRequest is ever undefined.
2022-10-25 10:44:37 +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
1ec95d42ba Missing '?' in case renderRequest is ever undefined. 2022-10-22 21:19:42 -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
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
cmdr2
7580bb21c3
Fix upscale multiple images bug 2022-10-22 08:38:19 +05:30
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
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
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
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
48a88a8624 Custom modifiers 2022-10-21 14:08:16 +05:30
cmdr2
d17e216f91 Replace the thumbnail image for glass caustics image modifier 2022-10-21 13:08:23 +05:30
Marc-Andre Ferland
807e9573fb Check result status, not json object. 2022-10-20 20:36:45 -04:00
cmdr2
090dfff730 Refactor the time delays into constants and mention the units 2022-10-20 17:22:01 +05:30
cmdr2
2e17ea99e2 Don't cache ui plugins in the browser 2022-10-20 16:05:18 +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
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
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
50741c70c0 Add a 'Make Similar Images' button 2022-10-19 17:26:35 +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
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
Malcolm Diller
0922349344 made some updates and moved some stuff to auto-save js 2022-10-18 20:49:58 -07: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
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
372484f976 Fixed theme loading with extensions. 2022-10-18 03:21:59 -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
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
351b17d1d9 added a theme dropdown box 2022-10-17 22:22:27 -07:00
cmdr2
03bd9a5731 Temporary fix for lagging progress updates check 2022-10-17 21:53:46 +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
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
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
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
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
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
7625e591fe Fixed output_dir not liking the move to JSONResponse 2022-10-15 04:47:12 -04:00
Marc-Andre Ferland
e9f9670eb5 Changed '/get' from a query to a path parameter 2022-10-15 01:32:53 -04: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
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
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