Update app.py

app.py

@@ -620,36 +620,37 @@ async def predict(image):
         dogs = await detect_multiple_dogs(image)
         
         color_list = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#00FFFF', '#FF00FF', '#800080', '#FFA500']
+        
         dogs_info = ""
-        buttons = []
-        annotated_image = image.copy()
-        draw = ImageDraw.Draw(annotated_image)
-        font = ImageFont.load_default()
-
+        all_breeds = set()  # 使用集合來避免重複
+    
         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; border: 1px solid #ddd; border-radius: 5px;">'
-            dogs_info += f'<h2 style="background-color: #f0f0f0; padding: 10px; margin: -15px -15px 15px -15px; border-radius: 5px 5px 0 0;">Dog {i+1}</h2>'
-
+            dogs_info += f'''
+            <div class="dog-info" style="border-left: 5px solid {color}; margin-bottom: 20px; padding: 15px; border: 1px solid #ddd; border-radius: 5px;">
+                <h2 style="background-color: #f0f0f0; padding: 10px; margin: -15px -15px 15px -15px; border-radius: 5px 5px 0 0;">Dog {i+1}</h2>
+            '''
+    
             if top1_prob >= 0.45:
                 breed = topk_breeds[0]
+                all_breeds.add(breed)
                 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>"
+                dogs_info += "<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>"
+                    all_breeds.add(breed)
                 dogs_info += "</ul>"
                 dogs_info += '<div class="breed-buttons">'
                 for breed in topk_breeds[:3]:
                     button_id = f"Dog {i+1}: More about {breed}"
                     dogs_info += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
-                    buttons.append(button_id)
                 dogs_info += '</div>'
             else:
                 dogs_info += "<p>The image is unclear or the breed is not in the dataset. Please upload a clearer image.</p>"