v3p6

app.py

@@ -66,11 +66,25 @@ def load_pipeline(model_name):
 def parse_json_parameters(json_str):
     try:
         params = json.loads(json_str)
-        required_keys = ['prompt', 'negative_prompt', 'seed', 'width', 'height', 'guidance_scale', 'num_inference_steps', 'sampler']
+        required_keys = ['prompt', 'negative_prompt', 'resolution', 'guidance_scale', 'num_inference_steps', 'seed', 'sampler']
         for key in required_keys:
             if key not in params:
                 raise ValueError(f"Missing required key: {key}")
-        return params
+        
+        # Parse resolution
+        width, height = map(int, params['resolution'].split(' x '))
+        
+        return {
+            'prompt': params['prompt'],
+            'negative_prompt': params['negative_prompt'],
+            'seed': params['seed'],
+            'width': width,
+            'height': height,
+            'guidance_scale': params['guidance_scale'],
+            'num_inference_steps': params['num_inference_steps'],
+            'sampler': params['sampler'],
+            'use_upscaler': params.get('use_upscaler', False)
+        }
     except json.JSONDecodeError:
         raise ValueError("Invalid JSON format")
     except Exception as e:
@@ -104,6 +118,7 @@ def generate(
             guidance_scale = params['guidance_scale']
             num_inference_steps = params['num_inference_steps']
             sampler = params['sampler']
+            use_upscaler = params['use_upscaler']
         except ValueError as e:
             raise gr.Error(str(e))
 
@@ -200,24 +215,14 @@ generation_history = []
 
 # Function to update the history list
 def update_history_list():
-    html = "<div style='display: flex; flex-wrap: wrap;'>"
-    for idx, item in enumerate(generation_history):
-        html += f"""
-        <div style='margin: 10px; text-align: center;'>
-            <img src='data:image/png;base64,{utils.image_to_base64(item["image"])}' 
-                 style='width: 100px; height: 100px; object-fit: cover;'
-                 onclick='handle_image_click({idx})' />
-            <p style='width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;'>
-                {item["prompt"]}
-            </p>
-        </div>
-        """
-    html += "</div>"
-    return html
+    return [
+        gr.Image.update(value=item["image"], visible=True)
+        for item in generation_history
+    ]
 
 # Function to handle image click in history
-def handle_image_click(idx):
-    selected = generation_history[idx]
+def handle_image_click(evt: gr.SelectData):
+    selected = generation_history[evt.index]
     return selected["image"], json.dumps(selected["metadata"], indent=2)
 
 # Modify the generate function to add results to the history
@@ -232,7 +237,7 @@ def generate_and_update_history(*args, **kwargs):
     })
     if len(generation_history) > 10:  # Limit history to 10 items
         generation_history.pop()
-    return images, metadata, gr.update(visible=True)  # Update to show the accordion
+    return images[0], json.dumps(metadata, indent=2), gr.Gallery.update(value=update_history_list())
 
 if torch.cuda.is_available():
     pipe = load_pipeline(MODEL)
@@ -268,10 +273,8 @@ with gr.Blocks(css="style.css") as demo:
                 variant="primary", 
                 scale=0
             )
-        result = gr.Gallery(
+        result = gr.Image(
             label="Result", 
-            columns=1, 
-            preview=True, 
             show_label=False
         )
     with gr.Accordion(label="Advanced Settings", open=False):
@@ -354,8 +357,8 @@ with gr.Blocks(css="style.css") as demo:
         generate_from_json = gr.Button("Generate from JSON")
 
     # Add history accordion
-    with gr.Accordion("Generation History", visible=False) as history_accordion:
-        history_list = gr.HTML()
+    with gr.Accordion("Generation History", open=False) as history_accordion:
+        history_gallery = gr.Gallery(label="History", show_label=False, elem_id="history_gallery").style(grid=5)
         with gr.Row():
             selected_image = gr.Image(label="Selected Image", interactive=False)
             selected_metadata = gr.JSON(label="Selected Metadata", show_label=False)
@@ -408,10 +411,7 @@ with gr.Blocks(css="style.css") as demo:
     ).then(
         fn=generate_and_update_history,
         inputs=inputs,
-        outputs=[result, gr_metadata, history_accordion],
-    ).then(
-        fn=update_history_list,
-        outputs=history_list
+        outputs=[result, gr_metadata, history_gallery],
     )
 
     negative_prompt.submit(
@@ -423,10 +423,7 @@ with gr.Blocks(css="style.css") as demo:
     ).then(
         fn=generate_and_update_history,
         inputs=inputs,
-        outputs=[result, gr_metadata, history_accordion],
-    ).then(
-        fn=update_history_list,
-        outputs=history_list
+        outputs=[result, gr_metadata, history_gallery],
     )
 
     run_button.click(
@@ -438,23 +435,20 @@ with gr.Blocks(css="style.css") as demo:
     ).then(
         fn=generate_and_update_history,
         inputs=inputs,
-        outputs=[result, gr_metadata, history_accordion],
-    ).then(
-        fn=update_history_list,
-        outputs=history_list
+        outputs=[result, gr_metadata, history_gallery],
     )
 
     # Add event handler for generate_from_json button
     generate_from_json.click(
         fn=generate_and_update_history,
         inputs=inputs,
-        outputs=[result, gr_metadata, history_accordion],
-    ).then(
-        fn=update_history_list,
-        outputs=history_list
+        outputs=[result, gr_metadata, history_gallery],
     )
 
-    # Add JavaScript for handling image clicks (todo)
-    
+    # Add event handler for image selection in history
+    history_gallery.select(
+        fn=handle_image_click,
+        outputs=[selected_image, selected_metadata],
+    )
 
 demo.queue(max_size=20).launch(debug=IS_COLAB, share=IS_COLAB)