Commit Graph

45 Commits

Author SHA1 Message Date
ZeroCool940711
afaa897c52
Added conda-forge channel to environment.yaml to make it so nodejs and yarn can be installed with it as part of the environment for the UI. 2022-11-09 23:49:32 -08:00
ZeroCool940711
88d3c77359
Fixed incorrect environment name that was used for testing and wrongly uploaded to the main repo. Apologies for this. 2022-11-09 14:38:34 -08:00
ZeroCool940711
28cee5fcc4
patch: Fixed create-docusaurus not found when installing with conda, it has being moved to the package.json file. 2022-11-09 00:24:51 -08:00
ZeroCool940711
c62d2a26b9 Added nodejs, yarn and create-docusaurus conda dependency needed for the new documentation. 2022-11-07 20:27:41 -08:00
ZeroCool940711
cb501565c2 More renaming and changed to links related to the organization, docs and repo names. 2022-10-23 18:54:10 -07:00
ZeroCool940711
97eb1b169b More renaming and changes to links related to the organization, docs an repo names. 2022-10-23 17:17:50 -07:00
ZeroCool940711
d9b4914406 Moved the pip dependencies from the environment.yaml to the requirements.txt file. 2022-10-07 12:40:06 -07:00
ZeroCool940711
5b05977e89 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	scripts/txt2img.py
2022-10-06 01:49:18 -07:00
hlky
d134e935a3
wget 2022-10-04 19:58:26 +01:00
hlky
c2388aea3b
pycocotools is not used 2022-10-04 19:54:33 +01:00
hlky
2a30f0828f
ModuleNotFoundError: No module named 'loguru' #1417 2022-10-04 13:01:07 +01:00
ZeroCool940711
be9994b061 Changed hydralit and hydralit components order on the environment file as it might be causing some issues. 2022-10-03 08:59:47 -07:00
ZeroCool940711
d47c258eaa Removed GFPGAN github dependency, we can now use pip to install a fixed version of it. 2022-10-02 13:11:30 -07:00
xaedes
33b896d0cb
Scene-to-Image Prompt Layering System (#1179)
# Summary of the change

- new Scene-to-Image tab
- new scn2img function
- functions for loading and running monocular_depth_estimation with
tensorflow

# Description

(relevant motivation, which issue is fixed)

Related to discussion #925

> Would it be possible to have a layers system where we could do have
foreground, mid, and background objects which relate to one another and
share the style? So we could say generate a landscape, one another layer
generate a castle, and on another layer generate a crowd of people.

To make this work I made a prompt-based layering system in a new
"Scene-to-Image" tab.
You write a a multi-line prompt that looks like markdown, where each
section declares one layer.
It is hierarchical, so each layer can have their own child layers.

Examples: https://imgur.com/a/eUxd5qn
![](https://i.imgur.com/L61w00Q.png)

In the frontend you can find a brief documentation for the syntax,
examples and reference for the various arguments.

Here a short summary:

Sections with "prompt" and child layers are img2img, without child
layers they are txt2img.
Without "prompt" they are just images, useful for mask selection, image
composition, etc.
Images can be initialized with "color", resized with "resize" and their
position specified with "pos".
Rotation and rotation center are "rotation" and "center". 

Mask can automatically be selected by color or by estimated depth based
on https://huggingface.co/spaces/atsantiago/Monocular_Depth_Filter.

![](https://i.imgur.com/8rMHWmZ.png)

# Additional dependencies that are required for this change

For mask selection by monocular depth estimation tensorflow is required
and the model must be cloned to ./src/monocular_depth_estimation/
Changes in environment.yaml:
- einops>=0.3.0
- tensorflow>=2.10.0 

Einops must be allowed to be newer for tensorflow to work.

# 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

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
2022-10-02 18:23:37 +01:00
Divided by Zer0
5853f3e1a1
Stable Horde bridge (#1204)
# Adds the bridge code which when enabled turns the webui into a
headless [Stable Horde](https://stablehorde.net) instance

It adds a few new command-line args to be able to pass variables to the
bridge, as well as the possibility to set it via a variables files
`bridgeData.py`.

To start the bridge, one needs to add the `--bridge` argument to their
relauncher.py as well as any horde vars they want to specify.

On top of that this adds the loguru module as well as my tuned loguru
config. This provides a much nicer logging output and provides the
capability to save output to files for issue reports etc. For now only
the bridge is utilizing the nice format, but once it's merged, you can
start replacing `print()` with `logger.xxx()` where appropriate

To make the bridge work, I've had to add defaults to txt2img but this
should not affect anything.


# 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

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
Co-authored-by: Thomas Mello <work.mello@gmail.com>
Co-authored-by: Joshua Kimsey <jkimsey95@gmail.com>
Co-authored-by: ZeroCool <ZeroCool940711@users.noreply.github.com>
2022-10-02 18:22:27 +01:00
ZeroCool940711
3bb432162e Added open clip dependency which is needed for some CLIP models. 2022-09-30 08:47:30 -07:00
Alejandro Gil
f678efb4e2
Img2txt dependencies and necessary files. (#1354) 2022-09-28 12:37:15 -07:00
Alejandro Gil
3e40bab7f7
Changed the default streamlit import for hydralit as we will be using hydralit as replacement for the default streamlit library, hydralit provides better control over css as well as having a lot more options. (#1352) 2022-09-28 09:33:54 -07:00
hlky
eb374e9084
Update environment.yaml 2022-09-27 22:03:56 +01:00
Alejandro Gil
519d7c661f
Added new implementation of the textual inversion page. (#1342) 2022-09-27 11:36:48 -07:00
ZeroCool
6bfb6a57ec
Changed realesrgan dependency to use pip instead. (#1337)
Changed realesrgan dependency to use pip instead of having to clone the
repository on the src folder, this should reduce the amount of stuff
that is on the src folder and that causes issues when updating.

# Checklist:

- [x ] I have changed the base branch to `dev`
- [ x] I have performed a self-review of my own code
2022-09-26 22:44:15 -07:00
hlky
4a15702fe9
License header 2022-09-26 14:02:48 +01:00
Travis Fletcher
5bea9a51c4
Fix missing docker package (#1316)
* Fix missing docker package

* Consolidate docker requirements files
2022-09-25 22:14:10 +03:00
ZeroCool940711
87125a78f9 Added streamlit-server-state dependency. 2022-09-24 23:23:02 -07:00
ZeroCool940711
4f0ae7a746 Upgraded the streamlit dependency to version 1.13.0 2022-09-24 18:09:28 -07:00
Joshua Kimsey
a8f1e23346 Fixed Streamlit >1.12.2 error 2022-09-22 22:04:31 -04:00
Thomas Mello
148c41826b Merge branch 'dev' into the-merge
# Conflicts:
#	.gitignore
#	README.md
#	configs/webui/webui_streamlit.yaml
#	environment.yaml
#	frontend/css/streamlit.main.css
#	frontend/frontend.py
#	scripts/webui_streamlit.py
2022-09-18 12:31:17 +03:00
ZeroCool940711
ef2da42489 - Bumped the version of diffusers used on the txt2vid tab to be now v0.3.0.
- Added initial file for the textual inversion tab.
2022-09-16 11:50:22 -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
ZeroCool940711
cbc2a57bc1 Added streamlit-on-Hover-tabs and streamlit-option-menu dependencies to the environment.yaml file. 2022-09-11 20:15:07 -07:00
ZeroCool940711
e6463e3249 Added some basic layout for the Model Manager tab and added there the models that most people use to make it easy to download instead of having to go do the wiki or searching through discord for links, it also shows the path where you are supposed to put those models for them to work. 2022-09-11 03:35:14 -07:00
hlky
c5b2e1eba8
Merge branch 'dev' into dev 2022-09-11 07:32:11 +01:00
ZeroCool940711
d262f6f97a Added piexif dependency. 2022-09-10 20:36:05 -07:00
Thomas Mello
8039021b53 refactor: sort out dependencies
Co-Authored-By: oc013 <101832295+oc013@users.noreply.github.com>
Co-Authored-By: Aarni Koskela <akx@iki.fi>
Co-Authored-By: oc013 <101832295+oc013@users.noreply.github.com>
Co-Authored-By: Aarni Koskela <akx@iki.fi>
2022-09-11 04:33:43 +03:00
ZeroCool940711
c7894b090a Changed the diffusers version to be 0.2.4 or lower as a new version breaks the txt2vid generation. 2022-09-10 07:37:28 -07:00
Joshua Kimsey
3d953ad156 Fixed missing diffusers dependency for Streamlit 2022-09-08 23:01:30 +01:00
hlky
a00d827cd8
Dev merge (#819)
* #715 #699 #698 #663 #625 #617 #611 #604 (#716)

* Update README.md

* Add sampler name to metadata (#695)

Co-authored-by: EliEron <example@example.com>

* old-dev-merge

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>

* img2img-fix (#717)

* Revert "img2img-fix (#717)"

This reverts commit 70d4b1ca2a.

* img2img fixes

* Revert "img2img fixes"

This reverts commit e66eddc621.

* Revert "Revert "img2img-fix (#717)""

This reverts commit bf08b617d4.

* img2img fixed

* - Removed duplicated calls to save_sample.
- Change variables and arguments to be more self-explanatory and easier to understand what they do.

* Moved streamlit files to their proper location, before they were incorrectly added to the repository root folder.

* Added retry dependency for the streamlit version.

* Added .cmd file for easy running and updating the streamlit version of the UI.

* Removed duplicated entry for streamlit on the environment.yaml file.

* Removed some unnecessary lines from the the webui_streamlit.cmd file.

* add gfpgan folder to gitignore, auto gen by imglab

* added placeholder text similar to gradio

* added auto conversion for 4 channel PNG to RGB

* fix: regex escape characters

* Update Readme links to sd-webui when appropriate (#781)

* Update link to sd-webui when appropriate

* added LDSR instruction per devilismyfriend guide

* fix: stack overflow during recursion call (#784)

* Added option to set default sampler name from config file, will be useful for those wanting to change the default sampler and  have it persist even when closing the UI and opening it again.

* Added try and except block to handle basic errors like StopException which is raised by streamlit when you hit the stop button and KeyError which happens also when stopping the generation because it tries to check the model at the end which is not loaded at that time, this can be ignored and so thats the reason for the exception.

* separate css to external file

* Added "git pull" and "git stash" to the commands run by the cmd scripts when launching the UI, this should make it so people who use it can automatically update the code from the repo and be up to date without manually using those commands everytime.

* resolve conflict with master

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>
Co-authored-by: ZeroCool <ZeroCool940711@users.noreply.github.com>
Co-authored-by: ZeroCool940711 <alejandrogilelias940711@gmail.com>
Co-authored-by: Hafiidz <3688500+Hafiidz@users.noreply.github.com>
Co-authored-by: Thomas Mello <work.mello@gmail.com>
2022-09-08 11:41:04 +01:00
hlky
490bbbc103
Img2img dev (#736)
* #715 #699 #698 #663 #625 #617 #611 #604 (#716)

* Update README.md

* Add sampler name to metadata (#695)

Co-authored-by: EliEron <example@example.com>

* old-dev-merge

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>

* img2img-fix (#717)

* Revert "img2img-fix (#717)"

This reverts commit 70d4b1ca2a.

* img2img fixes

* Revert "img2img fixes"

This reverts commit e66eddc621.

* Revert "Revert "img2img-fix (#717)""

This reverts commit bf08b617d4.

* img2img fixed

* feat: bring back Crop mode, formatting

Co-authored-by: EliEron <subanimehd@gmail.com>
Co-authored-by: EliEron <example@example.com>
Co-authored-by: Thomas Mello <work.mello@gmail.com>
2022-09-07 20:19:00 +01:00
ZeroCool940711
ab6602791a Removed duplicated entry for streamlit on the environment.yaml file. 2022-09-06 22:08:51 -07:00
ZeroCool940711
003f60f3ac Added retry dependency for the streamlit version. 2022-09-06 21:29:47 -07:00
hlky
e66eddc621
img2img fixes 2022-09-07 02:35:01 +01:00
hlky
f077e34677
Update environment.yaml 2022-09-07 02:10:13 +01:00
hlky
b3e5a486dd
Update environment.yaml 2022-09-07 02:06:17 +01:00
hlky
e625b199bc
Update environment.yaml 2022-09-06 23:51:55 +01:00
hlky
010b27ce9a
Repo merge (#712)
* repo-merge

* cutdown size

* Create setup.py

* webui.cmd

* ldm

* Update environment.yaml

* Update environment.yaml
2022-09-06 23:50:14 +01:00