extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2024-12-25 00:19:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,774 Commits 14 Branches 38 Tags 65 MiB
090f8f6070
Commit Graph

537 Commits

Author SHA1 Message Date
cmdr2
0b3a35c4b6 Make the tabs container a class, to make it reusable for other tab groups 2023-02-06 13:48:18 +05:30
cmdr2
ded6a41f86 Only disable the sibling tabs when a particular tab is selected. This allows the 'tab' management code to be reused for nested tabs 2023-02-06 13:46:40 +05:30
JeLuF
23ba912db0 Fix 'Pause All' function 
If 'pause all' is clicked during the last scheduled job, the 'resume all' button gets hidden when the jobs terminates, making it
impossible to unpause the engine.
https://discord.com/channels/1014774730907209781/1014780368890630164/1071584183417323602
 2023-02-05 17:33:43 +01:00
JeLuF
b99d9db8f9 Create exactly 'total' images even if 'in parallel' is no factor of 'total' 2023-02-05 17:09:56 +01:00
cmdr2
b6f3d2ec02 Formatting 2023-02-03 21:40:08 +05:30
cmdr2
78e917a6fb Fix the broken 'Make Similar Images' button 2023-02-03 21:40:03 +05:30
patriceac
01368ac496 Add support for Windows path names 2023-01-25 02:47:50 -08:00
patriceac
200f8fd245 Code cleanup 2023-01-24 01:53:22 -08:00
patriceac
8d4d409cd6 Add 'embed' and 'none' to metadata saving options 
*** Please merge https://github.com/easydiffusion/sdkit/pull/9 before merging this one. ***

This is the ED client part of metadata embedding. It adds 'embed' and 'none' options to the metadata setting and makes none the default (if never set before) because (1) it feels weird to create metadata files by default and (2) embedding by default could cause be problematic if users don't realize it's happening.

Also fixes the disabling of the dropdown in the settings when Save images to disk is toggled off.
 2023-01-24 01:47:48 -08:00
JeLuF
b044bc1791 Support multiple GFPGAN models 
Add scanning for models and a dropdown to choose different models from
 2023-01-19 20:49:54 +01:00
patriceac
66d311258a Fix card names and toggling 
Fix names and toggling for cards starting  with "By ", e.g. "By the ocean".
 2023-01-16 23:56:44 -08:00
patriceac
3d5133209b Group image containers (DOM tweak) 
Move image containers in their own container to create a clear delineation in the DOM. Purely DOM structural adjustment meant to make a sticky footer possible in the preview pane (for plugins).
 2023-01-15 23:34:56 -08:00
patriceac
a8fba8f3fb
Fix restoration of models with subfolders 
In dnd.js, when models are restored in the UI, there is code that strips the path from the model file name. Now that we allow models to be hosted in subfolders, this code break the task restoration (e.g. use settings, D&D, copy/paste) because "/my models/model.ckpt" becomes "model.ckpt", which won't be found.

https://discord.com/channels/1014774730907209781/1014780368890630164/1063726724573052948
 2023-01-14 23:54:09 -08:00
JeLuF
9d9fc1683a Fix number on the "Make X images" button 
With this change, the number of prompt variants is taken into account when computing the number of images that will be generated.
X = getPrompts().length * numOutputsTotalField.value
 2023-01-13 22:05:25 +01:00
patriceac
d24a7a5c5e
Fix the restoring of the last selected model 2023-01-10 19:00:19 -08:00
cmdr2
aa576e68e3 Bring back the default opacity of 0.4 for inpainting mask, even though it leads to some other bugs. It's not a good UX to have an inpainting mask with full opacity 2023-01-10 21:56:26 +05:30
cmdr2
4fafc8aa67
Merge pull request #685 from mdiller/mdiller_bugfixes 
Mdiller bugfixes
 2023-01-10 21:44:40 +05:30
cmdr2
0aab3d0f12
Merge pull request #744 from AssassinJN/patch-2 
return taskEntry.id on createTask
 2023-01-10 21:41:56 +05:30
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
JeLuF
a88afb0956 Add paths to the value field 2023-01-09 18:24:04 +01: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
7ffeb3964b
Merge pull request #463 from patriceac/beta 
Adding Use Settings
 2022-11-18 14:40:04 +05:30
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
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
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
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
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
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
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
patriceac
39b6c5d6f4 Merge remote-tracking branch 'upstream/beta' into beta 2022-11-10 22:30:28 -08:00
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
0da6354825 Press Ctrl+Enter to start a task 2022-11-10 14:59:01 +05:30
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