Update app.py

app.py

@@ -435,7 +435,6 @@ async def predict(image):
             image = Image.fromarray(image)
 
         dogs = await detect_multiple_dogs(image)
-        # 更柔和的顏色組合
         single_dog_color = '#4A90E2'  # 柔和的藍色
         color_list = ['#4A90E2', '#34C759', '#007AFF', '#5856D6', '#5AC8FA', '#FFB246', '#9C6ADE']
         annotated_image = image.copy()
@@ -449,11 +448,30 @@ async def predict(image):
         dogs_info = ""
 
         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
-            # 單狗時使用柔和的藍色
             color = single_dog_color if len(dogs) == 1 else color_list[i % len(color_list)]
             
-            # ... (標記框和標籤的代碼保持不變) ...
-
+            # 優化圖片上的標記
+            draw.rectangle(box, outline=color, width=4)
+            label = f"Dog {i+1}"
+            label_bbox = draw.textbbox((0, 0), label, font=font)
+            label_width = label_bbox[2] - label_bbox[0]
+            label_height = label_bbox[3] - label_bbox[1]
+            
+            label_x = box[0] + 5
+            label_y = box[1] + 5
+            draw.rectangle(
+                [label_x - 2, label_y - 2, label_x + label_width + 4, label_y + label_height + 4],
+                fill='white',
+                outline=color,
+                width=2
+            )
+            draw.text((label_x, label_y), label, fill=color, font=font)
+        
+            top1_prob, topk_breeds, relative_probs = await predict_single_dog(cropped_image)
+            combined_confidence = detection_confidence * top1_prob
+            
+            dogs_info += f'<div class="dog-info-card" style="border-left: 6px solid {color};">'
+            
             if combined_confidence < 0.15:
                 dogs_info += f'''
                     <div class="dog-info-header" style="background-color: {color}10;">
@@ -512,7 +530,31 @@ async def predict(image):
                     </div>
                 '''
             else:
-                # ... (中等信心度的代碼保持類似，但使用新的樣式) ...
+                dogs_info += f'''
+                    <div class="dog-info-header" style="background-color: {color}10;">
+                        <span class="dog-label" style="color: {color};">Dog {i+1}</span>
+                    </div>
+                    <div class="breed-info">
+                        <div class="model-uncertainty-note">
+                            Note: The model is showing some uncertainty in its predictions. 
+                            Here are the most likely breeds based on the available visual features.
+                        </div>
+                        <h3 class="breeds-title">Top 3 possible breeds:</h3>
+                '''
+                
+                for j, (breed, prob) in enumerate(zip(topk_breeds, relative_probs)):
+                    description = get_dog_description(breed)
+                    dogs_info += f'''
+                        <div class="breed-section">
+                            <div class="confidence-score" style="color: {color};">{breed} (Confidence: {prob})</div>
+                            <div class="breed-info-content">
+                                {format_description_html(description, breed)}
+                            </div>
+                        </div>
+                    '''
+                dogs_info += '</div>'
+            
+            dogs_info += '</div>'
 
         html_output = f"""
         <style>