Update app.py

app.py

@@ -300,68 +300,60 @@ async def detect_multiple_dogs(image):
         print(f"Error in detect_multiple_dogs: {e}")
         return []
 
-async def predict(image):
+def predict(image):
     if image is None:
-        return "Please upload an image to start.", None, [], []
+        return "Please upload an image to start.", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
 
     try:
         if isinstance(image, np.ndarray):
             image = Image.fromarray(image)
 
-        dogs = await detect_multiple_dogs(image)
+        dogs = detect_multiple_dogs(image)
         
         if len(dogs) == 0:
-            return "No dogs detected. Please upload a clear image of a dog.", None, [], []
+            return "No dogs detected. Please upload a clear image of a dog.", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
 
         explanations = []
         buttons = []
-        button_details = []
         annotated_image = image.copy()
         draw = ImageDraw.Draw(annotated_image)
-        try:
-            font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf", 20)
-        except IOError:
-            font = ImageFont.load_default()
+        font = ImageFont.load_default()
 
         for i, (cropped_image, _, box) in enumerate(dogs, 1):
-            top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(cropped_image)
+            top1_prob, topk_breeds, topk_probs_percent = predict_single_dog(cropped_image)
 
-            # 繪製更醒目的邊框和標籤
-            draw.rectangle(box, outline="red", width=5)
-            label = f"Dog {i}"
-            label_bbox = font.getbbox(label)
-            label_size = (label_bbox[2] - label_bbox[0], label_bbox[3] - label_bbox[1])
-            draw.rectangle([box[0], box[1], box[0] + label_size[0], box[1] + label_size[1]], fill="red")
-            draw.text((box[0], box[1]), label, fill="white", font=font)
+            draw.rectangle(box, outline="red", width=3)
+            draw.text((box[0], box[1]), f"Dog {i}", fill="red", font=font)
 
             if top1_prob >= 0.5:
                 breed = topk_breeds[0]
                 description = get_dog_description(breed)
-                explanation = f"**Dog {i}: {breed}**\n\n{format_description(description, breed)}"
-                explanations.append(explanation)
+                explanations.append(f"Dog {i}: **{breed}**\n\n{format_description(description, breed)}")
             else:
                 explanation = f"""
-**Dog {i}: Detected with moderate confidence. Here are the top 3 possible breeds:**
+Dog {i}: Detected with moderate confidence. 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]})
 """
                 explanations.append(explanation)
-                for j, breed in enumerate(topk_breeds, 1):
-                    button_text = f"More about Dog {i}: {breed}"
-                    buttons.append(button_text)
-                    description = get_dog_description(breed)
-                    button_details.append(format_description(description, breed))
+                for breed in topk_breeds:
+                    buttons.append(f"More about Dog {i}: {breed}")
 
         final_explanation = "\n\n---\n\n".join(explanations)
-        return final_explanation, annotated_image, buttons, button_details
+        return final_explanation, annotated_image, gr.update(visible=True, choices=buttons), gr.update(visible=False), gr.update(visible=False)
 
     except Exception as e:
-        return f"An error occurred: {e}", None, [], []
+        return f"An error occurred: {e}", None, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
 
-def show_breed_details(evt: gr.SelectData, details):
-    return details[evt.index]
+def show_details(choice):
+    try:
+        _, breed = choice.split(": ", 1)
+        description = get_dog_description(breed)
+        return format_description(description, breed)
+    except Exception as e:
+        return f"An error occurred while showing details: {e}"
 
 # Gradio 界面設置
 with gr.Blocks(css="""