Revert to gradio 2 code and lock in requirements

app.py

@@ -349,23 +349,18 @@ with gr.Blocks(css=".gradio-container {max-width: 650px}") as advanced_tab:
   with gr.Row():
     prompt = gr.Textbox(label="image prompt...", elem_id="input-text")
   with gr.Row():
-    # seed = gr.Slider(0, 99999999999999, label="seed", dtype=int, value=random_seed, interactive=True, step=1)
-    seed = gr.Slider(0, 99999999999999, label="seed", value=random_seed, interactive=True, step=1)
+    seed = gr.Slider(0, 99999999999999, label="seed", dtype=int, value=random_seed, interactive=True, step=1)
     negative_prompt = gr.Textbox(label="negative prompt (optional)", elem_id="input-text")
   with gr.Row():
     with gr.Column():
-      # guidance = gr.Slider(0, 10, label="guidance", dtype=float, value=default_guidance, step=0.1, interactive=True)
-      guidance = gr.Slider(0, 10, label="guidance", value=default_guidance, step=0.1, interactive=True)
+      guidance = gr.Slider(0, 10, label="guidance", dtype=float, value=default_guidance, step=0.1, interactive=True)
     with gr.Column():
-      # steps = gr.Slider(1, 100, label="inference steps", dtype=int, value=default_steps, step=1, interactive=True)
-      steps = gr.Slider(1, 100, label="inference steps", value=default_steps, step=1, interactive=True)
+      steps = gr.Slider(1, 100, label="inference steps", dtype=int, value=default_steps, step=1, interactive=True)
   with gr.Row():
     with gr.Column():
-      # width = gr.Slider(144, 4200, label="width", dtype=int, value=default_pixel, step=8, interactive=True)
-      width = gr.Slider(144, 4200, label="width", value=default_pixel, step=8, interactive=True)
+      width = gr.Slider(144, 4200, label="width", dtype=int, value=default_pixel, step=8, interactive=True)
     with gr.Column():
-      # height = gr.Slider(144, 4200, label="height", dtype=int, value=default_pixel, step=8, interactive=True)
-      height = gr.Slider(144, 4200, label="height", value=default_pixel, step=8, interactive=True)
+      height = gr.Slider(144, 4200, label="height", dtype=int, value=default_pixel, step=8, interactive=True)
   gr.Markdown("<u>heads-up</u>: Height multiplied by width should not exceed about 645,000 or an error may occur. If an error occours refresh your browser tab or errors will continue. If you exceed this range the app will attempt to avoid an error by lowering your input height. We are actively seeking out ways to handle higher resolutions!")
   
   go_button = gr.Button("generate image", elem_id="go-button")
@@ -578,11 +573,10 @@ def canny_process_image(input_image, input_low_threshold, input_high_threshold,
    return np.array(canny_2)
 
 # Define the input and output interfaces
-# canny_input_image = gr.Image()
-canny_input_image = gr.Image()
-canny_input_low_threshold = gr.Slider(minimum=0, maximum=1000, step=1, label="Lower Threshold:", default=100)
-canny_input_high_threshold = gr.Slider(minimum=0, maximum=1000, step=1, label="Upper Threshold:", default=200)
-canny_input_invert = gr.Checkbox(label="Invert Image")
+canny_input_image = gr.inputs.Image()
+canny_input_low_threshold = gr.inputs.Slider(minimum=0, maximum=1000, step=1, label="Lower Threshold:", default=100)
+canny_input_high_threshold = gr.inputs.Slider(minimum=0, maximum=1000, step=1, label="Upper Threshold:", default=200)
+canny_input_invert = gr.inputs.Checkbox(label="Invert Image")
 
 canny_outputs = gr.outputs.Image(type="numpy")
 
@@ -707,18 +701,16 @@ with gr.Blocks() as canny_blocks_interface:
   ''')
   with gr.Row():
     with gr.Column():
-      canny_input_prompt = gr.Textbox(label="enter your text prompt here")
+      canny_input_prompt = gr.inputs.Textbox(label="enter your text prompt here")
       with gr.Accordion(label='negative prompt (optional)', open=False):
-        canny_negative_prompt = gr.Textbox()
-      canny_input_low_threshold = gr.Slider(minimum=0, maximum=1000, step=1, label="Lower Threshold:", default=100)
-      canny_input_high_threshold = gr.Slider(minimum=0, maximum=1000, step=1, label="Upper Threshold:", default=120)
-      # canny_input_seed = gr.Slider(0, 99999999999999, label="seed", dtype=int, value=random_seed, interactive=True, step=1)
-      canny_input_seed = gr.Slider(0, 99999999999999, label="seed", value=random_seed, interactive=True, step=1)
-      canny_input_invert = gr.Checkbox(label="invert edge tracing image")
+        canny_negative_prompt = gr.inputs.Textbox()
+      canny_input_low_threshold = gr.inputs.Slider(minimum=0, maximum=1000, step=1, label="Lower Threshold:", default=100)
+      canny_input_high_threshold = gr.inputs.Slider(minimum=0, maximum=1000, step=1, label="Upper Threshold:", default=120)
+      canny_input_seed = gr.Slider(0, 99999999999999, label="seed", dtype=int, value=random_seed, interactive=True, step=1)
+      canny_input_invert = gr.inputs.Checkbox(label="invert edge tracing image")
       canny_input_rotate = gr.Dropdown([0, 90, 180, 270], label="rotate image (for smartphones)")
     with gr.Column():
-      # canny_input_image = gr.Image(label="input image")
-      canny_input_image = gr.Image(label="input image")
+      canny_input_image = gr.inputs.Image(label="input image")
       go_button = gr.Button('generate image')
   # with gr.Row():
       with gr.Accordion(label='traced edge image', open=False):
@@ -792,11 +784,11 @@ with gr.Blocks() as canny_blocks_interface:
 #     return output_image[0][0]
 
 
-# canny_input_prompt = gr.Textbox(label="Enter a single word or phrase")
-# canny_input_image = gr.Image()
-# canny_input_low_threshold = gr.Slider(minimum=0, maximum=1000, step=1, label="Lower Threshold:", default=100)
-# canny_input_high_threshold = gr.Slider(minimum=0, maximum=1000, step=1, label="Upper Threshold:", default=200)
-# canny_input_invert = gr.Checkbox(label="Invert Image")
+# canny_input_prompt = gr.inputs.Textbox(label="Enter a single word or phrase")
+# canny_input_image = gr.inputs.Image()
+# canny_input_low_threshold = gr.inputs.Slider(minimum=0, maximum=1000, step=1, label="Lower Threshold:", default=100)
+# canny_input_high_threshold = gr.inputs.Slider(minimum=0, maximum=1000, step=1, label="Upper Threshold:", default=200)
+# canny_input_invert = gr.inputs.Checkbox(label="Invert Image")
 # canny_outputs = gr.outputs.Image(type="pil")
 
 # make and launch the gradio app...
@@ -932,21 +924,19 @@ with gr.Blocks() as depth_controlnet_gradio:
         gr.Markdown('''
           ## Inputs...
         ''')
-        input_prompt = gr.Textbox(label="text prompt")
-        # input_image = gr.Image(label="input image")
-        input_image = gr.Image(label="input image")
+        input_prompt = gr.inputs.Textbox(label="text prompt")
+        input_image = gr.inputs.Image(label="input image")
         with gr.Accordion(label="options", open=False):
           with gr.Row():
             with gr.Column():
-              input_negative_prompt = gr.Textbox(label="negative prompt")
+              input_negative_prompt = gr.inputs.Textbox(label="negative prompt")
             with gr.Column():
-              # input_seed = gr.Slider(0, 99999999999999, label="seed", dtype=int, value=random_seed, interactive=True, step=1)
-              input_seed = gr.Slider(0, 99999999999999, label="seed", value=random_seed, interactive=True, step=1)
+              input_seed = gr.Slider(0, 99999999999999, label="seed", dtype=int, value=random_seed, interactive=True, step=1)
           with gr.Row():
             with gr.Column():
               input_rotate = gr.Dropdown([0, 90, 180, 270], label="rotate image (for smartphones)")
             with gr.Column():
-              input_invert = gr.Checkbox(label="invert depthmap")
+              input_invert = gr.inputs.Checkbox(label="invert depthmap")
         submit = gr.Button('generate image')
 
     with gr.Column():