Update app.py

app.py

@@ -300,6 +300,7 @@ def _detect_multiple_dogs(image, conf_threshold):
                     dogs.append((cropped_image, confidence, xyxy))
     return dogs
 
+
 async def predict(image):
     if image is None:
         return "Please upload an image to start.", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
@@ -333,7 +334,7 @@ async def predict(image):
                 )
                 return explanation, gr.update(visible=True, value=f"More about {topk_breeds[0]}"), gr.update(visible=True, value=f"More about {topk_breeds[1]}"), gr.update(visible=True, value=f"More about {topk_breeds[2]}")
 
-        # 處理多狗的情況 - 使用 YOLO 偵測並繪製邊框
+        # 多狗情境 - 使用 YOLO 檢測並處理多狗
         color_list = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#00FFFF', '#FF00FF', '#800080', '#FFA500']
         explanations = []
         visible_buttons = []
@@ -341,41 +342,26 @@ async def predict(image):
         draw = ImageDraw.Draw(annotated_image)
         font = ImageFont.load_default()
 
-        # 遍歷每一隻狗，繪製邊框並預測
         for i, (cropped_image, _, 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], box[1]), f"Dog {i+1}", fill=color, font=font)
 
-            # 高置信度返回
             if top1_prob >= 0.5:
                 breed = topk_breeds[0]
                 description = get_dog_description(breed)
                 explanations.append(f"Dog {i+1}:\n{format_description(description, breed)}")
-            elif 0.2 <= top1_prob < 0.5:
-                explanation = f"""
-Dog {i+1}: Detected with moderate confidence. Here are the top 3 possible breeds:
-1. **{topk_breeds[0]}** ({topk_probs_percent[0]})
-2. **{topk_breeds[1]}** ({topk_probs_percent[1]})
-3. **{topk_breeds[2]}** ({topk_probs_percent[2]})
-"""
-                explanations.append(explanation)
-                visible_buttons.extend([f"More about Dog {i+1}: {topk_breeds[0]}", f"More about Dog {i+1}: {topk_breeds[1]}", f"More about Dog {i+1}: {topk_breeds[2]}"])
             else:
                 explanations.append(f"Dog {i+1}: The image is unclear or the breed is not in the dataset.")
 
         final_explanation = "\n\n".join(explanations)
-
         return final_explanation, annotated_image, gr.update(visible=True, choices=visible_buttons), gr.update(visible=False), gr.update(visible=False)
 
     except Exception as e:
         return f"An error occurred: {str(e)}", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
 
 
-
 async def show_details(choice):
     if not choice:
         return "Please select a breed to view details."