Update app.py

app.py

@@ -41,30 +41,13 @@ def send2api(input_img, api_url):
         print(str(e))
     return response
 
-def display_detectionsandcountings_detclasim(img_array, detections, c_cnames, c_scinames, coverage, prob_th=0, cth = 0):
-    img = Image.fromarray(img_array)
-    img1 = ImageDraw.Draw(img)
-    h, w = img.size
-    ratio = h/4000
-
-    for (box, _, y_prob, y_class, sciname) in detections:
-        y_prob = float(y_prob)
-        if y_prob > prob_th:
-            img1.rectangle(box, outline='red', width=int(20*ratio))
-            img1.text(box[:2], y_class+str(round(y_prob,3)), fill='white')
-
+def displaytext_detclasim(c_cnames, c_scinames, coverage):
     countings_list = list(c_scinames.items())
     countings_list.sort(key = lambda x: x[1], reverse=True)
-    yi=int(20*ratio)
     total = 0
-    for (y_class,c) in countings_list:
-        if c > cth:
-            img1.text((int(50*ratio), yi), "# {} = {}".format(y_class, c), fill='red')
-            yi += int(100*ratio)
-            total += c
-    yi += int(100*ratio)
-    img1.text((int(50*ratio), yi), "# {} = {}".format('total', total), fill='red')
-
+    for (_,c) in countings_list:
+        total += c
+    
     text = f'coverage = {coverage}'+'\n\n'
     text += 'Countings by scientific name:\n'
     countings_list = list(c_scinames.items())
@@ -80,7 +63,7 @@ def display_detectionsandcountings_detclasim(img_array, detections, c_cnames, c_
       text += f'{key} = {value}'+'\n'
     text += '\n'
     text += f'total = {total}'+'\n'
-    return img, text
+    return text
 
 def displaytext_yolocounter(countings, coverage):
     countings_list = list(countings.items())
@@ -130,7 +113,9 @@ def testing_countingid(input_img):
     c_scinames = response['countings_scinames']
     coverage = response['coverage']
     detections = response['detections']
-    img, text = display_detectionsandcountings_detclasim(input_img, detections, c_cnames, c_scinames, coverage, prob_th=0, cth = 0)
+    img_out = response['img_out']
+    img = Image.open(BytesIO(base64.b64decode(img_out)))
+    _, text = displaytext_detclasim(c_cnames, c_scinames, coverage)
     return img, text
 
 def testing_yolocounter(input_img):