Update app.py

app.py

@@ -453,7 +453,7 @@ async def process_single_dog(image):
 
 async def predict(image):
     if image is None:
-        return "Please upload an image to start.", None, gr.update(visible=False, choices=[]), None
+        return "Please upload an image to start.", None, gr.update(visible=False), gr.update(visible=False)
 
     try:
         if isinstance(image, np.ndarray):
@@ -467,9 +467,8 @@ async def predict(image):
         font = ImageFont.load_default()
 
         dogs_info = ""
-        buttons = []  # 儲存唯一的按鈕 ID
+        buttons = []
 
-        # 在每個品種旁邊生成按鈕
         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
             top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(cropped_image)
             color = color_list[i % len(color_list)]
@@ -484,70 +483,38 @@ async def predict(image):
                 breed = topk_breeds[0]
                 description = get_dog_description(breed)
                 dogs_info += format_description_html(description, breed)
-        
             elif combined_confidence >= 0.15:
                 dogs_info += f"<p>Top 3 possible breeds:</p><ul>"
                 for j, (breed, prob) in enumerate(zip(topk_breeds[:3], topk_probs_percent[:3])):
                     prob = float(prob.replace('%', ''))
                     button_id = f"Dog {i+1}: More about {breed}"
-                    dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)"
-                    # 將 Learn More 按鈕改為按鈕邏輯
-                    dogs_info += f'<button class="breed-button" style="background-color: #4CAF50; color: white; padding: 5px 10px; border-radius: 3px; margin-left: 10px;" onclick="document.querySelector(\'input[value=\'{button_id}\']\').click()">Learn More</button></li>'
+                    buttons.append(button_id)
+                    dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>"
                 dogs_info += "</ul>"
-        
             else:
                 dogs_info += "<p>The image is unclear or the breed is not in the dataset. Please upload a clearer image.</p>"
         
             dogs_info += '</div>'
-        
-        # 在生成後附加 JavaScript 處理按鈕點擊事件
-        # 生成 JavaScript 處理按鈕點擊事件
+
         html_output = f"""
         <style>
         .dog-info {{ border: 1px solid #ddd; margin-bottom: 20px; padding: 15px; border-radius: 5px; box-shadow: 0 2px 5px rgba(0,0,0,0.1); }}
         .dog-info h2 {{ background-color: #f0f0f0; padding: 10px; margin: -15px -15px 15px -15px; border-radius: 5px 5px 0 0; }}
-        .breed-button {{ background-color: #4CAF50; color: white; padding: 5px 10px; border-radius: 3px; border: none; cursor: pointer; margin-left: 10px; }}
-        .breed-button:hover {{ background-color: #45a049; }}
         </style>
         
         {dogs_info}
-        
-        <script>
-        document.querySelectorAll('button[id^="Dog"]').forEach(button => {{
-            console.log('Attaching event to button: ' + button.id);  
-            button.addEventListener('click', () => {{
-                const button_id = button.id;
-                console.log('Button clicked: ' + button_id);  
-                const radio = document.querySelector('input[type=radio][value="' + button_id + '"]');
-                if (radio) {{
-                    radio.click();
-                    console.log('Radio button clicked for: ' + button_id);  
-                }} else {{
-                    console.error("Radio button not found for: ' + button_id);  
-                }}
-            }});
-        }});
-        </script>
         """
 
-
-        initial_state = {
-            "dogs_info": dogs_info,
-            "buttons": buttons,
-            "image": annotated_image
-        }
-        
-        return html_output, annotated_image, gr.update(visible=True, choices=buttons), initial_state
+        return html_output, annotated_image, gr.update(visible=True, choices=buttons), gr.update(visible=False)
 
     except Exception as e:
         error_msg = f"An error occurred: {str(e)}\n\nTraceback:\n{traceback.format_exc()}"
         print(error_msg)
-        return error_msg, None, gr.update(visible=False, choices=[]), None
-
+        return error_msg, None, gr.update(visible=False), gr.update(visible=False)
 
-def show_details_html(choice, previous_output, initial_state):
+def show_breed_info(choice):
     if not choice:
-        return previous_output, gr.update(visible=True), initial_state
+        return "", gr.update(visible=False)
 
     try:
         breed = choice.split("More about ")[-1]
@@ -561,41 +528,13 @@ def show_details_html(choice, previous_output, initial_state):
         </div>
         """
         
-        initial_state["current_description"] = html_output
-        
-        return html_output, gr.update(visible=True), initial_state
+        return html_output, gr.update(visible=True)
     except Exception as e:
         error_msg = f"An error occurred while showing details: {e}"
         print(error_msg)
-        return f"<p style='color: red;'>{error_msg}</p>", gr.update(visible=True), initial_state
-
+        return f"<p style='color: red;'>{error_msg}</p>", gr.update(visible=True)
 
-def format_description_html(description, breed):
-    html = "<ul style='list-style-type: none; padding-left: 0;'>"
-    if isinstance(description, dict):
-        for key, value in description.items():
-            html += f"<li style='margin-bottom: 10px;'><strong>{key}:</strong> {value}</li>"
-    elif isinstance(description, str):
-        html += f"<li>{description}</li>"
-    else:
-        html += f"<li>No description available for {breed}</li>"
-    html += "</ul>"
-    akc_link = get_akc_breeds_link()
-    html += f'<p><a href="{akc_link}" target="_blank">Learn more about {breed} on the AKC website</a></p>'
-    return html
-
-
-def go_back(state):
-    buttons = state.get("buttons", [])
-    return (
-        state["dogs_info"],
-        state["image"],
-        gr.update(visible=True, choices=buttons),
-        gr.update(visible=False),
-        state
-    )
-
-# 主要的 Gradio 介面
+# Main Gradio interface
 with gr.Blocks() as iface:
     gr.HTML("<h1 style='text-align: center;'>🐶 Dog Breed Classifier 🔍</h1>")
     gr.HTML("<p style='text-align: center;'>Upload a picture of a dog, and the model will predict its breed, provide detailed information, and include an extra information link!</p>")
@@ -604,30 +543,29 @@ with gr.Blocks() as iface:
         input_image = gr.Image(label="Upload a dog image", type="pil")
         output_image = gr.Image(label="Annotated Image")
     
-    output = gr.HTML(label="Prediction Results")  
+    output = gr.HTML(label="Prediction Results")
+    breed_info = gr.HTML(label="Breed Information")
     
     breed_buttons = gr.Radio(choices=[], label="More Information", visible=False)
     
-    back_button = gr.Button("Back", visible=False)
-    
-    initial_state = gr.State()
+    back_button = gr.Button("Back to Results", visible=False)
     
     input_image.change(
         predict,
-        inputs=input_image,
-        outputs=[output, output_image, breed_buttons, initial_state]
+        inputs=[input_image],
+        outputs=[output, output_image, breed_buttons, back_button]
     )
 
     breed_buttons.change(
-        show_details_html,
-        inputs=[breed_buttons, output, initial_state],
-        outputs=[output, back_button, initial_state]
+        show_breed_info,
+        inputs=[breed_buttons],
+        outputs=[breed_info, back_button]
     )
 
     back_button.click(
-        go_back,
-        inputs=[initial_state],
-        outputs=[output, output_image, breed_buttons, back_button, initial_state]
+        lambda: (gr.update(visible=True), gr.update(visible=True), gr.update(visible=True), 
+                 gr.update(visible=False), gr.update(visible=False)),
+        outputs=[output, output_image, breed_buttons, breed_info, back_button]
     )
     
     gr.Examples(