Update app.py

app.py

@@ -447,6 +447,8 @@ 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
@@ -466,87 +468,52 @@ async def predict(image):
         dogs_info = ""
 
         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
-            buttons_html = ""  
             top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(cropped_image)
             color = color_list[i % len(color_list)]
             draw.rectangle(box, outline=color, width=3)
             draw.text((box[0] + 5, box[1] + 5), f"Dog {i+1}", fill=color, font=font)
-            
+
             combined_confidence = detection_confidence * top1_prob
             dogs_info += f'<div class="dog-info" style="border-left: 5px solid {color}; margin-bottom: 20px; padding: 15px;">'
             dogs_info += f'<h2>Dog {i+1}</h2>'
-            
+
             if top1_prob >= 0.45:
                 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)"
-                    dogs_info += f'<button style="background-color: #4CAF50; color: white; border: none; padding: 5px 10px; border-radius: 3px; margin-left: 10px;" value="{button_id}" onclick="handle_button_click(\'{button_id}\')">Learn More</button></li>'
-                    buttons.append(button_id)
+                    button_id = f"Dog {i+1}: More about {breed}"
+                    buttons.append(button_id)  # 為每個品種加入按鈕
+                    dogs_info += f'<button value="{button_id}" class="gr-button" style="margin-left: 10px;">Learn More</button></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>'  # 結束當前狗的資訊區塊
-        
-        buttons_html = ""  
-        
+
+            dogs_info += '</div>'
+
         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-buttons {{ margin-top: 10px; }}
-        .breed-button {{ margin-right: 10px; margin-bottom: 10px; padding: 5px 10px; background-color: #4CAF50; color: white; border: none; border-radius: 3px; cursor: pointer; }}
+        .gr-button {{ margin-right: 10px; margin-bottom: 10px; padding: 5px 10px; background-color: #4CAF50; color: white; border: none; border-radius: 3px; cursor: pointer; }}
         </style>
         {dogs_info}
-        """     
-        
-        # 更新 JavaScript 處理按鈕點擊
-        html_output += """
-        <script>
-        function handle_button_click(button_id) {
-            const buttons = document.querySelectorAll('input[type=radio]');
-            buttons.forEach(radio => {
-                if (radio.value === button_id) {
-                    radio.click();
-                }
-            });
-        }
-        </script>
         """
 
-
-
-        if buttons:
-            initial_state = {
-                "dogs_info": dogs_info,
-                "buttons": buttons,
-                "show_back": True,
-                "image": annotated_image,
-                "is_multi_dog": len(dogs) > 1,
-                "html_output": html_output  
-            }
-            return html_output, annotated_image, gr.update(visible=True, choices=buttons), initial_state
-        else:
-            initial_state = {
-                "dogs_info": dogs_info,
-                "buttons": [],
-                "show_back": False,
-                "image": annotated_image,
-                "is_multi_dog": len(dogs) > 1,
-                "html_output": html_output  
-            }
-            return html_output, annotated_image, gr.update(visible=False, choices=[]), initial_state
-
+        initial_state = {
+            "dogs_info": dogs_info,
+            "buttons": buttons,
+            "image": annotated_image
+        }
+        
+        return html_output, annotated_image, gr.update(visible=True, choices=buttons), initial_state
 
     except Exception as e:
         error_msg = f"An error occurred: {str(e)}\n\nTraceback:\n{traceback.format_exc()}"
@@ -571,7 +538,6 @@ def show_details_html(choice, previous_output, initial_state):
         """
         
         initial_state["current_description"] = html_output
-        initial_state["original_buttons"] = initial_state.get("buttons", [])
         
         return html_output, gr.update(visible=True), initial_state
     except Exception as e:
@@ -598,14 +564,14 @@ def format_description_html(description, breed):
 def go_back(state):
     buttons = state.get("buttons", [])
     return (
-        state["html_output"],
+        state["dogs_info"],
         state["image"],
         gr.update(visible=True, choices=buttons),
         gr.update(visible=False),
         state
     )
 
-
+# 主要的 Gradio 介面
 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>")
@@ -650,3 +616,4 @@ with gr.Blocks() as iface:
 
 if __name__ == "__main__":
     iface.launch()
+