Commit Graph

677 Commits

Author SHA1 Message Date
ZeroCool
5f3d7facde
Merge pull request #1181 from outlookhazy/feature_negative_prompts_streamlit
Enable negative prompts on streamlit
2022-09-16 10:41:37 -07:00
Charles Galant
d293073e67 Enable negative prompts on streamlit 2022-09-16 13:25:25 -04:00
ZeroCool
d85f143eb8
Merge pull request #1159 from cheald/gallery-fixes
Gallery fixes
2022-09-16 04:22:24 -07:00
ZeroCool
9a6b2173a5
Merge branch 'dev' into gallery-fixes 2022-09-16 04:21:58 -07:00
ZeroCool
2eaccb7b24
Merge pull request #1158 from cheald/fix-find-noise
Fix invalid invocation of find_noise_for_image
2022-09-16 04:15:31 -07:00
ZeroCool
e65b8d0b8a
Merge branch 'dev' into fix-find-noise 2022-09-16 04:15:11 -07:00
hlky
bffa0ff4c9
Update .gitignore 2022-09-16 11:17:51 +01:00
hlky
64dbc0f39b
environment update from .cmd 2022-09-16 11:12:15 +01:00
Brian Semrau
e2b0c0f7a9
Update conda environment on startup always (#1171)
* Update environment on startup always

* Message to explicitly state no environment.yaml update required

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-09-16 08:35:53 +01:00
ZeroCool
c4697eba50
Merge pull request #1169 from ZeroCool940711/dev
Fixed a leftover line from removing the home tab.
2022-09-15 17:19:46 -07:00
ZeroCool
08cb8ebff3
Merge branch 'sd-webui:dev' into dev 2022-09-15 17:19:05 -07:00
ZeroCool940711
0645c7cf64 - Increased the max value for the width and height sliders on the txt2img tab.
- Fixed a leftover line from removing the home tab.
2022-09-15 17:18:36 -07:00
ZeroCool
5851d8a4d0
Added discord server link to the Readme.md 2022-09-15 17:01:25 -07:00
ZeroCool
a92a59238f
Merge pull request #1163 from ZeroCool940711/dev
Fixed a missing import on the ModelManager script.
2022-09-15 14:28:42 -07:00
ZeroCool940711
c0d1bf8941 Merge remote-tracking branch 'origin/dev' into dev 2022-09-15 14:27:46 -07:00
ZeroCool940711
88ae534693 Fixed a missing import on the ModelManager script. 2022-09-15 14:27:13 -07:00
ZeroCool
0677216f13
Merge pull request #1162 from ZeroCool940711/dev
Removed the Home tab until the gallery is fixed.
2022-09-15 14:23:42 -07:00
ZeroCool940711
eb545c1229 Removed the Home tab until the gallery is fixed. 2022-09-15 14:23:09 -07:00
Chris Heald
51a973929c Fix invalid invocation of find_noise_for_image 2022-09-15 12:48:35 -07:00
Chris Heald
d2f339061b Fix the gallery back/next buttons and add a refresh button 2022-09-15 12:45:45 -07:00
Chris Heald
8a25dcc332 Fix errors rendering galleries when there are not enough images to render 2022-09-15 11:06:56 -07:00
JuanLagu
98adf69c7c
Calculate aspect ratio and pixel count on start (#1157) 2022-09-15 20:39:05 +03:00
Ascended
b4de6caf69
Added case insensitivity to restore prompt (#1152) 2022-09-15 18:19:07 +03:00
ZeroCool
b7d6329dc1
Merge pull request #1150 from ZeroCool940711/dev
Added the Home tab and gallery tab on txt2img made by @devilismyfriend
2022-09-15 06:31:38 -07:00
ZeroCool940711
482c1bdc21 Merge remote-tracking branch 'origin/dev' into dev 2022-09-15 06:30:06 -07:00
ZeroCool940711
4068d804ad - Added the Home tab made by @devilismyfriend
- Added gallery tab on txt2img.
2022-09-15 06:29:41 -07:00
ZeroCool
e2b372b9b5
Merge pull request #1147 from ZeroCool940711/dev
Added streamlit_nested_layout component as dependency and imported on the webui_streamli.py file to allow us to use nested columns and expanders.
2022-09-15 03:50:42 -07:00
ZeroCool940711
dac1534791 Merge remote-tracking branch 'origin/dev' into dev 2022-09-15 03:49:30 -07:00
ZeroCool940711
d93065bb95 Added streamlit_nested_layout component as dependency and imported on the webui_streamli.py file to allow us to use nested columns and expanders. 2022-09-15 03:48:55 -07:00
Ascended
9fd1f7d194
Prompt user if they want to restore changes (#1137)
- After stashing any changes and pulling updates, ask user if they wish to pop changes
- If user declines the restore, drop the stash to prevent the case of an ever growing stash pile
2022-09-15 11:34:01 +03:00
ZeroCool
f74d796431
Merge pull request #1139 from protoplm/dev
txt2img touch up + model switching
2022-09-15 01:07:58 -07:00
protoplm
6a19a73388 Fixed update_preview_frequency and update_preview using defaults from
webui_streamlit.yaml instead of state variables from UI.
2022-09-14 23:03:55 -04:00
protoplm
ca6fb326f3 Formatted tabs as spaces 2022-09-14 20:17:07 -04:00
protoplm
4f7adcaf42 Corrected breaking issues introduced in #1136 to txt2img and
made state variables consistent with img2img.

Fixed a bug where switching models after running would not reload
the used model.
2022-09-14 19:59:53 -04:00
ZeroCool
178e62292e
Merge pull request #1138 from ZeroCool940711/dev
Small fix to the custom model list.
2022-09-14 15:19:22 -07:00
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