Update app.py

app.py

@@ -18,22 +18,57 @@ import gradio as gr
 showDetailsBool = False
 showSeedBool = False
 
-
-async def CleanBlock():
+anchor_styles = [
+    {
+        "value": 0,
+        "label": "Square",
+    },
+    {
+        "value": 1,
+        "label": "Circle",
+    },
+    {
+        "value": 2,
+        "label": "Minimal",
+    },
+]
+
+sizes = [
+    {
+        "label": "1152 × 1152",
+        "value": 768
+    },
+    {
+        "label": "1536 × 1536",
+        "value": 1024
+    },
+]
+
+correct_levels = [
+    {
+        "value": 1,
+        "label": "L (7%)",
+    },
+    {
+        "value": 0,
+        "label": "M (15%)",
+    },
+    {
+        "value": 3,
+        "label": "Q (25%)",
+    },
+    {
+        "value": 2,
+        "label": "H (30%)",
+    },
+]
+
+
+async def clean_block():
     return gr.update(value='')
 
 
-async def ChangeBlock():
-    global showDetailsBool
-    if not showDetailsBool:
-        showDetailsBool = not showDetailsBool
-        return gr.Button.update(value="Hide Details"), gr.update(visible=True)
-    else:
-        showDetailsBool = not showDetailsBool
-        return gr.Button.update(value="Show Details"), gr.update(visible=False)
-
-
-async def ChangeSeedBlock():
+async def change_seed_block():
     global showSeedBool
     if not showSeedBool:
         showSeedBool = not showSeedBool
@@ -57,37 +92,20 @@ async def greet(my_prompt, control_weight, correct_level, padding_ratio, point_s
     }
 
     full_response: str = ""
-    point_style_out = 0
-    if correct_level == "L(7%)":
-        correct_level_out = 1
-    elif correct_level == "M(15%)":
-        correct_level_out = 0
-    else:
-        if correct_level == "Q(25%)":
-            correct_level_out = 3
-        else:
-            correct_level_out = 2
-    if size == "768*768":
-        width_out, height_out = 768, 768
-    else:
-        width_out, height_out = 1024, 1024
-    if point_style == "Normal":
-        point_style_out = 0
-    elif point_style == "circle":
-        point_style_out = 1
-    else:
-        if point_style == "minimum":
-            point_style_out = 2
+
+    correct_level_value = correct_levels[correct_level]['value']
+    size_value = sizes[size]['value']
+    point_style_value = anchor_styles[point_style]['value']
+
     payload = {
         'url': 'https://qrbtf.com/',
         'prompt': my_prompt,
         'controlnet_weight': control_weight,
-        'correct_level': correct_level_out,
+        'correct_level': correct_level_value,
         'padding_ratio': padding_ratio,
-        'point_style': point_style_out,
+        'point_style': point_style_value,
         'seed': my_seed,
-        'width': width_out,
-        'height': height_out,
+        'size': size_value,
     }
 
     async with aiohttp.ClientSession(headers=headers) as session:
@@ -131,46 +149,38 @@ with gr.Blocks() as demo:
                 value="1girl, flowers, birds",
                 interactive=True
             )
-            showDetails = gr.Button("Show Details")
-            with gr.Column(visible=False) as detailColumn:
-                with gr.Row():
-                    randomSeed = gr.Checkbox(label="Random Seed?", value=True, interactive=True)
-                    promptsTuning = gr.Checkbox(label="Prompts Tuning?", value=True, interactive=True)
-                seed = gr.Textbox(
+            with gr.Accordion("More options", open=False):
+                promptsTuning = gr.Checkbox(label="Prompts tuning", value=True, interactive=True)
+                seed = gr.Slider(
                     label="Seed",
-                    placeholder="Seed",
-                    value="-1",
+                    minimum=-1,
+                    maximum=9999,
+                    step=1,
+                    value=-1,
                     interactive=True,
-                    visible=False
                 )
-                ControlWeight = gr.Slider(0, 2, value=1.5, label="ControlWeight",
-                                          info="Controls the weight of QR_Controlnet", interactive=True)  # 滑动条
+                ControlWeight = gr.Slider(0, 2, value=1.5, label="ControlNet weight",
+                                          info="", interactive=True)  # 滑动条
 
-                marginScale = gr.Slider(0, 0.5, value=0.2, label="Margin Scale",
-                                        info="Controls how far margin is", interactive=True)  # 滑动条
+                marginScale = gr.Slider(0, 0.5, value=0.2, label="Padding ratio",
+                                        info="", interactive=True)  # 滑动条
                 SizeSelection = gr.Dropdown(
-                    ["768*768", "1024*1024"], value="768*768", label="Size", interactive=True)
+                    [size['label'] for size in sizes], value=sizes[0]['label'], label="Size", type="index", interactive=True)
                 errorRate = gr.Dropdown(
-                    ["L(7%)", "M(15%)", "Q(25%)", "H(30%)"], value="H(30%)", label="Error Correction Rate",
+                    [level['label'] for level in correct_levels], value=correct_levels[0]['label'], label="Error correction", type="index",
                     interactive=True)
                 anchorStyle = gr.Dropdown(
-                    ["Normal", "circle", "minimum"], value="Normal", label="AnchorStyle", interactive=True)
-
-            showDetails.click(ChangeBlock, [], [showDetails, detailColumn])
+                    [anchor['label'] for anchor in anchor_styles], value=anchor_styles[0]['label'], label="Anchor style", type="index", interactive=True)
 
         with gr.Column():
             with gr.Row():
-                clear_btn = gr.Button(
-                    "Clear",
-                )
                 btn = gr.Button(
                     "Call API",
                     variant="primary"
                 )
-            out = gr.Image(shape=(1, 1))
+            with gr.Row():
+                out = gr.Image(shape=(1, 1))
 
     btn.click(greet, [prompt, ControlWeight, errorRate, marginScale, anchorStyle, seed, SizeSelection], out)
-    clear_btn.click(CleanBlock, [], prompt)
-    randomSeed.change(ChangeSeedBlock, [], seed)
 
 demo.launch()