Update app.py

app.py

@@ -261,8 +261,43 @@ 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('%', ''))
+        #             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)
+        
+        #     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>'    
+
+
+
         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,7 +311,6 @@ 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])):
@@ -284,17 +318,22 @@ async def predict(image):
                     dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>"
                 dogs_info += "</ul>"
         
+                # 生成與品種對應的按鈕
+                buttons_html = ""  # 確保每次生成按鈕前清空
                 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)
-
-                    dogs_info += f'<div class="breed-buttons">{buttons_html}</div>' # new, if not work, delete it
+        
+                # 確保按鈕插入在品種列表內部，而不是最後添加
+                dogs_info += f'<div class="breed-buttons">{buttons_html}</div>'
         
             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>'             
+            dogs_info += '</div>'  # 結束當前狗的資訊區塊
+        
+
              
         buttons_html = ""