Update app.py

app.py

@@ -518,84 +518,41 @@ async def predict(image):
         draw = ImageDraw.Draw(annotated_image)
         font = ImageFont.load_default()
 
-        # dogs_info = ""
-        # buttons_html = ""
-
-        # 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)]
-        #     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])):
-        #             dogs_info += f"<li><strong>{breed}</strong> ({prob} confidence)</li>"
-        #         dogs_info += "</ul>" 
-        #         buttons_html = '<div class="breed-buttons">'  #new
-        #         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 += '</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 += buttons_html 
-
-
         dogs_info = ""
         buttons_html = ""
 
         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
-            # 確保在每次迭代前重設 buttons_html
-            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])):
                     dogs_info += f"<li><strong>{breed}</strong> ({prob} confidence)</li>"
-                dogs_info += "</ul>"
-                
-                # 在每隻狗處理過程中生成按鈕
-                buttons_html += '<div class="breed-buttons">'  
+                dogs_info += "</ul>" 
+                buttons_html = '<div class="breed-buttons">'  #new
                 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 += '</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 += buttons_html  # 確保按鈕區塊附加到該隻狗資訊中
-            dogs_info += '</div>'  # 關閉該隻狗的資訊區塊
-        
-       
+            dogs_info += '</div>'
+
+        dogs_info += buttons_html 
 
         
         html_output = f"""