extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2024-11-24 09:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,901 Commits 14 Branches 38 Tags 64 MiB
4bbb4b5e1e
Commit Graph

823 Commits

Author SHA1 Message Date
cmdr2
6e6d236819 Change the image zoom size if the textbox is edited next to the slider 2023-02-22 19:56:45 +05:30
JeLuF
1023f5f7cc
Slider for preview image size (#767) 
* Slider for preview image size
Add a slider to the system settings so that users can configure the max size of thumbnails

* Remove debug output

* Fix var definition

* Move slider to 'display settings' menu

* thumbnail slider CSS
 2023-02-22 19:32:00 +05:30
cmdr2
4bc7bca60d
Merge pull request #924 from patriceac/patch-37 
Allow modifier images to be passed as base64 images
 2023-02-22 19:28:47 +05:30
patriceac
14118f142c
Update image-modifiers.js 
Reloading of image tags with ((weight modifiers)) doesn't reuse the modifier card even if it exists, which means images are not restored either. This change fixes that behavior by ensuring proper matching of the tags with existing modifiers.
 2023-02-22 00:57:03 -08:00
patriceac
9b99be4c1d
Allow modifiers to be passed as base64 images 
No change in existing UI behavior, this change allows image modifier plugins to (optionally) pass the card image as a base64-encoded image rather than a source file.
 2023-02-22 00:06:07 -08:00
cmdr2
1b4c14af71
Merge pull request #920 from patriceac/patch-36 
Fix the active selection's display
 2023-02-21 08:42:10 +05:30
cmdr2
7b85e50604
Merge pull request #918 from JeLuF/downloadall 
Download all: Fix to download more than 10 images
 2023-02-21 08:41:50 +05:30
rbertus2000
75f758e792
Bugfix for enforce autosave (#909) 
* show saveToDisk as checked and enable metadata format selection

* spaces instead of tabs

* check if force = true
 2023-02-21 08:39:16 +05:30
patriceac
09deaefab0
Fix the active selection's display 
Yesterday's PR caused a regression on the active brush display, specifically for Sharpness, which is treated differently from the other brushes in the code. This is the fix.
 2023-02-20 18:25:57 -08:00
JeLuF
f80ecbde71 Download all: Fix to download more than 10 images 
https://discord.com/channels/1014774730907209781/1021695193499582494/1077218966205902860
 2023-02-21 00:49:04 +01:00
cmdr2
ce3355d6aa
Merge pull request #902 from patriceac/patch-32 
Select but don't empty the search box upon selection
 2023-02-20 19:14:02 +05:30
cmdr2
fb67ef2df0
Merge pull request #908 from JeLuF/png 
Download all: Fix file name suffix
 2023-02-20 18:57:24 +05:30
cmdr2
255e90d125
Merge pull request #910 from patriceac/patch-34 
Fix the centering of sharpness brushes
 2023-02-20 18:54:22 +05:30
cmdr2
50e4683492
Merge pull request #907 from ogmaresca/webp-support 
Support WEBP image formats
 2023-02-20 18:36:40 +05:30
cmdr2
bc14bdc010
Merge pull request #900 from patriceac/patch-31 
Fix filename parsing issue
 2023-02-20 18:30:45 +05:30
Olivia Godone-Maresca
e140acd2a4
Merge branch 'beta' into webp-support 2023-02-19 23:30:38 -05:00
patriceac
4df9a22dd6
Fix the centering of sharpness brushes 
Fixing a visual glitch that becomes visible when a plugin adds borders to the brushes to make them more visible.

See this for context; https://discord.com/channels/1014774730907209781/1058857864954904607/1076694770845487155
 2023-02-19 12:08:06 -08:00
JeLuF
31a1c4b2b2 Download all: Fix file name suffix 2023-02-19 12:44:10 +01:00
Olivia Godone-Maresca
c2c33b7df1 Support WEBP outputs 2023-02-18 22:37:34 -05:00
cmdr2
aa70f2849b NSFW filter setting 2023-02-18 15:01:13 +05:30
patriceac
c2fba39cc7
Select but don't empty the search box upon selection 
As per your request.
 2023-02-17 23:26:17 -08:00
patriceac
92d3d9cd33
Fix filename parsing issue 
Here is a more robust fix for task restoration in dnd.js. Task restoration will fail if the JSON contains "use_face_correction": false, which can happen under some circumstances.

The fix checks if the filename passed to getModelPath is actually a string, which covers both the previous scenario (filename === null) and this new one (filename === false).
 2023-02-17 18:49:51 -08:00
patriceac
d8dec3e56a
Fix the chevron enabled state upon refresh 
Fix for my previous PR. Apologies for this silly copy/paste mistake.

https://discord.com/channels/1014774730907209781/1014780368890630164/1075782233970970704
 2023-02-17 16:40:16 -08:00
cmdr2
7e4735ae0f
Merge pull request #893 from JeLuF/oneclick 
Only confirm image deletion once
 2023-02-17 11:17:53 +05:30
Olivia Godone-Maresca
09c1dfd92b Remove leading slash from data-path attributes 2023-02-16 23:29:32 -05:00
Olivia Godone-Maresca
df93fee034 Fix model dropdown icon 2023-02-16 21:16:19 -05:00
Olivia Godone-Maresca
fc2cf742c8 Remove trailing slash 2023-02-16 21:08:41 -05:00
Olivia Godone-Maresca
9bec441e94 Fix model folders being split up by child folders 2023-02-16 21:03:02 -05:00
JeLuF
1caab1da85 Only confirm image deletion once 
The previous code added an event listener per preview image (if live preview is enabled), so
that multiple confirmations were required.
 2023-02-17 00:54:41 +01:00
cmdr2
d643ae0299 temp fix for broken dropdowns 2023-02-16 19:46:06 +05:30
patriceac
282c4cca82
Add support for disabled state to model dropdown (#886) 
* Add support for disabled state to model dropdown

As per https://discord.com/channels/1014774730907209781/1021695193499582494/1075068193753804831

The only limitation is that we cannot visually gray out the chevron itself because the corresponding font-awesome icon is a Pro icon (https://fontawesome.com/icons/angle-down?s=duotone&f=classic).

* Gray out the chevron when the control is disabled

* Remove empty line

* Disable the transition on the chevron

Apply effect immediately when the dropdown is enabled/disabled.
 2023-02-16 19:29:08 +05:30
AssassinJN
9f5f213cd3
Fix for dropdown widths (#883) 
* Fix dropdown location

* change width
 2023-02-16 10:35:46 +05:30
JeLuF
9d1dd09a07
'Download all images' button (#765) 
* Use standard DOM function

* Add 'download all images' button

---------

Co-authored-by: cmdr2 <secondary.cmdr2@gmail.com>
 2023-02-14 19:33:25 +05:30
cmdr2
0ad08c609d
Merge pull request #878 from patriceac/patch-26 
Removing the 'None' option for face correction
 2023-02-14 16:44:39 +05:30
patriceac
9799309db9
Fix reloading of tasks with no file path 
In some conditions tasks may be reloaded with an empty file path (e.g. no face correction)
 2023-02-14 02:31:13 -08:00
patriceac
f58b21746e
Removing the 'None' option for face correction 
As per conversation : https://discord.com/channels/1014774730907209781/1014780368890630164/1074802779471757405
 2023-02-13 17:42:36 -08:00
cmdr2
6971f9dcf1
Merge pull request #873 from AssassinJN/patch-1 
remove js based sizing
 2023-02-13 21:12:45 +05:30
AssassinJN
5922fd39c5
Fix for searchable model width 2023-02-13 09:31:53 -05:00
AssassinJN
cdbddbae3b
remove js based sizing 2023-02-13 09:20:11 -05:00
patriceac
074a14f056 Second batch of fixes for search models 
Addresses the issues reported by JeLuf:
- - gfpgan: the list with models doesn't appear under the <input> box
- merge models: As long as no models are selected, the <input> box is very short.
- When searching for models by name, the width of the model list shrinks and is smaller than the <input> element.
 2023-02-13 01:37:00 -08:00
patriceac
b1db708af1 Model search bug fixes 
First batch of bug fixes for model search:
- fix navigation issues with arrow keys when filtering models
- fix the issue with arrow keys jumping several entries after model reloading
- disable autocomplete in search box
 2023-02-12 23:23:26 -08:00
cmdr2
b2a66709b0
Merge pull request #868 from JeLuF/modelselect 
Use new model selector for merging and gfpgan
 2023-02-13 09:03:13 +05:30
JeLuF
dd21c07d4a Use new model selector for merging and gfpgan 2023-02-13 00:13:13 +01:00
cmdr2
ce9591428e hotfix for broken model dropdown. thanks @patrice 2023-02-12 18:46:09 +05:30
patriceac
a801a5d8b6
Searchable models (#786) 
* Searchable models

Creates searchable dropdowns for SD, VAE, or HN models. Also adds a reload models button (placed next to SD models, reloads everything including VAE and HN models).

* Fixing the editor pane display

* Revert "Fixing the editor pane display"

This reverts commit de902a6340.

* Move formatting to the CSS file

* Rewritten the siblings functions

I like these much better, and I imagine you will too. :)

* Code cleanup

* Minor tweak in list ordering

Minor tweak to move the root folder's content at the end of the list (similar to the current version).
 2023-02-12 14:48:09 +05:30
cmdr2
04e8458ce2
Merge pull request #862 from JeLuF/dragfix 
Fix task reordering
 2023-02-12 14:40:21 +05:30
patriceac
ccf71ed445
Fix the inpainter and image editor display 2023-02-11 21:57:56 -08:00
JeLuF
aa7c031e8a Fix task reordering 2023-02-12 01:02:27 +01:00
AssassinJN
f2f3ed71d4
Hide Image buttons hides task (#854) 
* hide task when all images are hidden

* Update main.css

* remove console logs

* remove another console log

* Update main.js

* Update main.js
 2023-02-10 22:58:07 +05:30
cmdr2
1dd165a9c9 Keep txt as the default metadata format, and write metadata files by default, if saving to disk 2023-02-10 18:13:08 +05:30
cmdr2
3c74540615
Merge pull request #794 from patriceac/Embed-Metadata 
Embed metadata
 2023-02-10 18:11:56 +05:30
cmdr2
f7b8e000c5
Merge pull request #830 from ogmaresca/sort-models 
Sort models alphabetically
 2023-02-10 17:42:24 +05:30
cmdr2
73abf131a6
Merge pull request #771 from patriceac/patch-19 
Fix restoration of models with subfolders
 2023-02-10 17:32:56 +05:30
cmdr2
5741af2aba
Merge pull request #777 from patriceac/preview-content-container 
Group image containers (DOM tweak)
 2023-02-10 17:28:08 +05:30
cmdr2
159af669f6
Merge pull request #769 from JeLuF/counter 
Fix number on the "Make X images" button
 2023-02-10 17:22:24 +05:30
cmdr2
573154633b
Merge pull request #793 from patriceac/patch-20 
Fix the tooltip display over image modifier cards
 2023-02-10 17:18:46 +05:30
cmdr2
baa8afd9eb
Merge pull request #843 from JeLuF/prompthook 
Add hook to implement custom prompt preprocessors
 2023-02-10 17:18:06 +05:30
cmdr2
9e718da70e
Merge pull request #789 from JeLuF/gfpgan-chooser 
Support multiple GFPGAN models
 2023-02-10 17:16:49 +05:30
cmdr2
4df442f169
Merge pull request #736 from JeLuF/enfdir 
Enforce an autosave directory
 2023-02-10 16:55:23 +05:30
cmdr2
1dc93c7a39
Merge pull request #829 from Schorny/beta 
add random_seed flag to reqBody
 2023-02-10 16:52:41 +05:30
Toni Schornboeck
3d124986d3
renamed random_seed to used_random_seed 2023-02-10 11:59:34 +01:00
cmdr2
4f3d2bd120
Merge pull request #779 from patriceac/Fix-card-names-and-toggling 
Fix card names and toggling
 2023-02-09 19:43:57 +05:30
cmdr2
b342fa9661
Merge pull request #837 from patriceac/patch-24 
Fix the behavior of the use as input button
 2023-02-09 19:09:09 +05:30
JeLuF
c576d582e2 Add hook to implement custom prompt preprocessors 2023-02-08 17:26:55 +01:00
cmdr2
0332cc8cb3 Don't force the user to 'low' VRAM usage automatically, if their GPU is less than 4 GB of VRAM. We need a better way to set 'low' as the default in the UI, but the user should be able to override it if they want 2023-02-08 19:41:55 +05:30
cmdr2
1ea294f15c Fix broken auto-save settings. We renamed sampler to sampler_name, which causes old settings to fail 2023-02-08 11:18:28 +05:30
Olivia Godone-Maresca
e7bf2ee58b Show models above folders in child folders to avoid models from appearing to belong the grandchild folder, prevent creating empty <optgroup />s 2023-02-07 21:13:06 -05:00
patriceac
a931aa59a3
Fix the behavior of the use as input button 
Clicking the button toggles the task container behind it.
 2023-02-07 18:02:42 -08:00
patriceac
a0178e15b3 More robust relative path calculation 2023-02-06 22:19:57 -08:00
cmdr2
f8bca93170 ED favicon 2023-02-07 11:31:56 +05:30
Toni Schornboeck
07ee97b862
add random_seed flag to reqBody (#1) 
expose if the user requested a random seed or used a fixed seed
 2023-02-06 23:13:00 +01:00
cmdr2
a0a58bcfa8
Merge branch 'main' into beta 2023-02-06 19:42:24 +05:30
cmdr2
0cbb553564 Follow the theme in the popup dialog box 2023-02-06 15:32:54 +05:30
cmdr2
f4512bb291 Color of close button 2023-02-06 15:19:10 +05:30
cmdr2
99205b4d03 Show an X over an image, instead of a remove button in image options 2023-02-06 15:14:47 +05:30
cmdr2
d48e6554d5 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2023-02-06 13:49:38 +05:30
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
patriceac
dd4937178f
Fix the tooltip display over image modifier cards 2023-01-24 01:37:37 -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
bb47835256
Another fix for high res images 
This time to address the height.
 2023-01-11 17:25:54 -08: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
ad5508a14d Fix typo 2023-01-10 21:54:31 +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
c3e6e63023
Merge pull request #754 from patriceac/patch-15 
Fix display of very large images
 2023-01-10 20:00:00 +05:30
cmdr2
9b5a262d63
Merge pull request #758 from patriceac/patch-16 
Fix image editor display
 2023-01-10 19:56:18 +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
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