Merge branch 'master' into dev

.env_docker.example

@@ -0,0 +1,14 @@
+# Force miniconda to attempt to update on every container restart
+# instead only when changes are detected
+CONDA_FORCE_UPDATE=false
+
+# Validate the model files on every container restart
+# (useful to set to false after you're sure the model files are already in place)
+VALIDATE_MODELS=true
+
+#Automatically relaunch the webui on crashes
+WEBUI_RELAUNCH=true
+
+#Pass cli arguments to webui.py e.g:
+#WEBUI_ARGS=--gpu=1 --esrgan-gpu=1 --gfpgan-gpu=1
+WEBUI_ARGS=

frontend/frontend.py

@@ -73,7 +73,6 @@ def draw_gradio_ui(opt, img2img=lambda x: x, txt2img=lambda x: x, imgproc=lambda
                                     _js='(x) => navigator.clipboard.writeText(x)', fn=None, show_progress=False)
                             output_txt2img_stats = gr.HTML(label='Stats')
                     with gr.Column():
-
                         txt2img_steps = gr.Slider(minimum=1, maximum=250, step=1, label="Sampling Steps",
                                                   value=txt2img_defaults['ddim_steps'])
                         txt2img_sampling = gr.Dropdown(label='Sampling method (k_lms is default k-diffusion sampler)',
@@ -100,6 +99,7 @@ def draw_gradio_ui(opt, img2img=lambda x: x, txt2img=lambda x: x, imgproc=lambda
                                                                                      'RealESRGAN_x4plus_anime_6B'],
                                                                             value='RealESRGAN_x4plus',
                                                                        visible=False)  # RealESRGAN is not None # invisible until removed)  # TODO: Feels like I shouldnt slot it in here.
+
                                 txt2img_ddim_eta = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label="DDIM ETA",
                                                              value=txt2img_defaults['ddim_eta'], visible=False)
                                 txt2img_variant_amount = gr.Slider(minimum=0.0, maximum=1.0, label='Variation Amount',
@@ -148,7 +148,6 @@ def draw_gradio_ui(opt, img2img=lambda x: x, txt2img=lambda x: x, imgproc=lambda
                     _js=js_parse_prompt
                 )
 
-
             with gr.TabItem("Image-to-Image Unified", id="img2img_tab"):
                 with gr.Row(elem_id="prompt_row"):
                     img2img_prompt = gr.Textbox(label="Prompt",
@@ -213,7 +212,6 @@ def draw_gradio_ui(opt, img2img=lambda x: x, txt2img=lambda x: x, imgproc=lambda
                             with gr.TabItem("Hints"):
                                 img2img_help = gr.Markdown(visible=False, value=uifn.help_text)
 
-
                     with gr.Column():
                         gr.Markdown('#### Img2Img Results')
                         output_img2img_gallery = gr.Gallery(label="Images", elem_id="img2img_gallery_output").style(
@@ -357,6 +355,11 @@ def draw_gradio_ui(opt, img2img=lambda x: x, txt2img=lambda x: x, imgproc=lambda
                 )
 
                 def img2img_submit_params():
+                    # print([img2img_prompt, img2img_image_editor_mode, img2img_mask,
+                    #              img2img_mask_blur_strength, img2img_steps, img2img_sampling, img2img_toggles,
+                    #              img2img_realesrgan_model_name, img2img_batch_count, img2img_cfg,
+                    #              img2img_denoising, img2img_seed, img2img_height, img2img_width, img2img_resize,
+                    #              img2img_image_editor, img2img_image_mask, img2img_embeddings])
                     return (img2img_func,
                             img2img_inputs,
                             img2img_outputs)

webui.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# Starts the gui using the conda env
+#
+
+ENV_NAME="ldm"
+ENV_FILE="environment.yaml"
+ENV_UPDATED=0
+ENV_MODIFIED=$(date -r $ENV_FILE "+%s")
+ENV_MODIFED_FILE=".env_updated"
+if [[ -f $ENV_MODIFED_FILE ]]; then ENV_MODIFIED_CACHED=$(<${ENV_MODIFED_FILE}); else ENV_MODIFIED_CACHED=0; fi
+
+# Set conda path if it is not already in default environment
+custom_conda_path=
+
+# Allow setting custom path via file to allow updates of this script without undoing custom path
+if [ -f custom-conda-path.txt ]; then
+    custom_conda_path=$(cat custom-conda-path.txt)
+fi
+
+# If custom path is set above, try to setup conda environment
+if [ -f "${custom_conda_path}/etc/profile.d/conda.sh" ]; then
+    . "${custom_conda_path}/etc/profile.d/conda.sh"
+elif [ -n "${custom_conda_path}" ] && [ -f "${custom_conda_path}/bin" ]; then
+    export PATH="${custom_conda_path}/bin:$PATH"
+fi
+
+if ! command -v conda >/dev/null; then
+    echo "anaconda3/miniconda3 not found. Install from here https://docs.conda.io/en/latest/miniconda.html"
+    exit 1
+fi
+
+# Create/update conda env if needed
+if ! conda env list | grep ".*${ENV_NAME}.*" >/dev/null 2>&1; then
+    echo "Could not find conda env: ${ENV_NAME} ... creating ..."
+    conda env create -f $ENV_FILE
+    ENV_UPDATED=1
+elif [[ ! -z $CONDA_FORCE_UPDATE && $CONDA_FORCE_UPDATE == "true" ]] || (( $ENV_MODIFIED > $ENV_MODIFIED_CACHED )); then
+    echo "Updating conda env: ${ENV_NAME} ..."
+    conda env update --file $ENV_FILE --prune
+    ENV_UPDATED=1
+fi
+
+# Clear artifacts from conda after create/update
+if (( $ENV_UPDATED > 0 )); then
+    conda clean --all
+    echo -n $ENV_MODIFIED > $ENV_MODIFED_FILE
+fi
+
+# Activate conda environment
+conda activate $ENV_NAME
+conda info | grep active
+
+if [ ! -e "models/ldm/stable-diffusion-v1/model.ckpt" ]; then
+    echo "Your model file does not exist! Place it in 'models/ldm/stable-diffusion-v1' with the name 'model.ckpt'."
+    exit 1
+fi
+
+python scripts/relauncher.py