Commit Graph

692 Commits

Author SHA1 Message Date
ZeroCool
2226e03f11
Merge branch 'sd-webui:dev' into dev 2022-09-14 15:18:49 -07:00
ZeroCool940711
3e6a8cc185 Small fix to the custom model list. 2022-09-14 15:18:37 -07:00
ZeroCool
67dc221379
Merge pull request #1136 from ZeroCool940711/dev
Added custom models list to the txt2img tab.
2022-09-14 14:49:29 -07:00
ZeroCool940711
02fe63acb2 Added custom models list to the txt2img tab. 2022-09-14 14:48:13 -07:00
Thomas Mello
2afa61708d
chore: add breaks to cmds for readability (#1134) 2022-09-15 00:34:15 +03:00
cobryan05
81f58d58d0
Re-merge #611 - View/Cancel in-progress diffusions (#796)
* JobManager: Re-merge #611

PR #611 seems to have got lost in the shuffle after
the transition to 'dev'.

This commit re-merges the feature branch. This adds
support for viewing preview images as the image
generates, as well as cancelling in-progress images
and a couple fixes and clean-ups.

* JobManager: Clear jobs that fail to start

Sometimes if a job fails to start it will get stuck in the active job
list. This commit ensures that jobs that raise exceptions are cleared,
and also adds a start timer to clear out jobs that fail to start
within a reasonable amount of time.
2022-09-14 23:48:56 +03:00
ZeroCool
8bc8b006fd
Merge pull request #1132 from ZeroCool940711/dev
Fixed max_frame not being properly used and instead sampling_steps was the variable being use.
2022-09-14 12:02:49 -07:00
ZeroCool940711
3675b566a4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	scripts/img2img.py
#	scripts/sd_utils.py
#	scripts/txt2img.py
2022-09-14 11:39:21 -07:00
ZeroCool940711
dbbed38c8c - Fixed max_frame not being properly used and instead sampling_steps was the variable being use.
- Fixed several issues with wrong variable being used on multiple places.
- Addd option to toggle some extra option from the config file for when the model is loading on the txt2vid tab.
2022-09-14 11:34:24 -07:00
Brian Semrau
b76e14ea3c
Add a separate update script instead of git pull on startup (#1106) 2022-09-14 19:43:32 +03:00
ZeroCool940711
4c46633572 Fixed defaults not being loaded correctly or missing in some places. 2022-09-14 09:26:23 -07:00
Thomas Mello
066f9a31aa
Merge pull request #1128 from codedealer/optimized-mode
fix: add optimized mode to streamlit
2022-09-14 18:54:53 +03:00
Thomas Mello
8df0b1a26d temp disable nvml support for multiple gpus 2022-09-14 18:41:42 +03:00
Thomas Mello
ede81bdc5c fix: [streamlit] optimization mode 2022-09-14 18:22:24 +03:00
ZeroCool
eb85dc4d63
Merge pull request #1124 from ZeroCool940711/dev
Modified the way the defaults settings are loaded from the config file.
2022-09-14 06:42:24 -07:00
ZeroCool940711
ed1ebc129c Modified the way the defaults settings are loaded from the config file so we only load them on the webui_strealit.py file and use st.session_state to access them from anywhere else, this makes it so the config can be modified externally like before the code split and the changes will be updated on next rerun of the UI. 2022-09-14 06:40:56 -07:00
ZeroCool
fe015d2267
Merge pull request #1122 from ZeroCool940711/dev
Removed condition to check if the defaults are in the st.session_state dictionary, this is not needed and would cause issues with it not being reloaded when the user changes something on it.
2022-09-14 06:06:09 -07:00
ZeroCool
df2c3188c2
Merge branch 'sd-webui:dev' into dev 2022-09-14 06:03:18 -07:00
ZeroCool
2f55766576
Merge pull request #1079 from unnamedplugins/dev
Add masked image restoration to streamlit, make color correction respect the setting as well
2022-09-14 06:02:16 -07:00
ZeroCool940711
6a79ea930b Removed condition to check if the defaults are in the st.session_state dictionary, this is not needed and would cause issues with it not being reloaded when the user changes something on it. 2022-09-14 05:58:01 -07:00
unnamedplugins
6ce25a8e0f Merge branch 'dev' of github.com:sd-webui/stable-diffusion-webui into dev 2022-09-14 08:48:21 -04:00
ZeroCool
269cd20a8b
Merge pull request #1119 from ZeroCool940711/dev
Moved defaults to the webui_streamlit.py file and fixed some imports.
2022-09-14 04:20:45 -07:00
ZeroCool940711
28309ef684 Merge remote-tracking branch 'origin/dev' into dev 2022-09-14 04:19:54 -07:00
ZeroCool940711
9246692072 Moved defaults to the webui_streamlit.py file and fixed some imports. 2022-09-14 04:19:24 -07:00
ZeroCool
34ca99df5e
Merge pull request #1116 from ZeroCool940711/dev
Added the functions to load the optimized models, this "should" make optimized and turbo mode work now but needs to be tested.
2022-09-14 03:50:55 -07:00
ZeroCool940711
1afc89e0d1 Made the defaults settings from the config file be stored inside st.session_state to avoid loading it multiple times when calling the "sd_utils.py" file from other modules. 2022-09-14 03:48:29 -07:00
ZeroCool940711
ef6b39ab6d Fixed the info message on the txt2img tab not showing the info but just showing the text "Done" 2022-09-14 03:20:19 -07:00
ZeroCool940711
73df43083c Merge remote-tracking branch 'origin/dev' into dev 2022-09-14 02:52:30 -07:00
ZeroCool940711
d2b3900647 Fixed some imports. 2022-09-14 02:52:02 -07:00
ZeroCool940711
374b144e77 - Added the functions to load the optimized models, this "should" make it so optimized and turbo mode work now but needs to be tested more.
- Added function to load LDSR.
2022-09-14 02:46:01 -07:00
ZeroCool940711
2e684f948f Removed the "find_noise_for_image.py" and "matched_noise.py" scripts as their content is now part of "sd_utils.py" 2022-09-14 02:02:11 -07:00
ZeroCool
623fd067dc
Merge pull request #1113 from ZeroCool940711/dev
Forgot to call the layout() for the Model Manager tab after the import so it was not been used and the tab was shown as empty.
2022-09-13 23:03:38 -07:00
ZeroCool940711
71be8f09f2 Forgot to call the layout() for the Model Manager tab after the import so it was not been used and the tab was shown as empty. 2022-09-13 23:02:16 -07:00
Thomas Mello
c26cd01498
Publish Streamlit ports (#1102)
(cherry picked from commit 833a91047d)

Co-authored-by: Charlie <outlookhazy@users.noreply.github.com>
2022-09-14 01:58:38 +03:00
Charlie
3121ba1960
Update Dockerfile (#1101)
add expose for streamlit port
2022-09-14 01:41:54 +03:00
TingTingin
292f941722
Using the Optimization from Dogettx (#974)
* Update attention.py

* change to dogettx

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-14 01:02:29 +03:00
Thomas Mello
d4ece82078
fix: patch docker conda install pip requirements (#1094)
(cherry picked from commit fab5765fe4)

Co-authored-by: Sérgio <smaisidoro@gmail.com>
2022-09-14 00:51:17 +03:00
ZeroCool
1cc757cc76
Merge pull request #1098 from ZeroCool940711/dev
The webui_streamlit.py file has been split into multiple modules containing their own code.
2022-09-13 14:35:01 -07:00
ZeroCool940711
ede343a269 The webui_streamlit.py file has been split into multiple modules containing their own code making it easier to work with than a single big file.
The list of modules is as follow:
- webuit_streamlit.py: contains the main layout as well as the functions that load the css which is needed by the layout.
- webui_streamlit_old.py: contains the code for the previous version of the WebUI. Will be removed once the new UI code starts to get used and if everything works as it should.
- txt2img.py: contains the code for the txt2img tab.
- img2img.py: contains the code for the img2img tab.
- txt2vid.py: contains the code for the txt2vid tab.
- sd_utils.py: contains utility functions used by more than one module, any function that meets such condition should be placed here.
- ModelManager.py: contains the code for the Model Manager page on the sidebar menu.
- Settings.py: contains the code for the Settings page on the sidebar menu.
- home.py: contains the code for the Home tab, history and gallery implemented by @devilismyfriend.
- imglab.py: contains the code for the Image Lab tab implemented by @devilismyfriend
2022-09-13 14:09:39 -07:00
cobryan05
76de9f9b65
JobManager: Buttons skip queue (#1092)
Have JobManager buttons skip Gradio's queue, since otherwise
they aren't sending JobManager button presses.
2022-09-13 22:25:51 +03:00
cobryan05
aa38281197
JobManager: Fix typo breaking jobs close #858 close #1041 2022-09-13 19:37:09 +03:00
unnamedplugins
b351538e3a Add mask_restore to streamlit config 2022-09-13 11:32:21 -04:00
unnamedplugins
0fc3e592f7 Merge branch 'dev' of github.com:unnamedplugins/stable-diffusion-webui into dev 2022-09-13 10:57:37 -04:00
unnamedplugins
0c0e80d909 Add mask restore feature to streamlit, prevent color correction from modifying initial image when mask_restore is turned on 2022-09-13 10:57:07 -04:00
hlky
92b3159909
half precision streamlit txt2vid
`RuntimeError: expected scalar type Half but found Float` with both `torch_dtype=torch.float16` and `revision="fp16"`
2022-09-13 13:26:36 +01:00
Ahmad Abdullah
84bb985134
Update README.md (#1075)
fix typo
2022-09-13 13:39:18 +03:00
Syahmi Azhar
93d53f9c32
fix: launcher batch file fix #920, fix #605
- Allow reading environment.yaml file in either LF or CRLF
- Only update environment if environment.yaml changes
- Remove custom_conda_path to discourage changing source file
- Fix unable to launch webui due to frontend module missing (#605)
2022-09-13 12:13:23 +03:00
ZeroCool
63407de224
Merge pull request #1073 from ZeroCool940711/dev
Changed the loading of the model on the txt2vid tab so the half models are only loaded if the no_half option on the config file is set to False.
2022-09-13 01:51:25 -07:00
ZeroCool
169f0d158e
Merge branch 'sd-webui:dev' into dev 2022-09-13 01:50:31 -07:00
ZeroCool940711
cbbf33d735 Changed the loading of the model on the txt2vid tab so the half models are only loaded if the no_half option on the config file is set to False. 2022-09-13 01:49:03 -07:00