holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,932 Commits 12 Branches 36 Tags 62 MiB
852e129f9c
Commit Graph

284 Commits

Author SHA1 Message Date
patriceac
40ebf468d3 Hotfix for repeat image modifiers 
As per Discord conversation, this PR fixed the image modifiers behavior when a modifier appears more than once, and also fixes a regression introduced by ((weighted modifiers)).
 2022-11-30 22:13:13 -08:00
cmdr2
1949d8a50c Tweak modifiers help msg 2022-11-30 16:32:43 +05:30
cmdr2
7c50b8bf94
Merge branch 'beta' into Mouse-wheel-behavior-fixes 2022-11-30 16:22:45 +05:30
cmdr2
141ff74ece
Merge pull request #557 from madrang/webmanifest 
Added web manifest to allow installing the Url as a web app.
 2022-11-30 16:19:04 +05:30
cmdr2
6d131d9d8e
Merge branch 'beta' into Fix-UI-display-when-removing-the-last-task 2022-11-30 16:14:28 +05:30
cmdr2
a2c8c99215
Merge pull request #541 from patriceac/patch-2 
Fix restoration of parallel output setting
 2022-11-30 15:53:30 +05:30
cmdr2
465676e9ea
Merge pull request #542 from patriceac/patch-1 
Fix restoration of model and VAE
 2022-11-30 15:51:31 +05:30
cmdr2
4348333497 Don't register listeners for an autosave setting, if they've already been registered 2022-11-30 15:45:30 +05:30
cmdr2
029509ebad Unify IP info with devices, into a system_info table 2022-11-30 14:34:24 +05:30
cmdr2
b96b55c5ce
Merge branch 'beta' into serverip 2022-11-30 14:00:12 +05:30
Marc-Andre Ferland
1f5aba010e Merge branch 'beta' of https://github.com/cmdr2/stable-diffusion-ui.git into webmanifest 
# Conflicts:
#	ui/index.html
 2022-11-30 03:29:46 -05:00
cmdr2
f0b3bea4e3 Also confirm before the 'Stop All' button acts; Tweak wording of confirm dialog 2022-11-30 13:54:42 +05:30
cmdr2
0b96fa112d
Merge branch 'beta' into confirm 2022-11-30 13:47:08 +05:30
cmdr2
159c3edfe3 Simplify the logic for toggling modifier cards, no need to loop through the cards, since we already have the card object in hand 2022-11-30 13:33:20 +05:30
cmdr2
f74fa8657b
Merge pull request #518 from patriceac/patch-6 
Fix duplicate custom modifiers activation states
 2022-11-30 13:27:14 +05:30
cmdr2
ff9430b8a2 Tabs to 4 spaces 2022-11-30 12:18:34 +05:30
cmdr2
0ea38db7ef Show the SD 2.0 setting only to beta users 2022-11-30 12:05:46 +05:30
patriceac
a69d4c279e Make seed field behavior deterministic 
Copying the image settings while 'Random' is enabled would cause the seed to be randomized. This was misleading as what I see wasn't what I would get.
 2022-11-29 19:04:42 -08:00
patriceac
69f14edd80 Tweak the seed behavior 
Update the seed *before* starting the processing, so interrupting the processing retains the seed being used for the batch being currently processed.

The idea behind that is that if I like the gen I'm currently seeing and want to build on top of it, I can create a new task with the same seed without having to wait for the current task to complete.
 2022-11-28 01:19:31 -08:00
patriceac
14714b950d Slight improvement of detection logic 2022-11-28 00:14:12 -08:00
Marc-Andre Ferland
99bdcfa0a5 Set theme-color from the current selected theme. 2022-11-27 15:49:54 -05:00
patriceac
e64e1a92e6 Fix UI display when removing the last task 
Clear All button properly shows the "welcome message", but Remove the last task would just result in a blank Preview pane.
 2022-11-27 12:42:51 -08:00
patriceac
e278e639a3 Fix removal of image modifiers with non-zero weights 
Properly handles removal of image modifiers that had (((modifiers))) or [[[modifiers]]] updated at runtime.
 2022-11-27 03:00:19 -08:00
cmdr2
ea7b28c9d5 Placeholder changes for SD 2.0 support, haven't tested yet 2022-11-25 12:17:44 +05:30
patriceac
472ab4a9ce
Fix restoration of parallel output setting 2022-11-24 14:15:27 -08:00
patriceac
fca84e3edf
Fix restoration of model and VAE 
😅
 2022-11-24 13:47:35 -08:00
JeLuF
6eff591df7 System settings to disable the 'Are you sure?'-dialogs 2022-11-23 23:05:30 +01:00
JeLuF
3452d7852a
Merge branch 'beta' into serverip 2022-11-23 11:28:05 +01:00
JeLuF
f1fa10badd Show network addresses in system settings 
Users sometimes struggle to get the IP address of their PC. This PR adds a button to the system settings pane that will list the server's IP
addresses.
 2022-11-23 11:25:36 +01:00
patriceac
c56a2adbcb Custom modifiers as a plugin 2022-11-22 19:04:20 -08:00
JeLuF
a486f20892
Merge branch 'beta' into confirm 2022-11-22 21:33:18 +01:00
JeLuF
49535deb2e Confirm 'Clear All' and 'Stop Task' 
Ask for a confimation before clearing the results pane or stopping a render task. The dialog can be skipped by holding down the shift key while clicking on the button.
 2022-11-22 21:27:36 +01:00
Marc-Andre Ferland
3169485f33 Fixing file drag and drop. 2022-11-22 11:11:06 -05:00
patriceac
e8dd930a50
Add support for custom modifiers to d&d and clipboard 
Add support for custom modifiers to d&d and clipboard and remove now-redundant code in restoreTaskToUI.
 2022-11-22 00:06:43 -08:00
cmdr2
923c889de8
Merge pull request #495 from madrang/pasteFix 
Fix pasting in Firefox.
 2022-11-21 16:15:24 +05:30
cmdr2
b51407486a
Merge pull request #517 from patriceac/patch-5 
Fix duplicate custom modifiers restoration
 2022-11-21 16:05:17 +05:30
cmdr2
a689b34ed1
Merge pull request #506 from patriceac/patch-2 
VAE support in Use Settings
 2022-11-21 16:02:51 +05:30
cmdr2
e96b9005ca
Merge pull request #514 from JeLuF/checkinput 
Prevent empty fields in make image request
 2022-11-21 12:36:23 +05:30
patriceac
cbc48e31e1
Fix duplicate custom modifiers activation states 
Fixing activation state for custom modifier cards sharing the same tag where only one of the cards gets (de)activated.
 2022-11-19 19:25:28 -08:00
patriceac
577dd9048f
Fix duplicate custom modifiers restoration 
Fix for duplicate image modifiers when restoring a task in which several custom modifier cards share the same tag.
 2022-11-19 19:21:36 -08:00
JeLuF
ae409dd0ec Prevent empty fields in make image request 
Prevent render jobs to fail with HTTP 422 due to empty fields in the image settings.
https://discord.com/channels/1014774730907209781/1043481789706031215/1043481789706031215
https://discord.com/channels/1014774730907209781/1014774732018683927/1042768986871443516

minor change, no CHANGE.md entry
 2022-11-19 21:00:41 +01:00
JeLuF
6c156380f9 Add network settings to the UI 
Allow users to choose the uvicorn port
Allow users to restrict uvicorn to only listen on localhost
 2022-11-19 17:10:45 +01:00
patriceac
2111a81d18
Proper PR for VAE support in Use Settings 2022-11-19 00:56:44 -08:00
cmdr2
d03521bf12 Use as Input -> Use these settings 2022-11-18 21:11:34 +05:30
cmdr2
3eb1919c81 Fix the missing (beta) label next to the version number 2022-11-18 19:38:16 +05:30
cmdr2
0067e46192
Merge pull request #501 from mdiller/mdiller_fancyswitches 
Better Toggle Inputs & Updated Settings UI
 2022-11-18 16:17:54 +05:30
cmdr2
921711a679 Don't crash if an invalid model file is beign scanned 2022-11-18 16:12:45 +05:30
cmdr2
1f815d7562
Merge branch 'beta' into scanner 2022-11-18 16:01:50 +05:30
cmdr2
f74c57449e Cosmetic changes to Use Settings 2022-11-18 15:54:47 +05:30
cmdr2
a697bd935a Refactor the Use Settings code, and move that to the common restoreTask() function 2022-11-18 15:38:17 +05:30
cmdr2
7ffeb3964b
Merge pull request #463 from patriceac/beta 
Adding Use Settings
 2022-11-18 14:40:04 +05:30
Malcolm Diller
bfc21220a7 added hamunii theme 2022-11-17 18:13:08 -08:00
Malcolm Diller
507491fbec added fancy switches and updated the ui of the settings tab 2022-11-17 17:58:09 -08:00
Marc-Andre Ferland
e052610184 Removed debugging log calls. 2022-11-17 02:45:09 -05:00
Marc-Andre Ferland
3a18606385 Disable when targeting input elements. 2022-11-17 02:36:14 -05:00
Marc-Andre Ferland
e25a94e815 Bug fix, forgot to await promise. 2022-11-17 02:20:01 -05:00
Marc-Andre Ferland
c13f662e2d Use the document paste event for pasting json and text data. 2022-11-17 02:16:20 -05:00
Marc-Andre Ferland
1364fd5c45 Fix pasting in Firefox. 
Should not display button.
https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/readText#browser_compatibility
 2022-11-17 01:44:11 -05:00
cmdr2
cc3186a683 Highlight the Save settings button when pressed 2022-11-17 11:01:10 +05:30
cmdr2
0c93c4754d Tabs to spaces 2022-11-17 10:49:22 +05:30
JeLuF
3e18f2f09c Picklescan of model files 
During getModel(), the server picklescans the model files for potential
malicious code in the pickled python objects. If a malicious file is
found, the web UI will show a big red error message, the makeImage
button will be disabled, and the user must remove the malicious file
and reload the UI page.
 2022-11-16 22:34:02 +01:00
cmdr2
18d9d2602a Add a 'What's New?' tab as a core plugin, which fetches the contents of CHANGES.md from the app's release branch 2022-11-16 16:54:28 +05:30
patriceac
9764d9109f Merge remote-tracking branch 'upstream/main' into beta 2022-11-16 00:29:52 -08:00
cmdr2
a59bac4b40 UI setting for preventing browser autostart 2022-11-16 12:43:46 +05:30
cmdr2
e99d54d1f6 Merge main 2022-11-16 11:19:10 +05:30
cmdr2
f124cf8318
Make the task config summary labels bold 2022-11-15 16:06:35 +05:30
cmdr2
5cf763d51f Add a 'Save' button in settings, to avoid starting/stopping threads while a user is still modifying their GPU settings 2022-11-15 12:22:55 +05:30
cmdr2
6530e45178
Merge pull request #478 from madrang/beta 
Changed update_render_threads to use SetAppConfigRequest.
 2022-11-15 11:04:52 +05:30
Marc-Andre Ferland
ffe0eb1544 Changed update_render_threads to use SetAppConfigRequest to set which devices are active. 
Keep ImageRequest.render_device for affinity only. (Send a task to an already active device.)
 2022-11-14 21:54:24 -05:00
JeLuF
288e8a65f3
Incr. Server State Validtiy to 90s 
By default, healthCheck() is run every 5s. On background tabs, this may get extended. My tests have shown pings every 60s. The ping was older than 10s, so the condition in line 490 evaluates to `false` and the client tries to access the stream before the server is ready. By increasing the validity this can be avoided - at least until the browser runs the healthcheck even less often.

See https://discord.com/channels/1014774730907209781/1041811939380178964/1041812021018120262 for the analysis.
 2022-11-14 23:18:03 +01:00
JeLuF
f22f57495e Fix system info for CPU mode 2022-11-14 17:55:36 +01:00
cmdr2
f06a97d30b Move system info into settings 2022-11-14 21:21:48 +05:30
cmdr2
64ff1ecbb6 Formatting for mem free 2022-11-14 21:02:17 +05:30
cmdr2
8707f88c07 Show mem free info 2022-11-14 20:35:47 +05:30
cmdr2
0cb2f19e29 Mark multi GPU as experimental in the UI 2022-11-14 20:06:20 +05:30
cmdr2
125a50ae87 Include the gpu id in the gpu list and system info 2022-11-14 20:01:57 +05:30
cmdr2
31617ae340 Show a system info tab, which shows the active GPUs 2022-11-14 19:53:40 +05:30
cmdr2
257cd34101
Merge branch 'beta' into beta 2022-11-14 19:06:35 +05:30
cmdr2
ab6ec3a9b7 Fix - setting can be null sometimes (autosave) 2022-11-14 18:10:23 +05:30
cmdr2
39814a89b6 Fix - setting can be null sometimes (autosave) 2022-11-14 18:09:25 +05:30
cmdr2
24fbbf8aa8 Remove unused variables 2022-11-14 16:26:16 +05:30
cmdr2
1d2b3a4ed8 Hide/show the GPUs list depending on whether auto is selected 2022-11-14 13:14:33 +05:30
cmdr2
f904945d40 Disable the GPU list if auto is enabled 2022-11-14 13:02:36 +05:30
cmdr2
ea03fd22db Start on multiple GPUs by default (top 75 percentile by free_mem); UI selection for 'cpu' or 'auto' or a list of specific GPUs, which is now linked to the backend; Dynamically start/stop render threads for the devices, without requiring a full program restart 2022-11-14 11:23:22 +05:30
JeLuF
e561e4de0b Visual feedback for the copy and paste icons 2022-11-14 01:58:24 +01:00
JeLuF
1c3d5cd851 Add paste button next to copy button 2022-11-14 01:23:04 +01:00
cmdr2
fa16ca4eec
Update auto-save.js 2022-11-12 17:39:26 +05:30
cmdr2
98aefad249
Skip if a setting isn't present 2022-11-12 17:24:48 +05:30
cmdr2
cd5f847b55 Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta 2022-11-11 12:03:14 +05:30
patriceac
39b6c5d6f4 Merge remote-tracking branch 'upstream/beta' into beta 2022-11-10 22:30:28 -08:00
patriceac
903acff924 Adding Use Settings 2022-11-10 18:36:39 -08:00
JeLuF
5a06946469 Add event listener beforeunload 
When closing the window, a warning is shown if there are any render results.
 2022-11-10 23:23:20 +01:00
cmdr2
baef31b2c7 Send 'auto' as the render_device from the UI 
, if no GPU is selected and CPU is unchecked)
 2022-11-10 22:23:15 +05:30
cmdr2
3f26d03166 Show GPU list in the UI only if the PC has more than 1 GPU 2022-11-10 16:34:01 +05:30
cmdr2
1fed3ad532 Don't propagate events in the Stop Task button 2022-11-10 15:33:39 +05:30
cmdr2
0da6354825 Press Ctrl+Enter to start a task 2022-11-10 14:59:01 +05:30
cmdr2
058ce6fe82 UI-side changes for selecting multiple GPUs, and keeping the Use CPU option synchronized with the backend. This change isn't ready to be shipped, it still needs python-side changes to support the req.render_device config 2022-11-09 19:17:44 +05:30
cmdr2
6c1dda47c0 Don't change the page when something other than an image or text file is dropped into the page (or an image is dropped outside the init image box) 2022-11-09 15:21:41 +05:30
cmdr2
bca98269bb Fix a bug where the custom image modifiers button would close the modifiers panel 2022-11-09 13:46:50 +05:30
cmdr2
1bebaf933d Bring back the old style panels for image settings and modifiers 2022-11-09 13:43:43 +05:30
Malcolm Diller
69c7f22053 Merge branch 'beta' into mdiller_ui_reorganize 2022-11-08 21:22:22 -08:00
Malcolm Diller
4eb2b818e7 shrank system settings a bit so it fits on monible 2022-11-08 20:47:55 -08:00
Malcolm Diller
e175b87384 updated so tabs work now, and we have a settings tab and an about tab 2022-11-08 19:54:41 -08:00
Malcolm Diller
f216ee739a updated with latest updates for this support 2022-11-08 19:22:14 -08:00
JeLuF
38afc6e6f8 Fix: Uncaught TypeError: Cannot set properties of null 2022-11-08 19:05:28 +01:00
cmdr2
a86b6bfbd6 Fix a bug with drag-and-drop where the upscale dropdown would not get enabled/disabled based on the setting 2022-11-08 18:46:55 +05:30
cmdr2
1176ddcc85 Fix a bug in drag-and-drop where an empty Negative Prompt line would result in the next line getting assigned to negative prompts; Simplify the drag-and-drop text file parsing logic to use a single algorithm, the files are small enough that we don't need over-optimization and confuse new developers 2022-11-08 18:44:11 +05:30
cmdr2
fa080e380c Fix a bug where images could no longer be dragged and dropped onto the initial image box 2022-11-08 18:14:26 +05:30
cmdr2
9bc7521de0 Make custom VAE an Image Setting, rather than a System Setting; Don't load a VAE into memory by default 2022-11-08 16:54:15 +05:30
Marc-Andre Ferland
3576214920 Remove prompt_strength and init_image when not using in-painting 2022-11-05 13:39:19 -04:00
Marc-Andre Ferland
f964fe3750 Add on/off support for parsing boolean. 2022-11-05 13:33:38 -04:00
cmdr2
82d764000a Fix https://github.com/cmdr2/stable-diffusion-ui/issues/441 - numerical validation 2022-11-04 19:54:59 +05:30
cmdr2
749c72e6a6 Fix https://github.com/cmdr2/stable-diffusion-ui/issues/441 - numerical validation 2022-11-04 19:48:34 +05:30
Marc-Andre Ferland
d04aa89812 Fix 'Use Upscaling' dropdown getting blank on False. 2022-11-03 20:34:51 -04:00
Marc-Andre Ferland
d5f854d376 Fix use_face_correction not disabling on false 2022-11-03 20:34:12 -04:00
Marc-Andre Ferland
c3cc75feff Adds a list of properties to not export by default. 2022-11-03 03:16:20 -04:00
Marc-Andre Ferland
d2e6011089 Windows paths... 2022-11-03 03:12:11 -04:00
Marc-Andre Ferland
5a18144366 Enable/disable seedField when updating randomSeedField.checked 2022-11-03 03:11:58 -04:00
cmdr2
8a0a22bfb0
Merge pull request #427 from madrang/dragNdrop 
Add support for drag&drop for the text files made by the backend
 2022-11-03 11:41:21 +05:30
Marc-Andre Ferland
950b226374 Moved copy icon css to main.css 2022-11-03 02:09:42 -04:00
Marc-Andre Ferland
045ad78bb9 Added calls to update sliders. 2022-11-02 10:53:48 -04:00
Marc-Andre Ferland
c0350e5be7 Moved file ext to a var. 2022-11-02 10:45:51 -04:00
Malcolm Diller
484e53cc08 made first large swathe of changes for ui reorganization 2022-11-01 23:03:05 -07:00
Marc-Andre Ferland
93b3419737 Better human formatted JSON 2022-11-01 04:54:38 -04:00
Marc-Andre Ferland
268d7495cc Naming... 2022-10-31 01:13:04 -04:00
Marc-Andre Ferland
ce16e61e63 Adds a copy as JSON button. 2022-10-31 01:02:23 -04:00
Marc-Andre Ferland
f92bca58fa Lines endings... 2022-10-31 01:01:56 -04:00
Marc-Andre Ferland
83d541b60d Fixed model parsing... 2022-10-30 23:41:26 -04:00
Marc-Andre Ferland
965efc3a13 Restore old values if invalid values for the dropdown was used. 2022-10-30 23:35:42 -04:00
Marc-Andre Ferland
d656c34bd4 Add support for drag&drop for the text files made by the backend and also supports JSON. 2022-10-30 23:21:39 -04:00
Marc-Andre Ferland
a922a93016 Can work with one or more params, don't need a minimum of two. 
Still works just the same.
 2022-10-30 14:09:12 -04:00
patriceac
f08a875cd2
Update main.js 
Fix parsing of Set and Permute operators in custom tags.
 2022-10-30 00:26:53 -07:00
patriceac
d492d3f738
Update main.js 
Fixing the parsing of Set and Permute operators in custom tags.
 2022-10-30 00:22:01 -07:00
Marc-Andre Ferland
3bd97352ba Don't reset reqBody, only replace using req as we use a new task object created from UI inputs. 
Fix plugins needing to specify many params or they would be missing in the render request.
 2022-10-29 14:47:58 -04:00
Malcolm Diller
784c7465d1 updated settings labels 2022-10-28 18:31:46 -07:00
Malcolm Diller
301af7bd7a added parameters 2022-10-28 18:25:54 -07:00
Malcolm Diller
09c11a385d normalized popups 2022-10-28 16:48:32 -07:00
cmdr2
a8c16e39b8 Support custom VAE files; Use vae-ft-mse-840000-ema-pruned as the default VAE, which can be overridden by putting a .vae.pt file inside models/stable-diffusion with the same name as the ckpt model file. The UI / System Settings allows setting the default VAE model to use 2022-10-28 20:06:44 +05:30
Malcolm Diller
7d29b9901c updated progressbar to end more consistently 2022-10-27 22:47:08 -07:00
Malcolm Diller
5a6e7a46d1 added progressbar 2022-10-27 17:03:09 -07:00
cmdr2
6285980f98
Merge pull request #377 from madrang/beta 
Missing '?' in case renderRequest is ever undefined.
 2022-10-25 10:44:37 +05:30
cmdr2
9c9998b468
Merge pull request #364 from mdiller/mdiller_settings 
Settings Refactor
 2022-10-25 10:32:38 +05:30
Marc-Andre Ferland
1ec95d42ba Missing '?' in case renderRequest is ever undefined. 2022-10-22 21:19:42 -04:00
cmdr2
5ee05e3aaa
Merge pull request #376 from cmdr2/beta 
Custom Modifiers; Try to fix the 503 error bug; Show the number of images being created in the Make Image button
 2022-10-22 22:27:05 +05:30
Marc-Andre Ferland
1199c431ff Removed a new line by mistake. Formatting... 2022-10-22 12:51:43 -04:00
Marc-Andre Ferland
305f2fa448 In case of failure, display error in renderRequest.detail 2022-10-22 12:32:41 -04:00
Marc-Andre Ferland
b051685727 More logging for each state and improved handling. 2022-10-22 12:31:14 -04:00
cmdr2
7580bb21c3
Fix upscale multiple images bug 2022-10-22 08:38:19 +05:30
Malcolm Diller
726abf6e65 removed some extra comment stuff 2022-10-21 17:31:57 -07:00
Malcolm Diller
5453925e26 Merge branch 'beta' into mdiller_settings 2022-10-21 17:16:50 -07:00