Update app.py

app.py

@@ -289,7 +289,7 @@ async def detect_multiple_dogs(image):
         img = image.copy()
         img.thumbnail((640, 640))
         
-        results = model_yolo(img, conf=0.2)  # 降低閾值以檢測更多狗
+        results = model_yolo(img, conf=0.1)  # 降低閾值以檢測更多狗
         dogs = []
         for result in results:
             for box in result.boxes:
@@ -342,7 +342,7 @@ async def predict(image):
 async def process_multiple_dogs_result(dogs, image):
     annotated_image = image.copy()
     draw = ImageDraw.Draw(annotated_image)
-    font = ImageFont.load_default()
+    font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf", 20)
     
     explanations = []
     buttons = []
@@ -352,24 +352,22 @@ async def process_multiple_dogs_result(dogs, image):
         
         optimized_box = optimize_box(box, image.size)
         draw.rectangle(optimized_box, outline="red", width=3)
-        draw.text((optimized_box[0], optimized_box[1]), f"Dog {i}", fill="yellow", font=font)
+        draw.text((optimized_box[0], optimized_box[1]), f"Dog {i}", fill="yellow", font=font, stroke_width=2, stroke_fill="black")
         
-        if top1_prob >= 0.5:
+        if top1_prob >= 0.2:
             breed = topk_breeds[0]
             description = get_dog_description(breed)
-            explanations.append(f"Dog {i}: **{breed}**\n\n{format_description(description, breed, is_multi_dog=True, dog_number=i)}")
-        elif top1_prob >= 0.2:
-            explanation = f"""
-Dog {i}: The model couldn't confidently identify the breed. 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]})
-"""
+            explanation = f"Dog {i}: **{breed}**\n\n"
+            explanation += "\n".join([f"**{key}**: {value}" for key, value in description.items() if key != "Breed"])
+            explanation += f"\n\n**Want to learn more about dog breeds?** [Visit the AKC dog breeds page]({get_akc_breeds_link()}) and search for {breed} to find detailed information."
             explanations.append(explanation)
-            for breed in topk_breeds:
+            
+            if top1_prob < 0.5:
                 buttons.append(f"More about Dog {i}: {breed}")
+                buttons.append(f"More about Dog {i}: {topk_breeds[1]}")
+                buttons.append(f"More about Dog {i}: {topk_breeds[2]}")
         else:
-            explanations.append(f"Dog {i}: The image is unclear or the breed is not in the dataset. Please upload a clearer image of a dog.")
+            explanations.append(f"Dog {i}: The image is unclear or the breed is not in the dataset. Please upload a clearer image of this dog.")
 
     final_explanation = "\n\n---\n\n".join(explanations)