Update app.py

app.py

@@ -243,188 +243,6 @@ async def process_single_dog(image):
         return breeds_info, image, initial_state
         
 
-# async def predict(image):
-#     if image is None:
-#         return "Please upload an image to start.", None, None
-
-#     try:
-#         if isinstance(image, np.ndarray):
-#             image = Image.fromarray(image)
-
-#         dogs = await detect_multiple_dogs(image)
-#         color_list = ['#FF3B30', '#34C759', '#007AFF', '#FF9500', '#5856D6', '#FF2D55', '#5AC8FA', '#FFCC00']
-#         annotated_image = image.copy()
-#         draw = ImageDraw.Draw(annotated_image)
-        
-#         try:
-#             font = ImageFont.truetype("arial.ttf", 24)
-#         except:
-#             font = ImageFont.load_default()
-
-#         dogs_info = ""
-
-
-#         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
-#             color = 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}20;">
-#                         <span class="dog-label" style="color: {color};">Dog {i+1}</span>
-#                     </div>
-#                     <div class="breed-info">
-#                         <p class="warning-message">The image is unclear or the breed is not in the dataset. Please upload a clearer image.</p>
-#                     </div>
-#                 '''
-#             elif top1_prob >= 0.45:
-#                 breed = topk_breeds[0]
-#                 description = get_dog_description(breed)
-#                 dogs_info += f'''
-#                     <div class="dog-info-header" style="background-color: {color}20;">
-#                         <span class="dog-label" style="color: {color};">{breed}</span>
-#                     </div>
-#                     <div class="breed-info">
-#                         {format_description_html(description, breed)}
-#                     </div>
-#                 '''
-#             else:
-#                 dogs_info += f'''
-#                     <div class="dog-info-header" style="background-color: {color}20;">
-#                         <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>
-#         .dog-info-card {{ 
-#             border: 1px solid #ddd; 
-#             margin-bottom: 24px; 
-#             padding: 0; 
-#             border-radius: 8px; 
-#             box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-#             overflow: hidden;
-#             transition: all 0.3s ease;
-#         }}
-        
-#         .dog-info-card:hover {{
-#             box-shadow: 0 4px 12px rgba(0,0,0,0.15);
-#         }}
-        
-#         .dog-info-header {{ 
-#             padding: 16px 20px;
-#             margin: 0;
-#             font-size: 20px;
-#             font-weight: bold;
-#         }}
-        
-#         .dog-label {{
-#             font-size: 18px;
-#             font-weight: bold;
-#         }}
-        
-#         .breed-info {{
-#             padding: 20px;
-#         }}
-        
-#         .breeds-title {{
-#             margin: 0 0 16px 0;
-#             font-size: 18px;
-#             color: #333;
-#         }}
-        
-#         .breed-section {{
-#             margin: 16px 0;
-#             padding: 16px;
-#             background-color: #f8f8f8;
-#             border-radius: 6px;
-#         }}
-        
-#         .confidence-score {{
-#             font-size: 18px;
-#             font-weight: bold;
-#             margin-bottom: 12px;
-#         }}
-        
-#         .breed-info-content {{
-#             margin-top: 8px;
-#         }}
-        
-#         .warning-message {{
-#             color: #ff3b30;
-#             font-weight: bold;
-#             margin: 0;
-#         }}
-
-#         ul {{
-#             padding-left: 0;
-#             margin: 0;
-#         }}
-        
-#         li {{
-#             margin-bottom: 8px;
-#         }}
-#         </style>
-#         {dogs_info}
-#         """
-
-#         initial_state = {
-#             "dogs_info": dogs_info,
-#             "image": annotated_image,
-#             "is_multi_dog": len(dogs) > 1,
-#             "html_output": html_output
-#         }
-        
-#         return html_output, annotated_image, initial_state
-
-#     except Exception as e:
-#         error_msg = f"An error occurred: {str(e)}\n\nTraceback:\n{traceback.format_exc()}"
-#         print(error_msg)
-#         return error_msg, None, None
-
-
 
 async def predict(image):
     if image is None:
@@ -437,7 +255,18 @@ async def predict(image):
         dogs = await detect_multiple_dogs(image)
         # 更新顏色組合
         single_dog_color = '#34C759'  # 清爽的綠色作為單狗顏色
-        color_list = ['#007AFF', '#FF9500', '#5856D6', '#34C759', '#5AC8FA', '#FF3B30', '#9C6ADE']  # 保留藍色但改用不同色調
+        color_list = [
+        '#FF5733',  # 珊瑚紅
+        '#33FF57',  # 薄荷綠
+        '#3357FF',  # 寶藍色
+        '#FF33F5',  # 粉紫色
+        '#FFB733',  # 橙黃色
+        '#33FFF5',  # 青藍色
+        '#A233FF',  # 紫色
+        '#FF3333',  # 紅色
+        '#33FFB7',  # 青綠色
+        '#FFE033'   # 金黃色 
+        ]
         annotated_image = image.copy()
         draw = ImageDraw.Draw(annotated_image)
 
@@ -704,7 +533,7 @@ async def predict(image):
             display: inline-flex;
             align-items: center;
             padding: 12px 24px;
-            background-color: #4A90E2;
+            background-color: #357ABD; 
             color: white;
             border-radius: 8px;
             text-decoration: none;
@@ -714,7 +543,7 @@ async def predict(image):
         }}
         
         .akc-button:hover {{
-            background-color: #357ABD;
+            background-color: #2C6AA0;
             transform: translateY(-1px);
             color: white;
         }}
@@ -805,7 +634,7 @@ async def predict(image):
         }}
 
         .akc-link {{
-            color: #4A90E2;
+            color: #357ABD;
             text-decoration: none;
             font-weight: 500;
             transition: all 0.3s ease;
@@ -813,7 +642,7 @@ async def predict(image):
         
         .akc-link:hover {{
             text-decoration: underline;
-            color: #357ABD;
+            color: #2C6AA0;
         }}
         </style>
         {dogs_info}