From 5d72c8633a61647126edbe91faff17eb1505a3e8 Mon Sep 17 00:00:00 2001
From: Benjamin Cretois <benjamin.cretois@nina.no>
Date: Mon, 2 Oct 2023 13:26:58 +0200
Subject: [PATCH] [ADD] send message when analysis is done

---
 .gitignore                                    |   4 +-
 CONFIG.yaml                                   |   6 +-
 .../__pycache__/custom_model.cpython-38.pyc   | Bin 1374 -> 1501 bytes
 .../simple_tokenizer.cpython-38.pyc           | Bin 5777 -> 5832 bytes
 cloud_Dockerfile                              |   3 +-
 cloud_analysis/main.py                        |  64 +++++++++++++++---
 cloud_analysis/test.sh                        |   5 ++
 logs/logfile.log                              |   0
 8 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100755 cloud_analysis/test.sh
 delete mode 100644 logs/logfile.log

diff --git a/.gitignore b/.gitignore
index 1c783b5..0496a53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 audioclip/assets/*
 **/*/__pycache__/*
-singing_in_noise/Figures_MS/*
\ No newline at end of file
+singing_in_noise/Figures_MS/*
+cloud_analysis/gmail_logs.env
+logs/logfile.log
\ No newline at end of file
diff --git a/CONFIG.yaml b/CONFIG.yaml
index 4a743ca..ec8d001 100644
--- a/CONFIG.yaml
+++ b/CONFIG.yaml
@@ -3,6 +3,6 @@
 ######################################
 
 # List of paths to initialise the model
-path_tokenizer_file: "./assets/bpe_simple_vocab_16e6.txt.gz" 
-path_audioclip: './assets/AudioCLIP-Full-Training.pt' 
-path_snowmobile_model: "./assets/snowmobile_model.pth"
\ No newline at end of file
+path_tokenizer_file: "/app/audioclip/assets/bpe_simple_vocab_16e6.txt.gz" 
+path_audioclip: '/app/audioclip/assets/AudioCLIP-Full-Training.pt' 
+path_snowmobile_model: "/app/audioclip/assets/snowmobile_model.pth"
\ No newline at end of file
diff --git a/audioclip/model/__pycache__/custom_model.cpython-38.pyc b/audioclip/model/__pycache__/custom_model.cpython-38.pyc
index b2c7809455cdd8f7858a32488f81e48d70cef4d7..adcc90fa72aad4dfc5d105294b5d82da44122f24 100644
GIT binary patch
delta 720
zcmYjOPixdb6rahT-DEb|-PT1bC{(JJrLwDF5ky2#T7<fyMYOrZkeS_0nN8wLf^FG@
zP)~x&l7m-!^5$3YJ9r$>i{8agpfg!$J1}qFpLxIcd++@uKN@S#T$dnu{(b*K#|A>b
zlyUml(zqvY_GY$rYd{gj-1cnwn%tfck6^?aw04L;c07mKyDoDWq4oEg*L;rF(G&C(
zy+E6YTGW1vsLg7-twY^wQ@oA3WOlH++Qouw6r67*0cCLD_WJi94>lfd_V$Abm%-XR
zFgtohOi4pmR34NU@XE_vr`mZG;i>jX`+%p&H>OIOQ}nrZgfOB=*3bunq`-0rqL@*y
znFjgT4+<J3A&=5-U6@&sG7y&UM{$(<KFA>;p@+j!`4!(VU1@pcZ@hf_az9AZ{&8x5
zl2FF`VUgv@#IKBAx({lYZF#e5s+iz5UMg>D@32#T({?%vPLPlXSr!c=23-SM<u!e!
zvnT^li8D%TN^!0X^}UXxG8`6%vfP|FTrB_SXRo(Z0Pl%rMadtsATNMrbC6>sQ6DDo
zIsm#{t{dBtVpV~|6_xJ#e#IqZoXgfvNT?Q|Vp5lyDwWlwuyC_(*`R#g1!3k1gk#X8
zC9F#C#WAQ2!KL!AaWxi(S|X^u2_s2aEbvemTy7c~(&x3dqR}{yqj>Zvp#^6Z@F^B2
dU08SIgyoOBSmtHQZ(#>Jnx#3q(g<GC{sYh~thoRH

delta 558
zcmY+A&ubGw6vyZ7uk3C%{Q-f5DtHJ~mRRG>i<FAcQi&o|5ADHm$xPCfO*YPKXqDXT
zN!mh~gI7KF=G}ip78Jz4z^kD6-YQZD_VH%;en0zt?{oc2*nQGygbdI5r^VpA&Db}(
zTs{t7w(!&U7v0<K9VT4ioiO1^?|JarJ_rTuvADMQaDDOXMMz?VFui47LT6uCDa@_6
z);Y`>x93!yIeX{6XTStQpZ%~5r%DzoNheagTJI&(X)n=Q7P@zLCer*~fA`VG_AJXb
z9+M`WjBZYg*fU?DWq!h~n6j74<6Ov$Cu%es%SoXxpbR)4WC-H?g8f)Sta)a&n?9<^
zp{tQ0gcWF-Q|k=`re*IpD_B_h(qSr9?5N0`*q!DIdQ??bsjFjIH6QKcZh&1G$;ki%
z@Pq=ZEA#~0Wj)JBT<61LoE*nCf}T39_Wz)=Hq6ygqQsgxbN2d_u41bWF&ckI7|1N+
z{Lk+z{}Sn{ATD+kL3>zySgQGfqPMtiZn#(Bn%Q;NcMg{O>FBVa-95;~ER&Vw67Sz&
WrGE!EiHc1iD6PYX2qMe3BI`H7h=9KU

diff --git a/audioclip/utils/__pycache__/simple_tokenizer.cpython-38.pyc b/audioclip/utils/__pycache__/simple_tokenizer.cpython-38.pyc
index 268676f42f2519fe757a0e71f318b8ac55f3acae..a33c9a8227fea9a6275a820ac70469495349b6a6 100644
GIT binary patch
delta 1952
zcmZuyO>7%Q6rNe{Zq{o%aei8w3L;UprEZ!uO;uWo>lUaI3az0(h}IQY>z#43>Dp_(
zU8g^nP^BON0u<)LksGSS1#*QuN7M__N=P71Jr%B;cyG2Ot<|;Wt>51_?{8)|W`3EO
zey>z=89rY=_)eJPjQvH-lTRL*Gq~a(H>QuT2_|^xG#q^ALZ_2&<T;bBFxUB46ODp&
zR*JG9^TPVVXq4V($Jj-7iCtyVTxY@-L-*J^ZwzbB5qZsx2v-#Du|`=GMG4=dVpxpe
zdu)-3vKYO`#Hbu!&ow3lzsxFYV-G2|dWEO?5c*Bu^Oq$u?m|Bd&qtn+aHlkT_>Fh!
z3+EPRZ+o2(m3F4^$@9s_K;{ixv4bSR#3mVTVbmMrJug{qCeaPq4em&2wu6v1$@%T)
zm+mvL(Oi>%4;=P-y~AE#1d$&G>IOeh8YMtNW(GK$-}2Sm9NBC4WvCdbF*}#??luSv
zp*nS|VGt*N)alg@ss&3dVk=n6TZ4Ax*6l>b7+bU74g5&R=g=;mK*9=jUgRb&hr4`O
zFPKvQSby+>dSD;XVPtT6$NZ8^nmsRoc$OfF1Yz3fTt;V`!(O#9vP(T0vedgn*AH#w
zoP}Fxd2!%3{ZM+{ljKf%hI^Jd9D3|{@^l4daFED=d->*afNAtRUuGC*(C9J7Fopng
z$om_klbd&)ANc&1_x&7<p(f=wQocF}>Q+VIXC*wRgu94ofA5~Iku#RvO8UJ}rdHew
zgQQ|)I95l(k{kd6s^)oIvB{X~xChnc!r6TpjCO-#sC<@FUHw$>Pi{pEN1tK$GRiI!
zIGNe_GcY=+k>zQ1t?2V9^>gvHIVvjbK$6<4Uf7p0>>|coiGprw%Ug-;3Ya9L-9&b(
znbHiORo6@V=jTz-uytl}YOO}T*Me8cXge@H08X<Rbc3YXT-@9&{myw6`&Q!@)UPAE
zCogT;XQtKA>$HSdYpGnhdaZ!khcx3bgQVg@o&LW<WG|95*9p3Cf!Mc*wSumYx8NKJ
zC<}NK33|~c*cUox@FL0gsBg;C6FSTW@p|uEt0%9j-^!1SQ%wD7j;oKx_RsGl1P*8D
zmGu%{AP?=P0kRpdF3GOE)q~o{>gd=B<M<ZB+GB*bw-Fk7+$lTt130jRR-fRaiC`wS
zEK9tg=M)a1Ftx(yrUam~ln%8qV=oNhB62!gY+091YgU9dV<#9;iz}wC0!-uohP$<Y
z3?6wtT?tr0*<JO)_}BcD`g{C@K9g7k8rA=cpxvG>f*$A3)Rl?O8sVYC>)Q?~_Xl&O
z>Hi#;&XvX!jw6>2f$W8NUg<u?JR^vqit?-wW|m~0E+-GbyA2DZ3z1ZES)c7Bn!-lM
zI@Q6<$of<D;g0$mUBziGP5`bDLYoNXodHq;17i$FP)7dx7I*l>s8ewqEv@VTy58X>
zB&iX_X};a>`biXpG3e>tPYMg<5>BUXoViAy49Jn!SyJ+LYKHh(0gFTw983|RG1q<9
z6Oh_bYeo8r-t~$2bhvsDooXi%{ZQ5jI^KiC!E4UpMFVLL-*|QIGVt<tEt9)DouXqq
F_J0<)j3WR5

delta 1887
zcmZux&2QX96!)yXUhh}FND5SKBqCa68}g|%Eos;!1PDTqLQ7Q<K$h1tNt}A^)w4IG
zp=yv4{(v&#iW+eWH<U9MBqT2M4;TpvsTXoWTsiUHI8D;1w&v%VH}Ci6eT{z~el$FE
zr&=u;_*DP>wQ;-0FrL!l^kd;-4oC9f(a^PRVeJ^)<kqgS!<HSr%5z(<ioC#`U1Pb#
zi@b#2GB5KAek+RxukwyvgLjDPj=9{y*=?iNc}RyW)tD-V&~|;#UlTrwPCo@)EZ|56
z5K?2EZ9mS@=dr2LO7nYck8#Fx+}yL!s<pJ08yQiymn0%hwk|YU!cBr^D-`ZV?0XG&
zd`e7>q?_r;>Q>EGxj0c)%S+dkwH^nND)0azuPIc)Yb09kxb8}TY<J%P%u`vT@n8R_
z*OCv|V6{Tt<q(V<R1SV-8|E0L6T>q7HK^rOZe&cch`1RQ$~aS{nJ`FFKW?__ugkl6
zzW6dpS>vo;SL1#v5;u+Ab`<zA7u~3r^dcDLC01b;4u_RkhaNB>bM{}XQ$DrFwHui^
zePVG{q;AU#AQ>bR<hNnjNbW+i&0tXeUAQQ{!sl<Cakbp=lE8QUP<YWKQEj5)d0h;~
zkaVkW7}qdDaEdB#I(^;KC_K{dz@uRDpzS<i6US=%CY(bR#qKG#ahgrS(hLv$EJq8n
zU0TGreksk?iHv#8r){jN$|tQbNNc&wPQEE%Rh%&duOQ<+90|6vd|0|7zwhmr#eBDv
z<-SXqIZcN*QRzkG_vIgDfBM*Kxb^})3iTs8gwkW<n?o<*ZPHwj>lL33$S0Ng(K-oU
zMNsyJ7q&$L7f3=RWsA*JL>w-Xq@UotoUIPC3E8Y(o|r<xvaJJ5R9<&8%#zZHU%JrP
zu|X81t~-D5TlG)I=H!o^^~sM>Q<>NUD!&rOUWyHhjUT{1gFDAYGX6~HH5=Tke<Az2
zW<Kl0-9u_{7)Pj;;1im^ML><D%w`Y)SqF+<<%5WeP56)m$B`k64#Aqm_e2DjX!ElC
zscWcL`~D@Z_1Pxg*IV+i>mN2RANEX7)NrT9;2rv8C5G2XSu->@>+P9U5sA$f)VJlk
zJ=fU{B5xm&mrlsbMfx9PPCRb{)=}#l9MmI*g~iLlEd#YYj3KCe7=I-ICTLz*!8pAz
zgimSvsCp4y&@A-8Fs>Uw#jaUdf=6+_Tsl5K0Zz>4<A)~7zLxPz-&ylGlRxxc)wdB-
za1+<hQlOb<{HGq@l`Fl?Z8C`jYWQc@g864Mrmw`esG-B9UWFUDQUwsL(DMa$hmE1e
zkiZ<uvs_qNoJIO2c>vyh_<;6egqoQZ*iPeqtZ)Jp?b+Z+dq=kVmbU5Vqs$})xJ!DN
zEJKH$8PqvB0je-uMVP~pI0z2w?RIL8qouV@SVS2N5m50|aitykX&i?M=)S!|!aRso
z>`N*htkC%|KtL_5tE=m*?6|Qm{8Sr0b+5EDy3?GQX3X26sGCSk&LcSZUvpR`hiF=?
NWZ^jHR2<u}{|6PYfeiov

diff --git a/cloud_Dockerfile b/cloud_Dockerfile
index 20d5425..7fe3a50 100644
--- a/cloud_Dockerfile
+++ b/cloud_Dockerfile
@@ -24,9 +24,10 @@ RUN cd ../
 # Package install
 COPY . ./
 RUN poetry config virtualenvs.create false
-RUN poetry install --no-root
 RUN poetry add distlib
+RUN poetry install --no-root
 RUN poetry add Flask
+RUN poetry add python-dotenv
 
 
 ENV PYTHONPATH "${PYTHONPATH}:/app:/app/audioclip:/app:/app/src"
diff --git a/cloud_analysis/main.py b/cloud_analysis/main.py
index c4ce8f9..7208122 100644
--- a/cloud_analysis/main.py
+++ b/cloud_analysis/main.py
@@ -4,9 +4,15 @@
 from flask import Flask, request, jsonify
 app = Flask(__name__)
 
+import os
+from dotenv import load_dotenv
+
 import argparse
 import numpy as np
 
+import smtplib
+from email.message import EmailMessage
+
 import torch
 from torch.utils.data import DataLoader
 
@@ -14,13 +20,49 @@
 from predict import initModel
 from utils.utils import AudioList
 
+import logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+
+
+# Get the environment variables
+load_dotenv(dotenv_path="/app/cloud_analysis/gmail_logs.env")
+
+GMAIL_USER = os.environ.get('GMAIL_USER')
+GMAIL_PASS = os.environ.get('GMAIL_PASS')
+RECEIVER_EMAIL = os.environ.get('RECEIVER_EMAIL')
+
+if not GMAIL_USER or not GMAIL_PASS:
+    logging.error("GMAIL_USER or GMAIL_PASS environment variables are not set.")
+
+def send_email(subject, body):
+    msg = EmailMessage()
+    msg.set_content(body)
+    msg['Subject'] = subject
+    msg['From'] = GMAIL_USER
+    msg['To'] = RECEIVER_EMAIL
+
+    # Establish a connection to Gmail
+    try:
+        logging.info("Attempting to connect to Gmail SMTP server...")
+        server = smtplib.SMTP('smtp.gmail.com', 587)
+        server.starttls()
+        logging.info("Connected to Gmail SMTP server. Attempting login...")
+        server.login(GMAIL_USER, GMAIL_PASS)
+        logging.info("Logged in to Gmail. Sending email...")
+        server.send_message(msg)
+        server.quit()
+        logging.info("Email sent successfully!")
+    except Exception as e:
+        logging.error(f"Error sending email: {e}")
+
+
 
 def analyseAudioFile(
         audio_file_path, batch_size=1, num_workers=4, min_hr = 0.1, min_conf = 0.99
 ):
     # Initiate model
     device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
-    model_path = "./assets/snowmobile_model.pth"
+    model_path = "/app/audioclip/assets/snowmobile_model.pth"
     model = initModel(model_path=model_path, device=device)
 
     # Run the predictions
@@ -67,22 +109,25 @@ def on_process_audio(
 
     # After processing we record each detection in the database. 
     # Each detection should have a start and end time which is used to create an audio clip later. 
+    count = 0
     detections = []
     for r in results: 
         start, end, confidence, harmonic_ratio = r
-        # create the detections
+        if harmonic_ratio > 0.1 and confidence > 0.99:
+            count += 1
+
+        # create the detections dataset
         detections.append({
             u"start": start,
             u"end": end,
             u"tags": ["snowmobile"],
+            u"confidence": confidence,
+            u"harmonic_ratio": harmonic_ratio,
             #u"analysisId": analysis_id,
             # Add any other information you want to record here
-            u"confidence": confidence,
-            u"harmonic_ratio": harmonic_ratio
         })
 
-    print(detections)
-    print(f"{audio_id} completed with {len(detections)} detections")
+    return count
 
 
 @app.route('/process-audio', methods=['POST'])
@@ -91,12 +136,15 @@ def process_audio_endpoint():
     audio_id = request.json['audio_id']
     audio_rec = request.json['audio_rec']
     
-    on_process_audio(audio_id, audio_rec, audio_file_path)
+    detection_count = on_process_audio(audio_id, audio_rec, audio_file_path)
+
+    #if detection_count > 0:
+    send_email("Snowmobile Detection Alert", f"{detection_count} snowmobile detections were made in the audio file!")
     
     return jsonify({"message": "Audio processing completed!"})
 
 
 if __name__ == "__main__":
-    
+    app.debug = True
     app.run(host='0.0.0.0', port=8080)
 
diff --git a/cloud_analysis/test.sh b/cloud_analysis/test.sh
new file mode 100755
index 0000000..fa5345e
--- /dev/null
+++ b/cloud_analysis/test.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+curl -X POST -H "Content-Type: application/json" \
+    -d '{"audio_file_path": "/app/example/example_audio.mp3", "audio_id": "test-id", "audio_rec": {"location": {"latitude": 0, "longitude": 0}}}' \
+    http://localhost:8080/process-audio
\ No newline at end of file
diff --git a/logs/logfile.log b/logs/logfile.log
deleted file mode 100644
index e69de29..0000000