Commit Graph

97 Commits

Author SHA1 Message Date
JeLuF
d818107953 Remove warning when reusing settings - Fixes #1290 2023-05-25 13:36:45 +02:00
Olivia Godone-Maresca
a6dbdf664b Add Clip Skip to metadata files
Also, force the properties to be in a consistent order so that, for example, LoRA strength will always be the line below LoRA model. I've rearranged the properties so that they are saved in the same order that the properties are laid out in the UI
2023-05-19 19:05:32 -04:00
JeLuF
00603ce124 Add Clip Skip support 2023-05-18 13:55:45 +02:00
cmdr2
469585ddda Use ES5 style trailing commas, to avoid unnecessary lines during code diffs 2023-04-28 15:50:44 +05:30
Lucas Marcelli
aad1afb70e add prettier for JS style 2023-04-27 13:56:56 -04:00
patriceac
4f2df2d188
Properly reset LoRA selection from Use Settings 2023-04-08 18:19:03 -07:00
JeLuF
9e244f758c Don't paste empty prompts
When pasting e.g. an image, window.clipboardData).getData('text') returns an empty string, which would delete the prompt.
https://discord.com/channels/1014774730907209781/1093186485563424838
2023-04-07 22:24:35 +02:00
cmdr2
888dc05cde
Merge pull request #1107 from ogmaresca/save-lora-strength-in-metadata
Add LoRA Strength to metadata files
2023-04-06 15:47:23 +05:30
patriceac
6aa048e3ad
Reset the LoRA dropdown if not present in the task 2023-04-02 02:04:03 -07:00
Olivia Godone-Maresca
07b467e4bc Add LoRA Strength to metadata files 2023-04-01 11:42:20 -04:00
cmdr2
590472cab2
Merge pull request #1063 from patriceac/patch-61
Fire event when random seed is toggled by dnd.js
2023-03-28 15:45:50 +05:30
patriceac
728e7c79fd
Add support for LoRA models to dnd.js (#1054)
* Add support for LoRA to dnd.js

Adds support for LoRA to dnd.js (task restoration, use settings, etc.).

* Correct extensions for LoRA

---------

Co-authored-by: cmdr2 <shashank.shekhar.global@gmail.com>
2023-03-28 15:37:50 +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
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
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
cmdr2
50e4683492
Merge pull request #907 from ogmaresca/webp-support
Support WEBP image formats
2023-02-20 18:36:40 +05:30
Olivia Godone-Maresca
c2c33b7df1 Support WEBP outputs 2023-02-18 22:37:34 -05: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
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
JeLuF
aa7c031e8a Fix task reordering 2023-02-12 01:02:27 +01:00
cmdr2
73abf131a6
Merge pull request #771 from patriceac/patch-19
Fix restoration of models with subfolders
2023-02-10 17:32:56 +05:30
patriceac
a0178e15b3 More robust relative path calculation 2023-02-06 22:19:57 -08:00
patriceac
01368ac496 Add support for Windows path names 2023-01-25 02:47:50 -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
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
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
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
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
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
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
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
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
0a2c70595d Turbo be gone 2022-12-27 14:51:03 +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
84bddee2ce Treat none as a boolean false in drag-and-drop 2022-12-24 19:41:36 +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