Commit Graph

1124 Commits

Author SHA1 Message Date
ZeroCool940711
1b852e03dd Added some extra txt files for the img2txt tab. 2022-10-01 15:38:38 -07:00
hlky
c1db30d41d
Update entrypoint.sh 2022-10-01 23:36:09 +01:00
hlky
7c74a5ad69
Update entrypoint.sh 2022-10-01 23:30:31 +01:00
hlky
2a49c28980
docker / local cache paths 2022-10-01 22:50:40 +01:00
hlky
a5c941329e
Update img2txt.py 2022-10-01 21:47:26 +01:00
Thomas Mello
302bdf0e09
fix: gradio js (#1375) 2022-10-01 23:39:56 +03:00
Joshua Kimsey
4670e6f2de Merge branch 'dev' into expand-settings-page 2022-10-01 16:35:21 -04:00
ZeroCool940711
541c354f8b Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	scripts/txt2img.py
2022-10-01 11:58:20 -07:00
ZeroCool940711
0f36186236 Added drop down menu to select from the available GFPGAN models we have installed. 2022-10-01 11:52:31 -07:00
Alejandro Gil
0df37b351d
gallery_v1 (#1374)
This PR add a basic gallery feature made in Vue3 for txt2img. 


![image](https://user-images.githubusercontent.com/35169816/193422924-6c3e9f83-0e2e-4149-b6ec-8cf5e5dfb187.png)

The gallery supports streamlit theme features

![image](https://user-images.githubusercontent.com/35169816/193422940-f15d121b-34fd-46ef-be84-23d8d80cda96.png)

It's a v1, there is only a download and a zoom feature ( if the image is
displayed smaller than it's real size)

v2 will add more functionnality like captions to display the prompt &
seed for each images when using multi prompts/matrix etc

This PR also changes the way custom components are imported to be able
to have differents component.

Rather than a unique `frontend/dist/` folder ( which was for the
sd-concept-browser)

there is now a `frontend/dists/sd-concept-browser/dist` folder and a
`frontend/dists/sd-gallery/dist` folder

- [x] I have changed the base branch to `dev`
- [x] I have performed a self-review of my own code
- [x] I have commented my code in hard-to-understand areas
2022-10-01 11:48:22 -07:00
Qualzz20m
65a89c4aeb gallery_v1 2022-10-01 20:14:32 +02:00
Joshua Kimsey
a433d5c9a8
Merge branch 'dev' into expand-settings-page 2022-10-01 07:44:22 -04:00
Joshua Kimsey
f098e79be7 Merge branch 'expand-settings-page' of https://github.com/JoshuaKimsey/stable-diffusion-webui into expand-settings-page 2022-10-01 07:41:42 -04:00
Joshua Kimsey
777d724598 Fixed doubled up code 2022-10-01 07:41:40 -04:00
Alejandro Gil
2d0a4e8e96
Bump numpy from 1.21.5 to 1.22.0 (#10) (#1371)
Bumps [numpy](https://github.com/numpy/numpy) from 1.21.5 to 1.22.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/numpy/numpy/releases">numpy's
releases</a>.</em></p>
<blockquote>
<h2>v1.22.0</h2>
<h1>NumPy 1.22.0 Release Notes</h1>
<p>NumPy 1.22.0 is a big release featuring the work of 153 contributors
spread over 609 pull requests. There have been many improvements,
highlights are:</p>
<ul>
<li>Annotations of the main namespace are essentially complete. Upstream
is a moving target, so there will likely be further improvements, but
the major work is done. This is probably the most user visible
enhancement in this release.</li>
<li>A preliminary version of the proposed Array-API is provided. This is
a step in creating a standard collection of functions that can be used
across application such as CuPy and JAX.</li> <li>NumPy now has a DLPack
backend. DLPack provides a common interchange format for array (tensor)
data.</li>
<li>New methods for <code>quantile</code>, <code>percentile</code>, and
related functions. The
new methods provide a complete set of the methods commonly found in the
literature.</li>
<li>A new configurable allocator for use by downstream projects.</li>
</ul>
<p>These are in addition to the ongoing work to provide SIMD support for
commonly used functions, improvements to F2PY, and better
documentation.</p>
<p>The Python versions supported in this release are 3.8-3.10, Python
3.7
has been dropped. Note that 32 bit wheels are only provided for Python
3.8 and 3.9 on Windows, all other wheels are 64 bits on account of
Ubuntu, Fedora, and other Linux distributions dropping 32 bit support.
All 64 bit wheels are also linked with 64 bit integer OpenBLAS, which
should fix
the occasional problems encountered by folks using truly huge
arrays.</p>
<h2>Expired deprecations</h2>
<h3>Deprecated numeric style dtype strings have been removed</h3>
<p>Using the strings <code>&quot;Bytes0&quot;</code>,
<code>&quot;Datetime64&quot;</code>, <code>&quot;Str0&quot;</code>,
<code>&quot;Uint32&quot;</code>,
and <code>&quot;Uint64&quot;</code> as a dtype will now raise a
<code>TypeError</code>.</p>
<p>(<a

href="https://github-redirect.dependabot.com/numpy/numpy/pull/19539">gh-19539</a>)</p>
<h3>Expired deprecations for <code>loads</code>, <code>ndfromtxt</code>,
and <code>mafromtxt</code> in npyio</h3>
<p><code>numpy.loads</code> was deprecated in v1.15, with the
recommendation that
users use <code>pickle.loads</code> instead. <code>ndfromtxt</code> and
<code>mafromtxt</code> were both
deprecated in v1.17 - users should use <code>numpy.genfromtxt</code>
instead with
the appropriate value for the <code>usemask</code> parameter.</p> <p>(<a

href="https://github-redirect.dependabot.com/numpy/numpy/pull/19615">gh-19615</a>)</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a

href="4adc87dff1"><code>4adc87d</code></a>
Merge pull request <a

href="https://github-redirect.dependabot.com/numpy/numpy/issues/20685">#20685</a>
from charris/prepare-for-1.22.0-release</li>
<li><a

href="fd66547557"><code>fd66547</code></a>
REL: Prepare for the NumPy 1.22.0 release.</li>
<li><a

href="125304b035"><code>125304b</code></a>
wip</li>
<li><a

href="c283859128"><code>c283859</code></a>
Merge pull request <a

href="https://github-redirect.dependabot.com/numpy/numpy/issues/20682">#20682</a>
from charris/backport-20416</li>
<li><a

href="5399c03d4a"><code>5399c03</code></a>
Merge pull request <a

href="https://github-redirect.dependabot.com/numpy/numpy/issues/20681">#20681</a>
from charris/backport-20954</li>
<li><a

href="f9c45f8ebf"><code>f9c45f8</code></a>
Merge pull request <a

href="https://github-redirect.dependabot.com/numpy/numpy/issues/20680">#20680</a>
from charris/backport-20663</li>
<li><a

href="794b36f7e1"><code>794b36f</code></a>
Update armccompiler.py</li>
<li><a

href="d93b14e3d7"><code>d93b14e</code></a>
Update test_public_api.py</li>
<li><a

href="7662c0789c"><code>7662c07</code></a>
Update <strong>init</strong>.py</li>
<li><a

href="311ab52488"><code>311ab52</code></a>
Update armccompiler.py</li>
<li>Additional commits viewable in <a
href="https://github.com/numpy/numpy/compare/v1.21.5...v1.22.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility

score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=numpy&package-manager=pip&previous-version=1.21.5&new-version=1.22.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts

page](https://github.com/ZeroCool940711/stable-diffusion-webui/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alejandro Gil <ZeroCool940711@users.noreply.github.com>

# Description

Please include:
* relevant motivation
* a summary of the change
* which issue is fixed.
* any additional dependencies that are required for this change.

Closes: # (issue)

# Checklist:

- [ ] I have changed the base branch to `dev`
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
2022-10-01 04:22:26 -07:00
dependabot[bot]
4cbd390f65
Bump numpy from 1.21.5 to 1.22.0 (#10)
Bumps [numpy](https://github.com/numpy/numpy) from 1.21.5 to 1.22.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/numpy/numpy/releases">numpy's
releases</a>.</em></p>
<blockquote>
<h2>v1.22.0</h2>
<h1>NumPy 1.22.0 Release Notes</h1>
<p>NumPy 1.22.0 is a big release featuring the work of 153 contributors
spread over 609 pull requests. There have been many improvements,
highlights are:</p>
<ul>
<li>Annotations of the main namespace are essentially complete. Upstream
is a moving target, so there will likely be further improvements,
but the major work is done. This is probably the most user visible
enhancement in this release.</li>
<li>A preliminary version of the proposed Array-API is provided. This is
a step in creating a standard collection of functions that can be
used across application such as CuPy and JAX.</li>
<li>NumPy now has a DLPack backend. DLPack provides a common interchange
format for array (tensor) data.</li>
<li>New methods for <code>quantile</code>, <code>percentile</code>, and
related functions. The
new methods provide a complete set of the methods commonly found in
the literature.</li>
<li>A new configurable allocator for use by downstream projects.</li>
</ul>
<p>These are in addition to the ongoing work to provide SIMD support for
commonly used functions, improvements to F2PY, and better
documentation.</p>
<p>The Python versions supported in this release are 3.8-3.10, Python
3.7
has been dropped. Note that 32 bit wheels are only provided for Python
3.8 and 3.9 on Windows, all other wheels are 64 bits on account of
Ubuntu, Fedora, and other Linux distributions dropping 32 bit support.
All 64 bit wheels are also linked with 64 bit integer OpenBLAS, which
should fix
the occasional problems encountered by folks using truly huge
arrays.</p>
<h2>Expired deprecations</h2>
<h3>Deprecated numeric style dtype strings have been removed</h3>
<p>Using the strings <code>&quot;Bytes0&quot;</code>,
<code>&quot;Datetime64&quot;</code>, <code>&quot;Str0&quot;</code>,
<code>&quot;Uint32&quot;</code>,
and <code>&quot;Uint64&quot;</code> as a dtype will now raise a
<code>TypeError</code>.</p>
<p>(<a
href="https://github-redirect.dependabot.com/numpy/numpy/pull/19539">gh-19539</a>)</p>
<h3>Expired deprecations for <code>loads</code>, <code>ndfromtxt</code>,
and <code>mafromtxt</code> in npyio</h3>
<p><code>numpy.loads</code> was deprecated in v1.15, with the
recommendation that
users use <code>pickle.loads</code> instead. <code>ndfromtxt</code> and
<code>mafromtxt</code> were both
deprecated in v1.17 - users should use <code>numpy.genfromtxt</code>
instead with
the appropriate value for the <code>usemask</code> parameter.</p>
<p>(<a
href="https://github-redirect.dependabot.com/numpy/numpy/pull/19615">gh-19615</a>)</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="4adc87dff1"><code>4adc87d</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/numpy/numpy/issues/20685">#20685</a>
from charris/prepare-for-1.22.0-release</li>
<li><a
href="fd66547557"><code>fd66547</code></a>
REL: Prepare for the NumPy 1.22.0 release.</li>
<li><a
href="125304b035"><code>125304b</code></a>
wip</li>
<li><a
href="c283859128"><code>c283859</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/numpy/numpy/issues/20682">#20682</a>
from charris/backport-20416</li>
<li><a
href="5399c03d4a"><code>5399c03</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/numpy/numpy/issues/20681">#20681</a>
from charris/backport-20954</li>
<li><a
href="f9c45f8ebf"><code>f9c45f8</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/numpy/numpy/issues/20680">#20680</a>
from charris/backport-20663</li>
<li><a
href="794b36f7e1"><code>794b36f</code></a>
Update armccompiler.py</li>
<li><a
href="d93b14e3d7"><code>d93b14e</code></a>
Update test_public_api.py</li>
<li><a
href="7662c0789c"><code>7662c07</code></a>
Update <strong>init</strong>.py</li>
<li><a
href="311ab52488"><code>311ab52</code></a>
Update armccompiler.py</li>
<li>Additional commits viewable in <a
href="https://github.com/numpy/numpy/compare/v1.21.5...v1.22.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=numpy&package-manager=pip&previous-version=1.21.5&new-version=1.22.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/ZeroCool940711/stable-diffusion-webui/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alejandro Gil <ZeroCool940711@users.noreply.github.com>
2022-10-01 04:21:44 -07:00
Alejandro Gil
90d05394c7
Merge branch 'dev' into expand-settings-page 2022-10-01 04:07:21 -07:00
hlky
1190d8858c
Update artists.txt 2022-10-01 11:24:21 +01:00
Joshua Kimsey
e2b1dcf0bd Fixed separate_prompts error 2022-10-01 04:43:53 -04:00
Joshua Kimsey
2cfbb5f63e Add Txt2Img Settings
Added the Txt2Img settings from the `configs/webui/webui_streamlit.yaml` file. All are working except `separate_prompts`, which throws a `Missing key separate_prompts` error for some reason.
2022-10-01 04:30:25 -04:00
Alejandro Gil
7e9fd08c55
... (#1369) 2022-09-30 15:51:01 -07:00
Alejandro Gil
0eec9db567
Merge branch 'sd-webui:dev' into dev 2022-09-30 15:50:37 -07:00
ZeroCool940711
6fd78f94d6 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	scripts/img2txt.py
2022-09-30 15:48:24 -07:00
ZeroCool940711
857608c5f6 ... 2022-09-30 15:46:02 -07:00
Travis Fletcher
dff2d6e60f
Amd gpu docker (#1366)
# Description
AMD support can be built by prefixing your compose commands with 
`docker compose -f docker-compose.yml -f docker-compose.amd.yml ...`

or, by setting 
```
export COMPOSE_FILE=docker-compose.yml:docker-compose.amd.yml
```
in your `.profile` or through a tool like `direnv`


Closes: Discord #installation-packing:AMD, at least for Linux hosts

# Checklist:

- [x] I have changed the base branch to `dev`
- [x] I have performed a self-review of my own code
- [x] I have commented my code in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
2022-10-01 01:42:35 +03:00
Alejandro Gil
b66cb302ce
Improved img2txt layout and performance. (#1368) 2022-09-30 13:17:19 -07:00
Alejandro Gil
ebbd65a52c
Merge branch 'dev' into dev 2022-09-30 13:17:08 -07:00
ZeroCool940711
20a89a1233 Add more print statements to provide more info on whats happening behind the scenes. 2022-09-30 13:04:08 -07:00
ZeroCool940711
d8a8687852 Improved img2txt layout and performance. 2022-09-30 12:41:01 -07:00
hlky
f1a98997d6
Update img2txt.py 2022-09-30 19:54:01 +01:00
hlky
aa858e0114
Update img2txt.py 2022-09-30 19:52:14 +01:00
ZeroCool940711
3bb432162e Added open clip dependency which is needed for some CLIP models. 2022-09-30 08:47:30 -07:00
hlky
084fa9732f
Update img2txt.py 2022-09-30 10:40:02 +01:00
Alejandro Gil
9a88f524ba
Removed some left over comments on webui_streamlit.py (#1367) 2022-09-30 02:37:35 -07:00
ZeroCool940711
51b7c9ac31 Removed some left over comments on webui_streamlit.py 2022-09-30 02:05:16 -07:00
ZeroCool940711
8673363d71 Moved the css loading to be on sd_utils.py 2022-09-30 02:04:52 -07:00
ZeroCool940711
50bc2bb545 Fixed typo on the model manager 2022-09-30 02:04:32 -07:00
Travis Fletcher
aaa3be16e0
Img2text docker package updates (#1364)
# Description

Docker package sync

Closes: N/A

# Checklist:

- [x] I have changed the base branch to `dev`
- [x] I have performed a self-review of my own code
- [x] I have commented my code in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
2022-09-30 01:13:21 +03:00
Alejandro Gil
4cefd5463c
Img2txt is working now (#1360)
Img2txt is working and ready to use but needs more than 8GB of VRAM to
work for now. I will be trying to improve that as the next step.
2022-09-29 08:58:56 -07:00
ZeroCool940711
5445287bcf Img2txt working now but needs more than 8GB og VRAM to work. Will be trying to improve it as the next step. 2022-09-29 08:52:46 -07:00
ZeroCool940711
466cfde3fa More fixes for img2txt 2022-09-29 07:27:56 -07:00
Alejandro Gil
5a48782f13
Fixed custom models not loading on txt2img, img2img and txt2vid. (#1356) 2022-09-29 03:31:00 -07:00
ZeroCool940711
03c2693040 Merge remote-tracking branch 'origin/dev' into dev 2022-09-29 03:30:09 -07:00
ZeroCool940711
625ba555e3 Fixed custom models not loading on txt2img, img2img and txt2vid. 2022-09-29 03:29:44 -07:00
Alejandro Gil
9694811455
Made sure the txt2vid tab shows a loading animation when the models are loading. (#1355) 2022-09-29 01:09:41 -07:00
ZeroCool940711
ae263cb55e Made sure the txt2vid tab shows a loading animation when the models are loading. 2022-09-29 01:07:32 -07:00
ZeroCool940711
07d935b445 More fixes to img2txt 2022-09-29 01:07:32 -07:00
ZeroCool940711
f925e05e9e Added placeholder image for img2txt. 2022-09-29 01:07:32 -07:00
ZeroCool940711
063ed04781 Moved img2txt txt files to a subfolder on the data folder to keep things organized. 2022-09-28 22:44:25 -07:00
ZeroCool940711
8652603368 Hide anchor links buttons on titles. 2022-09-28 22:43:41 -07:00