Update app.py

app.py

@@ -308,10 +308,10 @@ async def predict(image):
         if isinstance(image, np.ndarray):
             image = Image.fromarray(image)
 
-        # 確認只有在多狗的情況下才會執行 YOLO 偵測邏輯
-        dogs = await detect_multiple_dogs(image)  # 多狗偵測
+        # 嘗試檢測多隻狗
+        dogs = await detect_multiple_dogs(image)  # 使用 YOLO 檢測多狗
         if len(dogs) == 0:
-            # 單狗情境
+            # 單狗情境 - 不使用 YOLO，直接進行單狗預測
             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)
@@ -333,7 +333,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,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)
 
@@ -350,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)
@@ -372,10 +372,10 @@ Dog {i+1}: Detected with moderate confidence. Here are the top 3 possible breeds
         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."