Update app.py

app.py

@@ -266,40 +266,86 @@ async def predict(image):
         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>"
+        #             prob = float(prob.replace('%', '')) # new
+        #             dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>" # new
+        #         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 
+
+        
         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:
+                # 當信心 >= 0.45 顯示單一品種
                 breed = topk_breeds[0]
                 description = get_dog_description(breed)
                 dogs_info += format_description_html(description, breed)
-
+        
             elif combined_confidence >= 0.15:
+                # 顯示 top3 品種
                 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>"
-                    prob = float(prob.replace('%', '')) # new
-                    dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>" # new
-                dogs_info += "</ul>" 
-                buttons_html = '<div class="breed-buttons">'  #new
+                    prob = float(prob.replace('%', ''))  # 去掉百分比符號並轉為浮點數
+                    dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>"
+                dogs_info += "</ul>"
+        
+                # 單獨生成按鈕邏輯
+                temp_buttons = '<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>'
+                    temp_buttons += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
                     buttons.append(button_id)
-                buttons_html += '</div>' 
+                temp_buttons += '</div>'
+                
+                # 將 buttons_html 只生成按鈕
+                buttons_html += temp_buttons  
+        
             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>'  # 結束該狗的描述區塊
+        
+        # 確保按鈕獨立於 dogs_info 區塊內，避免重複品種名
+        if buttons_html:  
+            dogs_info += buttons_html  # 確��按鈕獨立並附加到最後輸出
 
-        dogs_info += buttons_html 
 
          
         # 避免將按鈕與 dogs_info 同步顯示