Skip to content

Commit 87a51e9

Browse files
AbdBarhoAbdBarho
authored
[BREAKING] Rename UIs (AbdBarho#254)
Rename the UIs in docker compose to their new names Changes folder names Changes output folder structure Closes issue AbdBarho#263 Adds `sygil-sl` instead of docker compose flag.
1 parent bdee804 commit 87a51e9

19 files changed

+66
-131
lines changed

‎.devscripts/chmod.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
set -Eeuo pipefail
44

55
find services -name "*.sh" -exec git update-index --chmod=+x {} \;
6+
find .devscripts -name "*.sh" -exec git update-index --chmod=+x {} \;

‎.devscripts/migratev3tov4.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
set -Eeuo pipefail
4+
5+
echo "Moving everything in output to output/old..."
6+
mv output old
7+
mkdir output
8+
mv old/.gitignore output
9+
mv old output

‎.github/ISSUE_TEMPLATE/bug.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Bug
33
about: Report a bug
4-
title: ''
4+
title: ""
55
labels: bug
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
<!-- PLEASE FILL THIS OUT, IT WILL MAKE BOTH OF OUR LIVES EASIER -->
@@ -14,28 +13,27 @@ assignees: ''
1413
- [ ] It is not in the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ), I checked.
1514
- [ ] It is not in the [issues](https://github.com/AbdBarho/stable-diffusion-webui-docker/issues?q=), I searched.
1615

17-
1816
**Describe the bug**
1917

2018
<!-- tried to run the app, my cat exploded -->
2119

22-
2320
**Which UI**
2421

25-
hlky or auto or auto-cpu or lstein?
26-
22+
auto or auto-cpu or invoke or sygil?
2723

2824
**Hardware / Software**
29-
- OS: [e.g. Windows 10 / Ubuntu ]
30-
- OS version: <!-- on windows, use the command `winver` to find out, on ubuntu `lsb_release -d` -->
31-
- WSL version (if applicable): <!-- get using `wsl -l -v` -->
32-
- Docker Version: <!-- get using `docker version` -->
33-
- Docker compose version: <!-- get using `docker compose version` -->
34-
- Repo version: <!-- tag, commit sha, or "from master" -->
35-
- RAM:
36-
- GPU/VRAM:
25+
26+
- OS: [e.g. Windows 10 / Ubuntu 22.04]
27+
- OS version: <!-- on windows, use the command `winver` to find out, on ubuntu `lsb_release -d` -->
28+
- WSL version (if applicable): <!-- get using `wsl -l -v` -->
29+
- Docker Version: <!-- get using `docker version` -->
30+
- Docker compose version: <!-- get using `docker compose version` -->
31+
- Repo version: <!-- tag, commit sha, or "from master" -->
32+
- RAM:
33+
- GPU/VRAM:
3734

3835
**Steps to Reproduce**
36+
3937
1. Go to '...'
4038
2. Click on '....'
4139
3. Scroll down to '....'

‎.github/workflows/docker.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ jobs:
1414
matrix:
1515
profile:
1616
- auto
17-
- hlky
18-
- lstein
17+
- sygil
18+
- invoke
1919
- download
2020
runs-on: ubuntu-latest
2121
name: ${{ matrix.profile }}
2222
steps:
2323
- uses: actions/checkout@v3
24-
# better caching?
2524
- run: docker compose --profile ${{ matrix.profile }} build --progress plain

‎.github/workflows/xformers.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎LICENSE

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,3 @@ processes, such as predicting an individual will commit fraud/crime
8787
commitment (e.g. by text profiling, drawing causal relationships between
8888
assertions made in documents, indiscriminate and arbitrarily-targeted
8989
use).
90-
91-
92-
93-
By using this software, you also agree to the following licenses:
94-
https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
95-
https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
96-
https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE
97-
https://github.com/cszn/BSRGAN/blob/main/LICENSE
98-
https://github.com/sczhou/CodeFormer/blob/master/LICENSE
99-
https://github.com/TencentARC/GFPGAN/blob/master/LICENSE
100-
https://github.com/xinntao/Real-ESRGAN/blob/master/LICENSE
101-
https://github.com/xinntao/ESRGAN/blob/master/LICENSE
102-
https://github.com/cszn/SCUNet/blob/main/LICENSE

‎README.md

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,68 +2,41 @@
22

33
Run Stable Diffusion on your machine with a nice UI without any hassle!
44

5-
65
## Setup & Usage
76

87
Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue!
98

10-
11-
## Contributing
12-
13-
Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)**
149
## Features
1510

1611
This repository provides multiple UIs for you to play around with stable diffusion:
1712

18-
### AUTOMATIC1111
13+
### [AUTOMATIC1111](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
1914

20-
[AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI:
21-
22-
- Text to image, with many samplers and even negative prompts!
23-
- Image to image, with masking, cropping, in-painting, out-painting, variations.
24-
- GFPGAN, RealESRGAN, LDSR, CodeFormer.
25-
- Loopback, prompt weighting, prompt matrix, X/Y plot
26-
- Live preview of the generated images.
27-
- Highly optimized 4GB GPU support, or even CPU only!
28-
- Textual inversion allows you to use pretrained textual inversion embeddings
29-
- [Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase)
15+
[Full feature list here](https://github.com/AUTOMATIC1111/stable-diffusion-webui-feature-showcase), Screenshots:
3016

3117
| Text to image | Image to image | Extras |
3218
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
3319
| ![](https://user-images.githubusercontent.com/24505302/189541954-46afd772-d0c8-4005-874c-e2eca40c02f2.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541956-5b528de7-1b5d-479f-a1db-d3f5a53afc59.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541957-cf78b352-a071-486d-8889-f26952779a61.jpg) |
3420

35-
### hlky (sd-webui / sygil-webui)
21+
### [InvokeAI (lstein)](https://github.com/invoke-ai/InvokeAI)
22+
23+
[Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots:
3624

37-
[hlky's fork](https://github.com/Sygil-Dev/sygil-webui) is one of the most popular UIs, with many features:
25+
| Text to image | Image to image | Extras |
26+
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
27+
| ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) |
3828

39-
- Text to image, with many samplers
40-
- Image to image, with masking, cropping, in-painting, variations.
41-
- GFPGAN, RealESRGAN, LDSR, GoBig, GoLatent
42-
- Loopback, prompt weighting
43-
- 6GB or even 4GB GPU support!
44-
- [Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md)
29+
### [Sygil (sd-webui / hlky)](https://github.com/Sygil-Dev/sygil-webui)
4530

46-
Screenshots:
31+
[Full feature list here](https://github.com/Sygil-Dev/sygil-webui/blob/master/README.md), Screenshots:
4732

4833
| Text to image | Image to image | Image Lab |
4934
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
5035
| ![](https://user-images.githubusercontent.com/24505302/189541298-f902b021-a1eb-4e4b-b2eb-b6a696a8ec80.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541295-7d7f2162-2189-4e0a-abbd-703f4779e1cd.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541294-aa7f7735-a973-4e17-ada0-1fe3acbb1772.jpg) |
5136

37+
## Contributing
5238

53-
54-
### lstein (InvokeAI)
55-
56-
[lstein's fork](https://github.com/invoke-ai/InvokeAI) is one of the earliest with a wonderful WebUI.
57-
- Text to image, with many samplers
58-
- Image to image
59-
- 4GB GPU support
60-
- More coming!
61-
- [Full feature list here](https://github.com/invoke-ai/InvokeAI#features)
62-
63-
| Text to image | Image to image | Extras |
64-
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
65-
| ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) |
66-
39+
Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)**
6740

6841
## Disclaimer
6942

@@ -75,10 +48,8 @@ This license of this software forbids you from sharing any content that violates
7548

7649
Special thanks to everyone behind these awesome projects, without them, none of this would have been possible:
7750

78-
- [hlky/stable-diffusion-webui](https://github.com/hlky/stable-diffusion-webui)
7951
- [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
80-
- [lstein/stable-diffusion](https://github.com/lstein/stable-diffusion)
52+
- [InvokeAI](https://github.com/invoke-ai/InvokeAI)
53+
- [Sygil-webui](https://github.com/Sygil-Dev/sygil-webui)
8154
- [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion)
82-
- [hlky/sd-enable-textual-inversion](https://github.com/hlky/sd-enable-textual-inversion)
83-
- [devilismyfriend/latent-diffusion](https://github.com/devilismyfriend/latent-diffusion)
84-
- [Hafiidz/latent-diffusion](https://github.com/Hafiidz/latent-diffusion)
55+
- and many many more.

‎docker-compose.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ services:
2727
<<: *base_service
2828
profiles: ["auto"]
2929
build: ./services/AUTOMATIC1111
30-
image: sd-auto:19
30+
image: sd-auto:20
3131
environment:
3232
- CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access
3333

@@ -38,20 +38,26 @@ services:
3838
environment:
3939
- CLI_ARGS=--no-half --precision full
4040

41-
hlky:
41+
sygil: &sygil
4242
<<: *base_service
43-
profiles: ["hlky"]
44-
build: ./services/hlky/
45-
image: sd-hlky:11
43+
profiles: ["sygil"]
44+
build: ./services/sygil/
45+
image: sd-sygil:12
4646
environment:
4747
- CLI_ARGS=--optimized-turbo
4848
- USE_STREAMLIT=0
4949

50-
lstein:
50+
sygil-sl:
51+
<<: *sygil
52+
environment:
53+
- USE_STREAMLIT=1
54+
55+
56+
invoke:
5157
<<: *base_service
52-
profiles: ["lstein"]
53-
build: ./services/lstein/
54-
image: sd-lstein:9
58+
profiles: ["invoke"]
59+
build: ./services/invoke/
60+
image: sd-invoke:10
5561
environment:
5662
- PRELOAD=true
5763
- CLI_ARGS=

‎services/AUTOMATIC1111/config.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"outdir_samples": "/output",
3-
"outdir_txt2img_samples": "/output/txt2img-images",
4-
"outdir_img2img_samples": "/output/img2img-images",
5-
"outdir_extras_samples": "/output/extras-images",
2+
"outdir_samples": "",
3+
"outdir_txt2img_samples": "/output/txt2img",
4+
"outdir_img2img_samples": "/output/img2img",
5+
"outdir_extras_samples": "/output/extras",
66
"outdir_txt2img_grids": "/output/txt2img-grids",
77
"outdir_img2img_grids": "/output/img2img-grids",
88
"outdir_save": "/output/saved",

‎services/AUTOMATIC1111/entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ for to_path in "${!MOUNTS[@]}"; do
5252
echo Mounted $(basename "${from_path}")
5353
done
5454

55-
mkdir -p /output/saved /output/txt2img-images/ /output/img2img-images /output/extras-images/ /output/grids/ /output/txt2img-grids/ /output/img2img-grids/
56-
5755
if [ -f "/data/config/auto/startup.sh" ]; then
5856
pushd ${ROOT}
5957
. /data/config/auto/startup.sh

‎services/lstein/Dockerfile renamed to ‎services/invoke/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ cd /usr/lib/x86_64-linux-gnu/pkgconfig/
3232
ln -sf opencv4.pc opencv.pc
3333
EOF
3434

35-
ARG BRANCH=main SHA=5c31feb3a1096d437c94b6e1c3224eb7a7224a85
35+
ARG BRANCH=main SHA=38cd968130e386d188bdef68f9fbfbbbfabb2da0
3636
RUN <<EOF
3737
git fetch
3838
git reset --hard
@@ -54,6 +54,5 @@ EOF
5454
ENV ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS=""
5555
EXPOSE 7860
5656

57-
5857
ENTRYPOINT ["/docker/entrypoint.sh"]
59-
CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output ${CLI_ARGS}
58+
CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output/invoke ${CLI_ARGS}

‎services/lstein/entrypoint.sh renamed to ‎services/invoke/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/
2020
MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers/
2121

2222

23+
MOUNTS["${ROOT}/embeddings"]=/data/embeddings/
24+
2325
# hacks
2426
MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
2527

‎services/lstein/info.py renamed to ‎services/invoke/info.py

File renamed without changes.

‎services/lstein/models.yaml renamed to ‎services/invoke/models.yaml

File renamed without changes.

‎services/hlky/Dockerfile renamed to ‎services/sygil/Dockerfile

File renamed without changes.

‎services/hlky/info.py renamed to ‎services/sygil/info.py

File renamed without changes.

‎services/hlky/mount.sh renamed to ‎services/sygil/mount.sh

File renamed without changes.

‎services/hlky/run.sh renamed to ‎services/sygil/run.sh

File renamed without changes.

‎services/hlky/userconfig_streamlit.yaml renamed to ‎services/sygil/userconfig_streamlit.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
# https://github.com/Sygil-Dev/sygil-webui/blob/master/configs/webui/webui_streamlit.yaml
12
general:
23
version: 1.24.6
34
outdir: /output
45
default_model: "Stable Diffusion v1.5"
56
default_model_path: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
6-
outdir_txt2img: /output/txt2img-samples
7-
outdir_img2img: /output/img2img-samples
7+
outdir_txt2img: /output/txt2img
8+
outdir_img2img: /output/img2img
89
outdir_img2txt: /output/img2txt
910
optimized: True
1011
optimized_turbo: True

0 commit comments

Comments
 (0)