Skip to content

Commit 12dc239

Browse files
mashb1tmashb1t
authored
Merge pull request #3000 from lllyasviel/develop
Release 2.4.0
2 parents 6308fb8 + c227cf1 commit 12dc239

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1481
-268
lines changed

‎.dockerignore‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,54 @@
1-
.idea
1+
__pycache__
2+
*.ckpt
3+
*.safetensors
4+
*.pth
5+
*.pt
6+
*.bin
7+
*.patch
8+
*.backup
9+
*.corrupted
10+
*.partial
11+
*.onnx
12+
sorted_styles.json
13+
/input
14+
/cache
15+
/language/default.json
16+
/test_imgs
17+
config.txt
18+
config_modification_tutorial.txt
19+
user_path_config.txt
20+
user_path_config-deprecated.txt
21+
/modules/*.png
22+
/repositories
23+
/fooocus_env
24+
/venv
25+
/tmp
26+
/ui-config.json
27+
/outputs
28+
/config.json
29+
/log
30+
/webui.settings.bat
31+
/embeddings
32+
/styles.csv
33+
/params.txt
34+
/styles.csv.bak
35+
/webui-user.bat
36+
/webui-user.sh
37+
/interrogate
38+
/user.css
39+
/.idea
40+
/notification.ogg
41+
/notification.mp3
42+
/SwinIR
43+
/textual_inversion
44+
.vscode
45+
/extensions
46+
/test/stdout.txt
47+
/test/stderr.txt
48+
/cache.json*
49+
/config_states/
50+
/node_modules
51+
/package-lock.json
52+
/.coverage*
53+
/auth.json
54+
.DS_Store

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ensure that shell scripts always use lf line endings, e.g. entrypoint.sh for docker
2+
* text=auto
3+
*.sh text eol=lf

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @lllyasviel
1+
* @mashb1t

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"

‎.github/workflows/build_container.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Create and publish a container image
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
jobs:
9+
build-and-push-image:
10+
runs-on: ubuntu-latest
11+
12+
permissions:
13+
contents: read
14+
packages: write
15+
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v4
19+
20+
- name: Log in to the Container registry
21+
uses: docker/login-action@v3
22+
with:
23+
registry: ghcr.io
24+
username: ${{ github.repository_owner }}
25+
password: ${{ secrets.GITHUB_TOKEN }}
26+
27+
- name: Extract metadata (tags, labels) for Docker
28+
id: meta
29+
uses: docker/metadata-action@v5
30+
with:
31+
images: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
32+
tags: |
33+
type=semver,pattern={{version}}
34+
type=semver,pattern={{major}}.{{minor}}
35+
type=semver,pattern={{major}}
36+
37+
- name: Build and push Docker image
38+
uses: docker/build-push-action@v5
39+
with:
40+
context: .
41+
file: ./Dockerfile
42+
push: true
43+
tags: ${{ steps.meta.outputs.tags }}
44+
labels: ${{ steps.meta.outputs.labels }}

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nvidia/cuda:12.3.1-base-ubuntu22.04
1+
FROM nvidia/cuda:12.4.1-base-ubuntu22.04
22
ENV DEBIAN_FRONTEND noninteractive
33
ENV CMDARGS --listen
44

@@ -23,7 +23,7 @@ RUN chown -R user:user /content
2323
WORKDIR /content
2424
USER user
2525

26-
RUN git clone https://github.com/lllyasviel/Fooocus /content/app
26+
COPY . /content/app
2727
RUN mv /content/app/models /content/app/models.org
2828

2929
CMD [ "sh", "-c", "/content/entrypoint.sh ${CMDARGS}" ]

‎args_manager.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
args_parser.parser.add_argument("--disable-preset-download", action='store_true',
3232
help="Disables downloading models for presets", default=False)
3333

34+
args_parser.parser.add_argument("--enable-describe-uov-image", action='store_true',
35+
help="Disables automatic description of uov images when prompt is empty", default=False)
36+
3437
args_parser.parser.add_argument("--always-download-new-model", action='store_true',
3538
help="Always download newer models ", default=False)
3639

‎css/style.css‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ progress {
2727
border-radius: 5px; /* Round the corners of the progress bar */
2828
background-color: #f3f3f3; /* Light grey background */
2929
width: 100%;
30+
vertical-align: middle !important;
3031
}
3132

3233
/* Style the progress bar container */
@@ -69,6 +70,11 @@ progress::after {
6970
height: 30px !important;
7071
}
7172

73+
.progress-bar span {
74+
text-align: right;
75+
width: 215px;
76+
}
77+
7278
.type_row{
7379
height: 80px !important;
7480
}
@@ -101,10 +107,14 @@ progress::after {
101107
overflow: auto !important;
102108
}
103109

104-
.aspect_ratios label {
110+
.performance_selection label {
105111
width: 140px !important;
106112
}
107113

114+
.aspect_ratios label {
115+
flex: calc(50% - 5px) !important;
116+
}
117+
108118
.aspect_ratios label span {
109119
white-space: nowrap !important;
110120
}
@@ -391,6 +401,14 @@ progress::after {
391401
background-color: #fff8;
392402
font-family: monospace;
393403
text-align: center;
394-
border-radius-top: 5px;
404+
border-radius: 5px 5px 0px 0px;
395405
display: none; /* remove this to enable tooltip in preview image */
406+
}
407+
408+
#inpaint_canvas .canvas-tooltip-info {
409+
top: 2px;
410+
}
411+
412+
#inpaint_brush_color input[type=color]{
413+
background: none;
396414
}

‎development.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Running unit tests
2+
3+
Native python:
4+
```
5+
python -m unittest tests/
6+
```
7+
8+
Embedded python (Windows zip file installation method):
9+
```
10+
..\python_embeded\python.exe -m unittest
11+
```

‎docker-compose.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
version: '3.9'
2-
31
volumes:
42
fooocus-data:
53

64
services:
75
app:
86
build: .
9-
image: fooocus
7+
image: ghcr.io/lllyasviel/fooocus
108
ports:
119
- "7865:7865"
1210
environment:

0 commit comments

Comments
 (0)