Commit Graph

1378 Commits

Author SHA1 Message Date
cmdr2
230f7b478a
Merge pull request #1013 from JeLuF/text-css
Hardcode CSS content type
2023-03-15 18:44:54 +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
JeLuF
7af620f66e Hardcode CSS content type
By default, uvicorn uses the 'Content Type' value from 'Computer\HKEY_CLASSES_ROOT\.css' for the Content-Type header in its responses. Some systems have this set to 'application/x-css', an outdated content type used in the early days of CSS. Modern browsers ignore stylesheets that don't have the content-type 'text/css'. This change hardcodes the Content-Type to 'text/css', ignoring the registry.
2023-03-14 18:49:31 +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
30eb729973 Tweak preview slider width 2023-03-14 11:41:46 +05:30
cmdr2
7f24241372
Merge pull request #1005 from JeLuF/noplugins
Rename user hint
2023-03-14 10:42: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
cmdr2
05316ae25b
Merge pull request #965 from patriceac/patch-49
Fix the display of the preview scale slider
2023-03-14 10:36:45 +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
995bdc77b8
Merge pull request #938 from patriceac/patch-46
Make the image editor scrollable as needed
2023-03-14 10:35:59 +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
cmdr2
a4e496abc1
version 2023-03-14 10:34:52 +05:30
cmdr2
6cb981655e Fix a bug where the merge plugin wouldn't use the subfolder path of a model 2023-03-14 10:03:53 +05:30
JeLuF
2916a33fa2 Only delete task sections if they are no longer processing 2023-03-13 23:05:11 +01:00
JeLuF
ca555686ec Rename user hint 2023-03-12 22:31:14 +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
cmdr2
7826870d99 Logo change 2023-03-11 09:27:04 +05:30
JeLuF
3b708e8d44 Fix autosave of modifiers image style 2023-03-10 21:23:16 +01:00
cmdr2
0fd706f392 Bring back the ability to run on CPU on PCs with CUDA-compatible GPUs 2023-03-10 10:19:55 +05:30
Michael Gallacher
1496d6ec51 Hotfix rollup
* Reverts the recent 'torch.mps' changes since .mps is only available in torch v2.0, which isn't yet released.
* Includes Hotfitx 984
* Enables 'cpu-only' option when running on Apple silicon.
2023-03-09 14:10:29 -07:00
cmdr2
d1a45ed9ac Report the device GPU memory (and existence) correctly for mps (mac) 2023-03-09 21:15:00 +05:30
Olivia Godone-Maresca
3bb835b5e1
Support custom modifiers with images (#912)
* Support custom modifiers with images

* Add dash support

* Avoid needing to upgrade fastapi

* Revert gitignore
2023-03-08 20:52:31 +05:30
cmdr2
942904186a changelog 2023-03-08 10:02:05 +05:30
Michael Gallacher
11265c4034 Add support for MPS when running on Apple silicon
Changes:

* autodetect if MPS is available and the pytorch version has MPS support.
* change logic from "is the device CPU?" to "is the device not CUDA?".
* set PYTORCH_ENABLE_MPS_FALLBACK=1

Known issues:

* Some samplers (eg DDIM) will fail on MPS unless forced to CPU-only mode
2023-03-07 14:57:37 -07:00
patriceac
7c0ec9faaf
Fix the display of the preview scale slider
As per https://discord.com/channels/1014774730907209781/1014780368890630164/1080772220760109066.
2023-03-05 19:19:02 -08:00
cmdr2
9dd819e193 Workaround to fix the broken Rabbit Hole plugin 2023-03-02 13:55:53 +05:30
cmdr2
5e2f31e3bf Merge branch 'main' into beta 2023-03-02 10:15:51 +05:30
cmdr2
f78b31b1bc Less jittery dropdown 2023-03-01 18:41:21 +05:30
cmdr2
8d698cb997 reword 2023-03-01 18:35:41 +05:30
cmdr2
8945aac319 Merge models is no longer in beta 2023-03-01 18:28:58 +05:30
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
b425b43d3e changelog 2023-02-28 15:38:53 +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
05cafce1e8
Make the image editor scrollable as needed
Some users on 4K screens zoom in their browser display, but this causes the editor buttons on the top right to be out of view, and since the editor is not scrollable, they have to zoom out to be able to hit 'save'.

This change fixes that by making the image editor window vertically scrollable if it gets too large. No UI change on smaller screens (e.g. phones).
2023-02-25 13:02:09 -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
de1d1ad961 Shrink the preview tools buttons to icons-only on a small screen 2023-02-24 21:50:21 +05:30
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
e0258d9e7b
Merge pull request #930 from patriceac/patch-40
Fix the display of the Preview options button
2023-02-23 19:29:00 +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
patriceac
204a68b17d
Fix the display of the Preview options button
The preview options button overlaps the image task container when the window is reduced because of the float:right property of the button. This technique makes the parent div grow as needed when it contains a floated element, resulting in cleaner display.
2023-02-22 19:11:18 -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
7c1f18b6cd reword test 2 2023-02-22 20:16:52 +05:30
cmdr2
b59371988d Minor styling tweak 2023-02-22 20:15:33 +05:30
cmdr2
30dbadb2ab Focus the prompt textbox on start 2023-02-22 20:11:19 +05:30
cmdr2
a342de0207 Rename dropdown to 'View options' 2023-02-22 20:08:17 +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
cmdr2
0e41483564 version 2023-02-22 19:35:13 +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
cmdr2
f1a7aed1b6
Merge pull request #916 from JeLuF/skipst
Don't scan safetensors files
2023-02-21 08:39:52 +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
ayunami2000
e25e1bfe10
Make stream_image_progress accept an integer for the rate the progress frames should be generated. (#889)
* Make stream_image_progress accept an integer

for the rate the progress frames should be generated.

* Use a different field for the progress interval.
2023-02-21 08:38:21 +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
JeLuF
bdbb741716 Don't scan safetensors files
In newer versions of the picklescanner, scanning of .safetensors files creates an error:

21:28:01.067 ERROR MainThread ERROR: parsing pickle in D:\2.35\dev\models\stable-diffusion\dantionrealmix_10.safetensors: at position 1, opcode b'\xce' unknown

To avoid these entries in the logs, skip scanning of safetensors files.
2023-02-20 22:44:10 +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
380e9aaf13
Merge pull request #903 from patriceac/patch-33
Fix autoscroll behavior for the first image
2023-02-20 18:56:52 +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
504f7f3799
Merge pull request #913 from patriceac/patch-35
Fix the toggling of image modifiers
2023-02-20 18:49:52 +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
41a3309cbe
Fix the toggling of image modifiers
The toggling of image modifiers doesn't get properly applied if weights are changed after restoring the image modifiers.
2023-02-19 15:59:20 -08: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
cmdr2
e7a2dfa57f changelog 2023-02-18 14:31:39 +05:30
patriceac
e051dbc2c7
Fix autoscroll behavior for the first image
When the first image is generated, the autoscroll triggers before the image is fully displayed by the browser. This causes it to not be positioned properly.
The fix is to listen for the "load" event on the IMG element before triggering the scrolling event. Once the image fully loaded and rendered, the browser correctly detects the size of the viewport and renders properly.
2023-02-18 00:00:00 -08:00
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