Update

app.py

@@ -21,6 +21,7 @@ from app_segmentation import create_demo as create_demo_segmentation
 from app_shuffle import create_demo as create_demo_shuffle
 from app_softedge import create_demo as create_demo_softedge
 from model import Model
+from settings import SHOW_DUPLICATE_BUTTON
 
 DESCRIPTION = '# ControlNet v1.1'
 
@@ -30,10 +31,6 @@ ALLOW_CHANGING_BASE_MODEL = SPACE_ID != 'hysts/ControlNet-v1-1'
 if not torch.cuda.is_available():
     DESCRIPTION += '\n<p>Running on CPU 🥶 This demo does not work on CPU.</p>'
 
-MAX_NUM_IMAGES = int(os.getenv('MAX_NUM_IMAGES', '3'))
-DEFAULT_NUM_IMAGES = min(MAX_NUM_IMAGES,
-                         int(os.getenv('DEFAULT_NUM_IMAGES', '1')))
-
 DEFAULT_MODEL_ID = os.getenv('DEFAULT_MODEL_ID',
                              'runwayml/stable-diffusion-v1-5')
 model = Model(base_model_id=DEFAULT_MODEL_ID, task_name='Canny')
@@ -42,58 +39,34 @@ with gr.Blocks(css='style.css') as demo:
     gr.Markdown(DESCRIPTION)
     gr.DuplicateButton(value='Duplicate Space for private use',
                        elem_id='duplicate-button',
-                       visible=os.getenv('SHOW_DUPLICATE_BUTTON') == '1')
+                       visible=SHOW_DUPLICATE_BUTTON)
 
     with gr.Tabs():
         with gr.TabItem('Canny'):
-            create_demo_canny(model.process_canny,
-                              max_images=MAX_NUM_IMAGES,
-                              default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_canny(model.process_canny)
         with gr.TabItem('MLSD'):
-            create_demo_mlsd(model.process_mlsd,
-                             max_images=MAX_NUM_IMAGES,
-                             default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_mlsd(model.process_mlsd)
         with gr.TabItem('Scribble'):
-            create_demo_scribble(model.process_scribble,
-                                 max_images=MAX_NUM_IMAGES,
-                                 default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_scribble(model.process_scribble)
         with gr.TabItem('Scribble Interactive'):
             create_demo_scribble_interactive(
-                model.process_scribble_interactive,
-                max_images=MAX_NUM_IMAGES,
-                default_num_images=DEFAULT_NUM_IMAGES)
+                model.process_scribble_interactive)
         with gr.TabItem('SoftEdge'):
-            create_demo_softedge(model.process_softedge,
-                                 max_images=MAX_NUM_IMAGES,
-                                 default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_softedge(model.process_softedge)
         with gr.TabItem('OpenPose'):
-            create_demo_openpose(model.process_openpose,
-                                 max_images=MAX_NUM_IMAGES,
-                                 default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_openpose(model.process_openpose)
         with gr.TabItem('Segmentation'):
-            create_demo_segmentation(model.process_segmentation,
-                                     max_images=MAX_NUM_IMAGES,
-                                     default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_segmentation(model.process_segmentation)
         with gr.TabItem('Depth'):
-            create_demo_depth(model.process_depth,
-                              max_images=MAX_NUM_IMAGES,
-                              default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_depth(model.process_depth)
         with gr.TabItem('Normal map'):
-            create_demo_normal(model.process_normal,
-                               max_images=MAX_NUM_IMAGES,
-                               default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_normal(model.process_normal)
         with gr.TabItem('Lineart'):
-            create_demo_lineart(model.process_lineart,
-                                max_images=MAX_NUM_IMAGES,
-                                default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_lineart(model.process_lineart)
         with gr.TabItem('Content Shuffle'):
-            create_demo_shuffle(model.process_shuffle,
-                                max_images=MAX_NUM_IMAGES,
-                                default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_shuffle(model.process_shuffle)
         with gr.TabItem('Instruct Pix2Pix'):
-            create_demo_ip2p(model.process_ip2p,
-                             max_images=MAX_NUM_IMAGES,
-                             default_num_images=DEFAULT_NUM_IMAGES)
+            create_demo_ip2p(model.process_ip2p)
 
     with gr.Accordion(label='Base model', open=False):
         with gr.Row():

app_canny.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -15,8 +16,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                 with gr.Accordion('Advanced options', open=False):
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_depth.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -20,8 +21,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                         value='DPT')
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_ip2p.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -15,8 +16,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                 with gr.Accordion('Advanced options', open=False):
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_lineart.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -29,8 +30,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                     )
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_mlsd.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -15,8 +16,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                 with gr.Accordion('Advanced options', open=False):
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_normal.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -19,8 +20,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                                                  value='NormalBae')
                     num_samples = gr.Slider(label='Images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_openpose.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -19,8 +20,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                                                  value='Openpose')
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_scribble.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -20,8 +21,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                         value='HED')
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_scribble_interactive.py

@@ -3,6 +3,7 @@
 import gradio as gr
 import numpy as np
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
@@ -10,7 +11,7 @@ def create_canvas(w, h):
     return np.zeros(shape=(h, w, 3), dtype=np.uint8) + 255
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -31,8 +32,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                 with gr.Accordion('Advanced options', open=False):
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_segmentation.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -19,8 +20,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                                                  value='UPerNet')
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_shuffle.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -20,8 +21,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                         value='ContentShuffle')
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

app_softedge.py

@@ -2,10 +2,11 @@
 
 import gradio as gr
 
+from settings import DEFAULT_NUM_IMAGES, MAX_NUM_IMAGES
 from utils import randomize_seed_fn
 
 
-def create_demo(process, max_images=12, default_num_images=3):
+def create_demo(process):
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
@@ -25,8 +26,8 @@ def create_demo(process, max_images=12, default_num_images=3):
                                                  value='PidiNet')
                     num_samples = gr.Slider(label='Number of images',
                                             minimum=1,
-                                            maximum=max_images,
-                                            value=default_num_images,
+                                            maximum=MAX_NUM_IMAGES,
+                                            value=DEFAULT_NUM_IMAGES,
                                             step=1)
                     image_resolution = gr.Slider(label='Image resolution',
                                                  minimum=256,

settings.py

@@ -0,0 +1,7 @@
+import os
+
+SHOW_DUPLICATE_BUTTON = os.getenv('SHOW_DUPLICATE_BUTTON') == '1'
+
+MAX_NUM_IMAGES = int(os.getenv('MAX_NUM_IMAGES', '3'))
+DEFAULT_NUM_IMAGES = min(MAX_NUM_IMAGES,
+                         int(os.getenv('DEFAULT_NUM_IMAGES', '1')))