Update app.py

app.py

@@ -502,6 +502,7 @@ async def process_single_dog(image):
 #         return error_msg, None, gr.update(visible=False, choices=[]), None
 
 
+
 # async def predict(image):
 #     if image is None:
 #         return "Please upload an image to start.", None, gr.update(visible=False, choices=[]), None
@@ -526,6 +527,10 @@ async def process_single_dog(image):
 #         draw = ImageDraw.Draw(annotated_image)
 #         font = ImageFont.load_default()
 
+#         # 修改: 新增變數來分開存儲狗狗信息和按鈕信息
+#         dogs_info = ""
+#         buttons_html = ""
+
 #         for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
 #             top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(cropped_image)
 #             color = color_list[i % len(color_list)]
@@ -533,30 +538,35 @@ async def process_single_dog(image):
 #             draw.text((box[0] + 5, box[1] + 5), f"Dog {i+1}", fill=color, font=font)
 
 #             combined_confidence = detection_confidence * top1_prob
-#             html_output += f'<div class="dog-info" style="border-left: 5px solid {color};">'
-#             html_output += f'<h2>Dog {i+1}</h2>'
+#             # 修改: 使用 dogs_info 而不是 html_output
+#             dogs_info += f'<div class="dog-info" style="border-left: 5px solid {color};">'
+#             dogs_info += f'<h2>Dog {i+1}</h2>'
 
 #             if top1_prob >= 0.45:
 #                 breed = topk_breeds[0]
 #                 description = get_dog_description(breed)
-#                 html_output += format_description_html(description, breed)
+#                 dogs_info += format_description_html(description, breed)
 
 #             elif combined_confidence >= 0.15:
-#                 html_output += f"<p>Top 3 possible breeds:</p><ul>"
+#                 dogs_info += f"<p>Top 3 possible breeds:</p><ul>"
 #                 for j, (breed, prob) in enumerate(zip(topk_breeds[:3], topk_probs_percent[:3])):
-#                     html_output += f"<li><strong>{breed}</strong> ({prob} confidence)</li>"
-#                 html_output += "</ul>"
-#                 html_output += '<div class="breed-buttons">'
+#                     dogs_info += f"<li><strong>{breed}</strong> ({prob} confidence)</li>"
+#                 dogs_info += "</ul>"
+#                 # 修改: 將按鈕信息添加到 buttons_html
+#                 buttons_html += '<div class="breed-buttons">'
 #                 for breed in topk_breeds[:3]:
 #                     button_id = f"Dog {i+1}: More about {breed}"
-#                     html_output += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
+#                     buttons_html += f'<button class="breed-button" onclick="handle_button_click(\'{button_id}\')">{breed}</button>'
 #                     buttons.append(button_id)
-#                 html_output += '</div>'
+#                 buttons_html += '</div>'
   
 #             else:
-#                 html_output += "<p>The image is unclear or the breed is not in the dataset. Please upload a clearer image.</p>"
+#                 dogs_info += "<p>The image is unclear or the breed is not in the dataset. Please upload a clearer image.</p>"
             
-#             html_output += '</div>'
+#             dogs_info += '</div>'
+
+#         # 修改: 合併 dogs_info 和 buttons_html
+#         html_output += dogs_info + buttons_html
 
 #         if buttons:
 #             html_output += """
@@ -571,24 +581,26 @@ async def process_single_dog(image):
 #             }
 #             </script>
 #             """
+#             # 修改: 更新 initial_state 的內容
 #             initial_state = {
 #                 "explanation": html_output,
 #                 "buttons": buttons,
 #                 "show_back": True,
 #                 "image": annotated_image,
 #                 "is_multi_dog": len(dogs) > 1,
-#                 "dogs_info": html_output,
-#                 "original_html": html_output  # 新增這行
+#                 "dogs_info": dogs_info,  # 修改: 只存儲狗狗信息，不包括按鈕
+#                 "original_html": html_output  # 保留完整的 HTML 輸出
 #             }
 #             return html_output, annotated_image, gr.update(visible=True, choices=buttons), initial_state
 #         else:
+#             # 修改: 更新 initial_state 的內容
 #             initial_state = {
 #                 "explanation": html_output,
 #                 "buttons": [],
 #                 "show_back": False,
 #                 "image": annotated_image,
 #                 "is_multi_dog": len(dogs) > 1,
-#                 "dogs_info": html_output
+#                 "dogs_info": dogs_info  # 修改: 只存儲狗狗信息，不包括按鈕
 #             }
 #             return html_output, annotated_image, gr.update(visible=False, choices=[]), initial_state
 
@@ -597,7 +609,6 @@ async def process_single_dog(image):
 #         print(error_msg)
 #         return error_msg, None, gr.update(visible=False, choices=[]), None
 
-
 async def predict(image):
     if image is None:
         return "Please upload an image to start.", None, gr.update(visible=False, choices=[]), None
@@ -609,20 +620,11 @@ async def predict(image):
         dogs = await detect_multiple_dogs(image)
         
         color_list = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#00FFFF', '#FF00FF', '#800080', '#FFA500']
-        html_output = """
-        <style>
-        .dog-info { border: 1px solid #ddd; margin-bottom: 20px; padding: 15px; border-radius: 5px; box-shadow: 0 2px 5px rgba(0,0,0,0.1); }
-        .dog-info h2 { background-color: #f0f0f0; padding: 10px; margin: -15px -15px 15px -15px; border-radius: 5px 5px 0 0; }
-        .breed-buttons { margin-top: 10px; }
-        .breed-button { margin-right: 10px; margin-bottom: 10px; padding: 5px 10px; background-color: #4CAF50; color: white; border: none; border-radius: 3px; cursor: pointer; }
-        </style>
-        """
         buttons = []
         annotated_image = image.copy()
         draw = ImageDraw.Draw(annotated_image)
         font = ImageFont.load_default()
 
-        # 修改: 新增變數來分開存儲狗狗信息和按鈕信息
         dogs_info = ""
         buttons_html = ""
 
@@ -633,7 +635,6 @@ async def predict(image):
             draw.text((box[0] + 5, box[1] + 5), f"Dog {i+1}", fill=color, font=font)
 
             combined_confidence = detection_confidence * top1_prob
-            # 修改: 使用 dogs_info 而不是 html_output
             dogs_info += f'<div class="dog-info" style="border-left: 5px solid {color};">'
             dogs_info += f'<h2>Dog {i+1}</h2>'
 
@@ -647,7 +648,6 @@ async def predict(image):
                 for j, (breed, prob) in enumerate(zip(topk_breeds[:3], topk_probs_percent[:3])):
                     dogs_info += f"<li><strong>{breed}</strong> ({prob} confidence)</li>"
                 dogs_info += "</ul>"
-                # 修改: 將按鈕信息添加到 buttons_html
                 buttons_html += '<div class="breed-buttons">'
                 for breed in topk_breeds[:3]:
                     button_id = f"Dog {i+1}: More about {breed}"
@@ -660,8 +660,17 @@ async def predict(image):
             
             dogs_info += '</div>'
 
-        # 修改: 合併 dogs_info 和 buttons_html
-        html_output += dogs_info + buttons_html
+        dogs_info += buttons_html
+
+        html_output = f"""
+        <style>
+        .dog-info {{ border: 1px solid #ddd; margin-bottom: 20px; padding: 15px; border-radius: 5px; box-shadow: 0 2px 5px rgba(0,0,0,0.1); }}
+        .dog-info h2 {{ background-color: #f0f0f0; padding: 10px; margin: -15px -15px 15px -15px; border-radius: 5px 5px 0 0; }}
+        .breed-buttons {{ margin-top: 10px; }}
+        .breed-button {{ margin-right: 10px; margin-bottom: 10px; padding: 5px 10px; background-color: #4CAF50; color: white; border: none; border-radius: 3px; cursor: pointer; }}
+        </style>
+        {dogs_info}
+        """
 
         if buttons:
             html_output += """
@@ -676,26 +685,23 @@ async def predict(image):
             }
             </script>
             """
-            # 修改: 更新 initial_state 的內容
             initial_state = {
-                "explanation": html_output,
+                "dogs_info": dogs_info,
                 "buttons": buttons,
                 "show_back": True,
                 "image": annotated_image,
                 "is_multi_dog": len(dogs) > 1,
-                "dogs_info": dogs_info,  # 修改: 只存儲狗狗信息，不包括按鈕
-                "original_html": html_output  # 保留完整的 HTML 輸出
+                "html_output": html_output  # 儲存完整的 HTML 輸出
             }
             return html_output, annotated_image, gr.update(visible=True, choices=buttons), initial_state
         else:
-            # 修改: 更新 initial_state 的內容
             initial_state = {
-                "explanation": html_output,
+                "dogs_info": dogs_info,
                 "buttons": [],
                 "show_back": False,
                 "image": annotated_image,
                 "is_multi_dog": len(dogs) > 1,
-                "dogs_info": dogs_info  # 修改: 只存儲狗狗信息，不包括按鈕
+                "html_output": html_output  # 儲存完整的 HTML 輸出
             }
             return html_output, annotated_image, gr.update(visible=False, choices=[]), initial_state
 
@@ -750,8 +756,8 @@ def format_description_html(description, breed):
 def go_back(state):
     buttons = state.get("buttons", [])
     return (
-        state["dogs_info"],  # 這裡應該是完整的 HTML 內容
-        #state["original_html"],
+        state["html_output"],
+        #state["dogs_info"],  # 這裡應該是完整的 HTML 內容
         state["image"],
         gr.update(visible=True, choices=buttons),
         gr.update(visible=False),