Commit Graph

664 Commits

Author SHA1 Message Date
cmdr2
e4550f7eb4
Merge pull request #1034 from JeLuF/short
Make file names of downloaded files shorter
2023-03-28 15:33:40 +05:30
patriceac
48b233304f
Only notify upon disabling 2023-03-25 02:51:46 -07:00
patriceac
1c2e353fc5
Fire event when random seed is toggled by dnd.js
This is to let plugins know that the state of the random seed toggle was programmatically changed by dnd.js. No change for regular UI.
2023-03-25 02:47:05 -07:00
patriceac
356375677d
Fix restoration of disabled image tags
Fix a regression introduced by PR 1003 that causes disabled image tags to be restored in an enabled state by the "image modifiers improvements" plugin. No change in the regular UX.
2023-03-25 02:09:11 -07:00
Olivia Godone-Maresca
e42ddbd652 Allow saving lossless WEBPs 2023-03-24 22:46:03 -04:00
patriceac
d1f341678c
Fix for Clear button in image editor 2023-03-24 00:08:51 -07:00
cmdr2
3faaed9819 Send the lora model in the request only if in test_diffusers mode 2023-03-21 20:45:12 +05:30
cmdr2
593e9748b9 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2023-03-21 18:11:16 +05:30
cmdr2
f8bc50871a sdkit 1.0.49; Use a test_diffusers flag to gate access to the new renderer and LoRA model selection 2023-03-21 17:59:20 +05:30
JeLuF
4871f7fed7 UNDO_LIMIT 2023-03-21 01:31:12 +01:00
JeLuF
0f3a3da5ed Add undo support 2023-03-20 22:53:13 +01:00
JeLuF
b5da4e2fa0 Make download file names shorter 2023-03-19 17:29:13 +01:00
JeLuF
7917ac8ebc Load prompt: support JSON and TXT metadata
Also, allow prompt files (one line per prompt) to be dnd'ed
2023-03-19 16:21:17 +01:00
cmdr2
394cb72e46
Merge branch 'beta' into zoom 2023-03-16 11:47:14 +05:30
cmdr2
57c85a64c7
Merge pull request #1018 from AssassinJN/patch-3
remove task from dome when removing images
2023-03-16 11:46:31 +05:30
cmdr2
3507f91090 Remove click event for preview image expansion, since it breaks Rabbit Hole 2023-03-16 11:12:10 +05:30
JeLuF
aa3bc864ee Also fix clicks into the image 2023-03-16 00:32:10 +01:00
JeLuF
db769dd995 When zooming, only show one copy of the image
Don't add a copy of the image for each live preview image shown
2023-03-16 00:08:24 +01:00
cmdr2
a0f2097b1b Move the createElement() function to utils.js 2023-03-15 21:30:12 +05:30
cmdr2
6298df14e7 Hide only the filtered-out button in a row, not the entire row 2023-03-15 21:20:56 +05:30
AssassinJN
2d0a76c5a4
remove task from dome when removing images
Changing the functionality to remove task from dom when all images have been removed. This will save system memory in the browser allowing better performance.
2023-03-15 11:13:26 -04:00
cmdr2
b7a7a7d31f Move similar image info buttons into a single row, using the new array API 2023-03-15 19:41:19 +05:30
cmdr2
841811e3bc Full screen button on images; Changelog 2023-03-15 19:25:55 +05:30
cmdr2
0679fb2b20
Merge pull request #1017 from ogmaresca/image-modal
Add image modal functionality
2023-03-15 18:45:17 +05:30
Olivia Godone-Maresca
c8f8f329e3
Allow creating custom HTML elements for image info button plugins (#1007)
* Allow creating custom HTML elements for image info button plugins

* Allow arrays and labels

* Add spacing between buttons on the same row
2023-03-15 18:44:43 +05:30
Olivia Godone-Maresca
ab7d74d2fa Add a image modal function 2023-03-14 21:43:49 -04:00
JeLuF
c9ddf4d15f Fix #1012 - Image Modifiers > Thumbnail Size slider remembers its position but does not apply it at page load 2023-03-14 19:02:34 +01:00
cmdr2
24b631500a
Merge pull request #1009 from JeLuF/BigX
Only delete task sections if they are no longer processing
2023-03-14 21:57:59 +05:30
cmdr2
0ddcc98a57
Merge pull request #1004 from JeLuF/toosmall
Warn users about small image dimensions
2023-03-14 10:42:13 +05:30
cmdr2
9ca8cf810b
Merge pull request #1003 from patriceac/patch-50
Notify plugins when image tags get refreshed
2023-03-14 10:41:12 +05:30
JeLuF
3c2157111b
Download all: Add Metadata download (#923)
* Download all: Add Metadata download

* Harmonise capitalisation

* Add JSzip, download popup

* 'Save all' popup
- add ZIP download with JSON and folder support
- Popup to prevent accidental trigger of an image download
- Use FileSaver polyfill for better browser support

* remove debug output

* Make DownloadImages a tertiary button
2023-03-14 10:40:24 +05:30
patriceac
d26e646a94
Refresh the image count as user types (#936)
* Refresh the image count as user types

Currently I have to change the focus for the image count to refresh. This change makes it immediate. I've been wondering if 'change' should merely be replaced by 'keyup' but decided against it for accessibility reasons (people who might be using accessibility tools with alternative input methods).

* Add a debounce

Setting a debounce of 300ms on keyup.
2023-03-14 10:37:55 +05:30
patriceac
1fda12640f
Custom Image Modifiers dialog tweaks (#935)
* Custom Image Modifiers dialog tweaks

Couple minor usability improvements for the custom image modifiers dialog:
- set the focus to the textbox when opening the dialog
- pressing the Escape key closes the dialog

* Adding keyboard shortcuts

Escape to cancel the changes, Ctrl+Enter to confirm the changes. No change to the existing UI behavior using the mouse.

* Make the overlay focusable

Allows the keyboard shortcuts to work if user clicks on the main window rather than the textbox itself.

* Disable spell and grammar correction
2023-03-14 10:37:21 +05:30
patriceac
079402cb2f
Fix restoration of weighted tasks with truncated modifiers (#956)
* Fix restoration of weighted tasks with truncated modifiers

* Reverting this change

Will create a separate PR for this as needed. Doesn't impact the other bug fix.

* Update utils.js
2023-03-14 10:36:21 +05:30
cmdr2
c52b72f500
Merge pull request #991 from JeLuF/modi
Fix autosave of modifiers image style
2023-03-14 10:35:34 +05:30
JeLuF
2916a33fa2 Only delete task sections if they are no longer processing 2023-03-13 23:05:11 +01:00
JeLuF
03256f6bba Warn users about small image dimensions
Show a warning if the user chooses width & height < 512px
2023-03-12 20:43:54 +01:00
patriceac
257b14ee09
Notify plugins when image tags get refreshed
Image modifiers may be temporarily hidden by plugins like searchable modifier search box, and when restoring a task (e.g. use settings) the image modifier s copied with the hidden class set, which makes it look like it's missing.

By notifying plugins that the image tags have been refreshed, it allows it to act accordingly (in this case by making sure image tags are visible).
2023-03-12 01:23:05 -08:00
cmdr2
bb0f7cd1cd Load mask from file 2023-03-11 12:37:51 +05:30
JeLuF
3b708e8d44 Fix autosave of modifiers image style 2023-03-10 21:23:16 +01:00
cmdr2
f2a960136e Move zoom and 'scroll to generated image' into a flat icon strip, with a press-toggle button for the 'scroll to' button; Tweaked the behavior of the on-scroll dropdown CSS class 2023-03-01 18:27:48 +05:30
cmdr2
7a1170f1dd Use naturalWidth, to show the actual image width (especially for upscaled images) 2023-03-01 15:22:38 +05:30
cmdr2
24cce08580 Show the image dimensions on mouse over 2023-03-01 15:17:27 +05:30
cmdr2
353fe88226 Set tertiary colors on buttons that don't need to be visible in a very dominant manner 2023-02-28 15:37:38 +05:30
cmdr2
1a3086230e Set the dropdown width only when the dropdown is opened, to fix a bug where it would get set before the DOM element actually rendered. The settings field is collapsed by default (on new installations), so the computed DOM width would be invalid 2023-02-28 15:37:06 +05:30
patriceac
0e57487774
Preserve full names for shortened modifiers (#945)
* Preserve full names for shortened modifiers

The PR https://github.com/cmdr2/stable-diffusion-ui/pull/779/files added code to preserve the full names of truncated image modifiers, but only in the "short image modifiers" code path. This PR fixes that by preserving the full car name for truncated modifier names too.

* Pick the full modifier name

The previous code selected the entire innerText from the modifier-car-label element, but for truncated modifiers this would also include the tooltip text. This modification fixes that by only picking specifically the full modifier name.

* Only pick the full modifier name

Previous code would pick up the tooltip text too, causing a mismatch of strings in the comparison.

* Display the truncated image modifier names

What we process and compare is always the full image modifier string, but we still want to display a shortened string when applicable.
2023-02-28 14:42:24 +05:30
cmdr2
3024465086
Merge pull request #932 from patriceac/patch-42
DOM tweaking to identify modifier categories
2023-02-28 14:41:46 +05:30
cmdr2
c95b43253a
Merge pull request #933 from patriceac/patch-43
Cleanup logging
2023-02-28 14:41:04 +05:30
patriceac
d83e034d5e
Select model by clicking on the file icon itself
Currently one has to click on the model name to select a model. Clicking on the file icon won't work and doesn't do anything. This change fixes that behavior by allowing the user to click on either the model name or the file icon to select a model.
2023-02-26 17:26:22 -08:00
patriceac
b9676b51cb
Cleanup logging
Is it okay for you if I comment this in Beta?
2023-02-24 17:46:53 -08:00
patriceac
5698473891
Renaming custom-modifier-category to modifier-category 2023-02-24 13:55:18 -08:00
cmdr2
bd82480fa3 Keep the min-width of a dropdown equal to the width of the input element 2023-02-24 20:08:19 +05:30
cmdr2
fce8b96d3b Tweaks to the styling of the models dropdown 2023-02-24 19:29:25 +05:30
cmdr2
37b47e7f05 Show root-level models at the top 2023-02-24 18:55:57 +05:30
patriceac
a6f94959fe
DOM tweaking to identify custom categories
This is purely a DOM update to be able to identify the custom category a given custom image modifier is part of, e.g. using .closest() from a custom modifier plugin. No UI change.
2023-02-24 01:16:14 -08:00
cmdr2
45a2c9f7ef Show icons next to the model folder and files in the dropdown, styling tweaks to increase padding 2023-02-23 22:11:53 +05:30
cmdr2
c49ac6880d
Merge pull request #931 from patriceac/patch-41
Fix the restoration of the inpainting toggle
2023-02-23 19:29:40 +05:30
cmdr2
e3ff6f183b
Merge pull request #928 from ogmaresca/fix-models-up-down-arrow-keys
Fix up/down arrow keys on model selects
2023-02-23 19:28:16 +05:30
patriceac
e6ec7393c6
Fix the restoration of the inpainting toggle
The Inpainting toggle doesn't get restored at the very first attempt.

Repro steps:
1. Create a task with a source image and enable the inpainting toggle.
2. Copy the task to the clipboard
3. Refresh the page (F5)
4. Paste the task from the clipboard

Expected result:
The task gets restored and the toggle is ON.

Actual result:
The task is restored, but the toggle is OFF.

To fix that, we have to restore the toggle's state after loading the source image.
2023-02-22 23:46:07 -08:00
Olivia Godone-Maresca
1379dde1a7 Fix up/down arrow keys on model selects 2023-02-22 18:18:06 -05:00
rbertus2000
79eee62d42
fix for thumbnail slider 2023-02-22 22:05:16 +01:00
cmdr2
30dbadb2ab Focus the prompt textbox on start 2023-02-22 20:11:19 +05:30
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
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
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
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
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
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
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
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
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
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