Update json

app.py

@@ -53,26 +53,20 @@ region = os.environ['region']
 def removeStr(string): 
   return string.replace(" ", "")
 
-def listJSON(a,b,c,d,e,f,resImg):
-  x = re.findall("obo Mar", d)
-  y = re.findall("elica", d)
-  z = re.findall("elica", f)
-  if x:
-    d = 'Lobo marino'
-  if y:
-    d = 'Pelicano'
-  if z:
-    f = 'Pelicano'
-  if(d=='Lobo marino' or d=='Pelicano'):
-    if d =='Pelicano\nSp' or d =='Pelicano\nS':
-      d = 'Pelicano'
-    if f!='Pelicano':
-      strlista = '"detail":[{"quantity":"'+str(removeStr(c))+'","description":"'+str(d)+'"}]'
-    else:
-      strlista = '"detail":[{"quantity":"'+str(removeStr(c))+'","description":"'+str(d)+'"},{"quantity":"'+str(removeStr(e))+'","description":"'+str(f)+'"}]'
-    strlist = '{"image":"'+str(removeStr(a))+'","size":"'+str(removeStr(b))+'",'+strlista+','+resImg+'}'
-    json_string = json.loads(strlist)
-    return json_string
+def qtyEspecies(datax, datay, resImg):
+  numLobos = 0
+  numPelicanos = 0
+  dfEspecies = pd.DataFrame(datax)
+  datay = str(datay)
+  for i in range(0, dfEspecies['name'].size):
+    if(dfEspecies['name'][i] == 'Lobo marino'):
+      numLobos= numLobos + 1
+    if(dfEspecies['name'][i] == 'Pelicano'):
+      numPelicanos= numPelicanos + 1
+  strlista = '"detail":[{"quantity":"'+str(numLobos)+'","description":"Lobo marino"},{"quantity":"'+str(numPelicanos)+'","description":"Pelicano"}]'
+  data = '{"image":"'+str(removeStr(datay[0:9]))+'","size":"'+str(removeStr(datay[11:18]))+'",'+strlista+','+resImg+'}'
+  json_data = json.loads(data)
+  return json_data
 
 def arrayLista(a,b,c,d):
   x = re.findall("obo Mar", b)
@@ -144,11 +138,6 @@ def yolo(size, iou, conf, im):
       '''Wrapper fn for gradio'''
       # gain
       g = (int(size) / max(im.size))  
-      # resize
-      if(max(im.size)>900 and g>0.4):
-        g=0.3
-      if(max(im.size)>2000 and g>0.4):
-        g=0.1
       im = im.resize((int(x * g) for x in im.size), Image.ANTIALIAS)  
 
       model.iou = iou
@@ -159,13 +148,15 @@ def yolo(size, iou, conf, im):
       # updates results.imgs with boxes and labels
       results2.render()  
       results3 = str(results2)
+      #Contador de especies
+      results5=results2.pandas().xyxy[0].sort_values('name')
       #Transformando la img en bytes
       pil_im = Image.fromarray(results2.ims[0])
       b = io.BytesIO()
       pil_im.save(b, 'jpeg')
       im_bytes = b.getvalue()
       fileImg = tempFileJSON(im_bytes)
-      lista = listJSON(results3[0:9], results3[11:18] ,results3[19:21],results3[22:32], results3[34:36], results3[36:45], fileImg)
+      lista=qtyEspecies(results5,results2,fileImg)
       lista2 = arrayLista(results3[19:21],results3[22:32], results3[34:36], results3[37:45])
       return Image.fromarray(results2.ims[0]), lista2, lista
     except Exception as e: