Update app.py

app.py

@@ -308,11 +308,10 @@ async def predict(image):
         if isinstance(image, np.ndarray):
             image = Image.fromarray(image)
 
-        # 偵測圖片中的多個狗
-        dogs = await detect_multiple_dogs(image)
-
-        # 處理單一狗情況 (如果 YOLO 沒有檢測到多隻狗)
+        # 確認只有在多狗的情況下才會執行 YOLO 偵測邏輯
+        dogs = await detect_multiple_dogs(image)  # 多狗偵測
         if len(dogs) == 0:
+            # 單狗情境
             top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(image)
             if top1_prob < 0.2:
                 return "The image is unclear or the breed is not in the dataset. Please upload a clearer image of a dog.", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
@@ -321,7 +320,7 @@ async def predict(image):
             description = get_dog_description(breed)
             formatted_description = format_description(description, breed)
 
-            # 處理高置信度與低置信度情況
+            # 如果置信度高於 0.5，返回結果
             if top1_prob >= 0.5:
                 return formatted_description, image, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
             else:
@@ -332,9 +331,9 @@ async def predict(image):
                     f"3. **{topk_breeds[2]}** ({topk_probs_percent[2]} confidence)\n\n"
                     "Click on a button to view more information about the breed."
                 )
-                return explanation, image, 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]}")
+                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 檢測邏輯處理
         color_list = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#00FFFF', '#FF00FF', '#800080', '#FFA500']
         explanations = []
         visible_buttons = []
@@ -342,7 +341,7 @@ 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)
 
@@ -351,7 +350,7 @@ async def predict(image):
             draw.rectangle(box, outline=color, width=3)
             draw.text((box[0], box[1]), f"Dog {i+1}", fill=color, font=font)
 
-            # 高置信度返回
+            # 如果置信度高於 0.5
             if top1_prob >= 0.5:
                 breed = topk_breeds[0]
                 description = get_dog_description(breed)
@@ -364,18 +363,18 @@ Dog {i+1}: Detected with moderate confidence. Here are the top 3 possible breeds
 3. **{topk_breeds[2]}** ({topk_probs_percent[2]})
 """
                 explanations.append(explanation)
-                visible_buttons.extend([gr.update(visible=True, value=f"More about Dog {i+1}: {topk_breeds[0]}"), 
-                                        gr.update(visible=True, value=f"More about Dog {i+1}: {topk_breeds[1]}"), 
-                                        gr.update(visible=True, value=f"More about Dog {i+1}: {topk_breeds[2]}")])
+                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)
+        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: {e}", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+        # 更具體的錯誤訊息
+        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: