Update app

app.py

@@ -49,46 +49,7 @@ aws_access_key_id = os.environ['aws_access_key_id']
 aws_secret_access_key = os.environ['aws_secret_access_key'] 
 region = os.environ['region'] 
 
-# Envio de imagenes a S3
-def upload_file(file_name, bucket=None, object_name=None):
-  """Upload a file to an S3 bucket
-
-  :param file_name: File to upload
-  :param bucket: Bucket to upload to
-  :param object_name: S3 object name. If not specified then file_name is used
-  :return: Json if file was uploaded, else False
-  """
-  # If S3 object_name was not specified, use file_name
-  if object_name is None:
-    object_name = os.path.basename(file_name+".jpg")
-  if bucket is None:
-    bucket = 'oceanapp'
-  s3_client = boto3.client('s3',aws_access_key_id=aws_access_key_id,aws_secret_access_key=aws_secret_access_key)
-  aws_region = boto3.session.Session().region_name
-  # Upload the file
-  try:
-    with open(file_name, "rb") as f:
-      response = s3_client.upload_fileobj(f, bucket, object_name)
-      s3_url = f"https://{bucket}.s3.amazonaws.com/{object_name}"
-      stado = '"url_details":[{"statusCode":200, "s3_url":"'+s3_url+'"}]'
-    print(s3_url)
-  except FileNotFoundError:
-    print("The file was not found")
-    return False
-  except NoCredentialsError as e:
-    logging.error(e)
-    return False
-  return stado
-
-#Imagen temporal guardada en upload_file
-def tempFileJSON(img_file):
-  temp = tempfile.NamedTemporaryFile(mode="wb")
-  with temp as jpg:
-    jpg.write(img_file)
-    print(jpg.name)
-    uf = upload_file(jpg.name)
-    return uf
-
+#Lista Json y Dataframe
 def removeStr(string): 
   return string.replace(" ", "")
 
@@ -133,8 +94,48 @@ def arrayLista(a,b,c,d):
       strlist2.append(d)
     strlista = [strlist,strlist2]
     df = pd.DataFrame(strlista,columns=['Cantidad','Especie'])
-    print(df)
     return df
+
+#Imagen temporal guardada en upload_file
+def tempFileJSON(img_file):
+  temp = tempfile.NamedTemporaryFile(mode="wb")
+  with temp as jpg:
+    jpg.write(img_file)
+    print(jpg.name)
+    uf = upload_file(jpg.name)
+    return uf
+
+# Envio de imagenes a S3
+def upload_file(file_name, bucket=None, object_name=None):
+  """Upload a file to an S3 bucket
+
+  :param file_name: File to upload
+  :param bucket: Bucket to upload to
+  :param object_name: S3 object name. If not specified then file_name is used
+  :return: Json if file was uploaded, else False
+  """
+  # If S3 object_name was not specified, use file_name
+  if object_name is None:
+    object_name = os.path.basename(file_name+".jpg")
+  if bucket is None:
+    bucket = 'oceanapp'
+  s3_client = boto3.client('s3',aws_access_key_id=aws_access_key_id,aws_secret_access_key=aws_secret_access_key)
+  aws_region = boto3.session.Session().region_name
+  # Upload the file
+  try:
+    with open(file_name, "rb") as f:
+      response = s3_client.upload_fileobj(f, bucket, object_name)
+      s3_url = f"https://{bucket}.s3.amazonaws.com/{object_name}"
+      stado = '"url_details":[{"statusCode":200, "s3_url":"'+s3_url+'"}]'
+    print(s3_url)
+  except FileNotFoundError:
+    print("The file was not found")
+    return False
+  except NoCredentialsError as e:
+    logging.error(e)
+    return False
+  return stado
+
 # Model
 model = torch.hub.load('ultralytics/yolov5', 'custom', path='best.pt', force_reload=True, autoshape=True)  # local model  o google colab