Update app.py

app.py

@@ -243,26 +243,74 @@ async def process_single_dog(image):
         return explanation, image, buttons[0], buttons[1], buttons[2], gr.update(visible=True), initial_state
 
 
-async def predict(image):
-    if image is None:
-        return "Please upload an image to start.", None, gr.update(visible=False, choices=[]), None
+# async def predict(image):
+#     if image is None:
+#         return "Please upload an image to start.", None, gr.update(visible=False, choices=[]), None
 
-    try:
-        if isinstance(image, np.ndarray):
-            image = Image.fromarray(image)
+#     try:
+#         if isinstance(image, np.ndarray):
+#             image = Image.fromarray(image)
 
-        dogs = await detect_multiple_dogs(image)
+#         dogs = await detect_multiple_dogs(image)
+        
+#         color_list = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#00FFFF', '#FF00FF', '#800080', '#FFA500']
+#         buttons = []
+#         annotated_image = image.copy()
+#         draw = ImageDraw.Draw(annotated_image)
+#         font = ImageFont.load_default()
+
+#         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('%', ''))
+#                     dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>"
+#                 dogs_info += "</ul>"
         
-        color_list = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#00FFFF', '#FF00FF', '#800080', '#FFA500']
-        buttons = []
-        annotated_image = image.copy()
-        draw = ImageDraw.Draw(annotated_image)
-        font = ImageFont.load_default()
+#                 for breed in topk_breeds[:3]:
+#                     button_id = f"Dog {i+1}: More about {breed}"
+#                     buttons_html += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
+#                     buttons.append(button_id)
+        
+#             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 = ""  
+      
+#         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; }}
+#         </style>
+#         {dogs_info}
+#         """
+
 
-        dogs_info = ""
 
         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
-            buttons_html = ""  
+            buttons_html = ""  # 每次迴圈重置按鈕 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)
@@ -276,36 +324,39 @@ async def predict(image):
                 breed = topk_breeds[0]
                 description = get_dog_description(breed)
                 dogs_info += format_description_html(description, breed)
+                
+                # 在品種描述後加入按鈕
+                button_id = f"Dog {i+1}: More about {breed}"
+                buttons_html += f'<button style="display:block; margin-top:10px;" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
+                dogs_info += buttons_html
         
             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('%', ''))
                     dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>"
-                dogs_info += "</ul>"
         
-                for breed in topk_breeds[:3]:
+                    # 為每個品種插入按鈕
                     button_id = f"Dog {i+1}: More about {breed}"
-                    buttons_html += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
-                    buttons.append(button_id)
+                    buttons_html += f'<button style="display:block; margin-top:10px;" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
+                
+                dogs_info += "</ul>"
+                # 在每個品種描述後插入按鈕
+                dogs_info += buttons_html  # 現在這段是直接放在每個品種的描述之後
         
             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; }}
-        </style>
-        {dogs_info}
+            <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); }}
+            </style>
+            {dogs_info}
         """
+
         
 
         if buttons: