Update app.py

app.py

@@ -518,57 +518,83 @@ async def predict(image):
         draw = ImageDraw.Draw(annotated_image)
         font = ImageFont.load_default()
 
-        dogs_info = ""
-        buttons_html = ""
+        # 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};">'
+        #     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">' 
+        #         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 = ""
+        all_breeds = []  # 用於收集所有的品種
+    
         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};">'
-            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>'
-
+            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>'
+    
             if top1_prob >= 0.45:
                 breed = topk_breeds[0]
+                all_breeds.append(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>"
                 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.append(breed)  # 添加到所有品種列表
                 dogs_info += "</ul>"
-                #buttons_html += '<div class="breed-buttons">' 原本有
-                dogs_info += '<div class="breed-buttons">' # new
+                dogs_info += '<div class="breed-buttons">'
                 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>'
+                    dogs_info += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
                     buttons.append(button_id)
-                #buttons_html += '</div>' 原本有
-                dogs_info += '</div>' # new
-            
-  
+                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>"
             
             dogs_info += '</div>'
-
-        #dogs_info += 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}
-        # """
+        
         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); }}