DawnC commited on
Commit
7587a5c
·
1 Parent(s): 5ed8603

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +8 -5
app.py CHANGED
@@ -305,7 +305,7 @@ async def predict(image):
305
  dogs_info = ""
306
 
307
  for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
308
- # 每次迭代前重設 buttons_html 和 dogs_info 以避免累積
309
  buttons_html = ""
310
 
311
  top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(cropped_image)
@@ -318,18 +318,21 @@ async def predict(image):
318
  dogs_info += f'<h2>Dog {i+1}</h2>'
319
 
320
  if top1_prob >= 0.45:
 
321
  breed = topk_breeds[0]
322
  description = get_dog_description(breed)
323
  dogs_info += format_description_html(description, breed)
324
-
325
  elif combined_confidence >= 0.15:
 
326
  dogs_info += f"<p>Top 3 possible breeds:</p><ul>"
327
  for j, (breed, prob) in enumerate(zip(topk_breeds[:3], topk_probs_percent[:3])):
328
- # 確保這裡只會顯示正確的列表,不附加多餘的品種名稱
329
- dogs_info += f"<li><strong>{breed}</strong> ({float(prob.replace('%', '')):.2f}% confidence)</li>"
 
330
  dogs_info += "</ul>"
331
 
332
- # 每隻狗生成單獨的按鈕
333
  buttons_html = '<div class="breed-buttons">'
334
  for breed in topk_breeds[:3]:
335
  button_id = f"Dog {i+1}: More about {breed}"
 
305
  dogs_info = ""
306
 
307
  for i, (cropped_image, detection_confidence, box) in enumerate(dogs):
308
+ # 每次迭代重新初始化 buttons_html
309
  buttons_html = ""
310
 
311
  top1_prob, topk_breeds, topk_probs_percent = await predict_single_dog(cropped_image)
 
318
  dogs_info += f'<h2>Dog {i+1}</h2>'
319
 
320
  if top1_prob >= 0.45:
321
+ # 信心較高,顯示首選品種並提供描述
322
  breed = topk_breeds[0]
323
  description = get_dog_description(breed)
324
  dogs_info += format_description_html(description, breed)
325
+
326
  elif combined_confidence >= 0.15:
327
+ # 這裡保留與 >= 0.45 相同的顯示邏輯,只是增加按鈕功能
328
  dogs_info += f"<p>Top 3 possible breeds:</p><ul>"
329
  for j, (breed, prob) in enumerate(zip(topk_breeds[:3], topk_probs_percent[:3])):
330
+ # 保持顯示正常的方式,避免附加多餘字串
331
+ prob = float(prob.replace('%', '')) # 去掉百分比符號,轉換為浮點數
332
+ dogs_info += f"<li><strong>{breed}</strong> ({prob:.2f}% confidence)</li>"
333
  dogs_info += "</ul>"
334
 
335
+ # 生成按鈕區塊
336
  buttons_html = '<div class="breed-buttons">'
337
  for breed in topk_breeds[:3]:
338
  button_id = f"Dog {i+1}: More about {breed}"