Commit Graph

1452 Commits

Author SHA1 Message Date
ZeroCool940711
79a8d9dc05
Merge remote-tracking branch 'origin/dev' into dev 2022-11-09 23:50:49 -08:00
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
bdbce6b049
patch: Added new field on the config file to separate the default model from the base mode used, this should fix the issue where when using the settings page to set a default model it was then not possible to run the default stable diffusion model. 2022-11-09 15:59:18 -08:00
Alejandro Gil
8851d594a2
Fixed several broken links on the documentation. (#1654) 2022-11-09 15:41:45 -08:00
Alejandro Gil
9e816ef0e5
Merge branch 'Sygil-Dev:dev' into dev 2022-11-09 15:41:17 -08:00
ZeroCool940711
f822bbb4fe
Merge remote-tracking branch 'origin/dev' into dev 2022-11-09 15:40:16 -08:00
ZeroCool940711
e450a0668a
Fixed several broken links on the documentation. 2022-11-09 15:39:37 -08:00
Alejandro Gil
03a75344f3
Removed --frozen-lockfile from yarn command on the docs building workflow. (#1653) 2022-11-09 15:05:55 -08:00
Alejandro Gil
4d3c67d8d5
Merge branch 'Sygil-Dev:dev' into dev 2022-11-09 15:05:19 -08:00
ZeroCool940711
52fb5bba4f
Removed --frozen-lockfile from yarn command on the docs building workflow. 2022-11-09 15:04:48 -08:00
Alejandro Gil
51e0b28e8c
Fixed incorrect environment name that was used for testing and wrongly uploaded to the main repo. Apologies for this. (#1651) 2022-11-09 14:49:21 -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
Alejandro Gil
55ca5a95b1
patch: Fixed create-docusaurus not found when installing with conda, it has being moved to the package.json file. - Removed leftover files from nataili. - Changed default masking mode to Outpainting as it will make it behave more like it was before the new image editor was introduced. (#1650) 2022-11-09 00:55:39 -08:00
ZeroCool940711
cf62f18bdc
Changed default masking mode to Outpainting as it will make it behave more like it was before the new image editor was introduced. 2022-11-09 00:47:43 -08:00
ZeroCool940711
e5071daa79
Removed leftover files from nataili. 2022-11-09 00:45:07 -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
47616ab3a3 Improved the documentation site by adding extra information on several pages. 2022-11-07 20:27:41 -08:00
ZeroCool940711
e75b9da8ec Added yarn.lock to repo for docusaurus. 2022-11-07 20:27:41 -08:00
ZeroCool940711
4725983fb0 patch: Added github work flow files to build and deploy the new docusaurus documentation. 2022-11-07 20:27:41 -08:00
ZeroCool940711
591eab3cae Added some folders and files to the gitignore for the new docusaurus documentation. 2022-11-07 20:27:41 -08:00
ZeroCool940711
0b02ec3a18 Added dependency file for the docusaurus based documentation. 2022-11-07 20:27:41 -08:00
ZeroCool940711
8adf6a65d0 feat: Added new documentation site using docusaurus which should make easier for users to browse and search the documentation site. 2022-11-07 20:27:41 -08:00
ZeroCool940711
1783baa7b3 Added some placeholder images for the new docs using docusaurus. 2022-11-07 20:27:41 -08:00
ZeroCool940711
4ed4257346 fix:Fixed several typos and wrong paths on the images used on the docs. 2022-11-07 20:27:41 -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
064a74c05e Renamed Mask and Mask Inverted to Outpainting and Inpainting on the img2img tab to reflect better what they do. 2022-11-07 20:27:41 -08:00
Alejandro Gil
110069775f
Updates to colab notebook (#1647)
# Description
Added more/better error handling/checks.
Added option to save models to Google Drive, to speed up future runs.
Added option to use custom config file.
Removed line to download external font. <--seems unnecessary now.

# 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
- [ ] I have made corresponding changes to the documentation
2022-11-06 18:58:58 -08:00
aedh carrick
50c9cb1652 fixed typo, tested 2022-11-06 18:50:43 -06:00
aedh carrick
4be125a7d5 cleaned code, added option to save models to drive for faster loading, untested!!! 2022-11-06 18:11:52 -06:00
aedh carrick
d508b14984
Merge branch 'Sygil-Dev:dev' into dev 2022-11-04 13:04:58 -05:00
Alejandro Gil
6f6d7571ea
Fixed streamlit-base-extras not installing properly. (#1644) 2022-11-04 10:16:03 -07:00
ZeroCool940711
88fa9f244e Merge remote-tracking branch 'origin/dev' into dev 2022-11-04 10:09:08 -07:00
ZeroCool940711
31dccce8eb Fixed streamlit-base-extras not installing properly. 2022-11-04 10:08:35 -07:00
aedh carrick
ef8daeecf0 improved error checks/handling 2022-11-03 14:27:51 -05:00
Alejandro Gil
a8c3127c74
feat: Upgraded streamlit from 1.13.0 to 1.14.0 (#1641)
- Cleaned up unnecessary imports and comments from the
webui_streamlit.py script.
- Added link to the 1.5 model hosted on huggingface but on a public repo
that do not require token or authentication, should reduce the amount of
errors with the token for new users.
- Initial conversion of the sd_util.py file into a package with smaller
modules in it.
2022-11-03 00:09:01 -07:00
ZeroCool940711
3736a35e26 Initial conversion of the sd_util.py file into a package with smaller modules in it. 2022-11-03 00:05:54 -07:00
ZeroCool940711
b63ab41899 Added link to the 1.5 model hosted on huggingface but on a public repo that do not require token or authentication, should reduce the amount of errors with the token for new users. 2022-11-03 00:01:54 -07:00
ZeroCool940711
cb8eb0d5a4 feat: Upgraded streamlit from 1.13.0 to 1.14.0 2022-11-02 23:59:48 -07:00
ZeroCool940711
815cb49407 Cleaned up unnecessary imports and comments from the webui_streamlit.py script. 2022-11-02 23:58:35 -07:00
Alejandro Gil
711555b68b
1-click installer and updater. Uses micromamba to install git and conda into a contained environment (if necessary) before running the normal installation script (#1519)
Hi,

This PR enables a user to install this project without requiring them to
have anaconda or git pre-installed. This reduces unnecessary friction
for users who aren't programmers or very technical. If a user already
has anaconda or git pre-installed, these scripts will just pass-through
and won't affect them. Honestly, it's just more straightforward for a
user to use. :)

## Current installation process for a user:
1. Install Anaconda
2. Install Git
3. Run the commands for a git pull (on Windows)
4. Run the webui script

## Suggested new process (for Windows and Linux):
1. Download the `install.bat` or `install.sh` script for their OS
(linked below, or better, from a release on your project)
2. Run the script

That's it.

Main improvement: The user doesn't need to have python/anaconda/git
pre-installed. This reduces unnecessary friction for non-technical
users.

## 1-click Installers:
* Windows:
https://raw.githubusercontent.com/cmdr2/hlky-webui/master/installer/install.bat
* Linux:
https://raw.githubusercontent.com/cmdr2/hlky-webui/master/installer/install.sh

-----

I've tested this on Windows x64 and Linux x64. I've tested this with and
without Anaconda pre-installed. I've also tested it works if the
installer gets interrupted mid-way, and needs to be re-run.

**Disclosure:** I'm the author of the cmdr2 UI and 1-click installer
(https://github.com/cmdr2/stable-diffusion-ui). We use a similar
approach and it's been working quite well (~2k installs/day) for over
1.5 months. None of the support issue have been due to this
bootstrapping process, but rather due to the usual pip failures, VPN
issues, bad system config etc.

## How it works:
1. This script will install git and conda (if not found on the system
PATH) using `micromamba` (an 8mb static-linked single-file binary, conda
replacement). The micromamba binary will be downloaded if necessary
using curl.

For users who already have git and python, this step will be skipped.

2. Next, it'll checkout the project's git repo, if necessary. On Linux,
it'll download and run the
[linux-sd.sh](https://raw.githubusercontent.com/JoshuaKimsey/Linux-StableDiffusion-Script/main/linux-sd.sh)
script, like how the installation guide suggests.

3. Finally, it'll start `webui.cmd` on Windows. On Linux, the
linux-sd.sh script takes care of this step.

After installation, users can continue running `webui.cmd` or `webui.sh`
directly. It'll use either the git/python/conda that was installed
through this installer, or the user's existing git/python/conda
installation.

## Next steps (if you wish to adopt this)
If you're willing, then the next steps are:
1. Merging this PR will get the installer scripts into the `installer`
folder
2. Uploading the installer files to a GitHub release, or using the
upload links inside this PR
3. Updating the README with the download links for the installer. I can
submit the PR for the README, if you're interested.

If you're interested in this, I'd definitely suggest phasing this in
gradually, maybe suggested as an easier alternative on the docs, until
it is judged stable to use.

Thanks! :)


# Checklist:

- [y] I have changed the base branch to `dev`
- [y] I have performed a self-review of my own code
- [y] I have commented my code in hard-to-understand areas
- [y] I have made corresponding changes to the documentation
2022-11-02 21:23:51 -07:00
cmdr2
5e725e036e
Merge branch 'dev' into master 2022-11-03 09:46:25 +05:30
cmdr2
96b568ae09 Add dev-only warning 2022-11-03 09:45:12 +05:30
cmdr2
9501ab855a Add dev-only warning 2022-11-03 09:44:44 +05:30
cmdr2
2769ec22f2 readme.txt for users in the release zip 2022-11-03 09:44:07 +05:30
cmdr2
a00eda9b32 Merge branch 'master' of github.com:cmdr2/hlky-webui 2022-11-03 09:40:52 +05:30
cmdr2
fef5019bda create_installers script 2022-11-03 09:40:42 +05:30
Alejandro Gil
4bde3eacd0
fix: Fixed GPU selection not being saved properly on the Settings page. (#1638) 2022-11-02 15:59:08 -07:00
ZeroCool940711
fa529b432e Merge remote-tracking branch 'origin/dev' into dev 2022-11-02 15:55:20 -07:00
ZeroCool940711
b7c2ceb177 fix: Fixed GPU selection not being saved properly on the Settings page. 2022-11-02 15:51:37 -07:00
Alejandro Gil
62f9706d6a
Added barfi/baklavajs to the Tools menu and added a new post processing tab which is still a work in progress. (#1634)
# Description
- Added a basic implementation of
[Barfi](https://github.com/krish-adi/barfi) under the Tools menu which
should allow us to create nodes for a node/flow based content generation
and potentially allowing us to connect the UI with external apps like
Houdini, Blender,etc.
- Added basic post-processing tab which is still being worked on.
2022-11-01 10:44:07 -07:00