[ADD] hr and conf to loging

cloud_analysis/key-file.json

@@ -1,8 +1,8 @@
 {
     "type": "service_account",
     "project_id": "snoskuter-akustikk",
-    "private_key_id": "74c1e4bcd4b00da4dcaf848c31b7f0e77f077163",
-    "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCSSaUWwH1vue/s\nw6fz1RVq+CIP6RSKwBLCBO3B4un6crj6BCZpE8uOIulMlkQbhCoesVWUS+QWJJmU\nvJqIypGJXgjOlsG3AfezGbk39xbQI/g5ZN1f3QPWDvZkF7raMphu7aiDHsGesNbI\nvT1ASWvUpKD8W54XvocIekGlCL3fDSuvtSFL2Uz/MoLk6P9hl9qCQMY89sEooXY5\ng/h008Mam+/SNfPukGAmkjtUpf9w49tWdj5b1QC4e9JiDwE7PAmckKynYyzUrfVr\nDsphjk2jDFBPRY9MlFiLZl0I9QaU/4dHOa8hSOZ7lXFie7MUgRPrbfJWY/Fcm+2k\n3bq+qAqxAgMBAAECggEAB8pIMlf51hNOxYr9zKxSQaoJFlPRNjpYRWDB0Itm7mFh\nnF7QNNRLCLyvM9bktZpqK8xBxG3uLYexbgxFJnezHF+XlHjOxBIkwLLj/Cj6XAcu\nVtAaQdqhM6sET/w7hRcgqveY+7KNmQfNyE7bjiraxS4nLIkseBM7WaY5DLLUeaZD\nRAmZi5KHv9hnINL3jVwMQTMXDwNCI4gvvTtWjfiWF5870cGaDHFcLiCuaWYrH1sc\nyuc5BUFkOSJx+TYxoYk+Rd/aTfj/4EVzBGLeDMI40QfAuNBYSqYbHX9Uv8oTDlUI\n7UA8SqhOhtwjwGMZhC4CPLDspFhIFyuhtWeFNJjsAQKBgQDLohEAe+vQ1OvCqgZb\nh4RckCzQc++zFHGymFVfmMSfi7B3/tMalAyNzTiZmxTuqzT+fOrUj3KfLJZT+pQ+\nDmsqymS/CL6bh9f7vzNg7YU798rGtbYFZ82WzDg0adPpWC0rz+uoK5GSo8o19Mon\nRsWLvrcaMaoaQw/dbqfomYpP0QKBgQC36FCJeTg1Iecss53Oz/ubfQ44PCrpyOcy\n3+SG3ZbWFTRGUEZBgsFkW6JbmBNNGlCFRA0bISZFMZ+6SPPg+dhdyRERbbHIOKPa\nuok5p6fVuLYKEl4EnNyiFm/dR6IBewSVr9j9gVXUH8buz1Yn81LmmeyWU5qPZrv4\nqbk5RRak4QKBgByKBTn9JCqrfLNWovd3Abz7U9yPMxv1FI5EPUrdnUkDCeN3alzC\nPRQum+0jSAa/Jfk4xqytwhG+7P6uEtKzsJ9ZqE8Byb0Ah+u3e1rtTwv9iYTZ+L2/\nM5gb3RCzeEiu2/3U8SErogZcQD3Zpe9lQtB4FS9toHp3xaRyGsRFqJXRAoGBAJiS\nMQ579HeP8tuQ/+Cth02NyBg7QlbFh5kbSdnhR9u/p6iVvFNpCMwbgWx/k7OpmxeU\nR1M0gy1wZ9UB5OHGJQxZXMGawZ0b8EPr8SBVyNVz8gIVDs7A3AHUn2VyoiKcTkdo\npZpajDv5SO6iMBXgtev90ts77MP/NP6sv6+Vc53BAoGAUgLZ5dO7jOuMeF5aF93v\nd4EjNsxkWDh+1tznSc/zcZxB7BytVsb61HRDn/6HPwSGSvqz7RLKqtynZOhGUlLS\ndtw9TXUgwhMM/iKLUvZQKghm0CfnnsGjEkNowAHTnS7mRBNeClnpYFWxWkE/Za6k\nFnQZmUYKgliaLaVJBXc3W8E=\n-----END PRIVATE KEY-----\n",
+    "private_key_id": "b3b76c5f6656af0cca347cb0180d3e06bfdd2b27",
+    "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpZcOPLl690Ttz\nviII2hLQvtINfXst4KQ9maFmkwOGUxoLqA1Ws1ErYtDQmvCHO8GJ9GwEFh2l3FfS\npqa8+LtfGN4h9mkulm0jkxPq0GcqYrs1GzYCnygsL4UvHVQMuCJ3Wd0T1cqMxBZF\nIYtvBLBDD9V+FivZybPoMGuL0prR0q7PjclvYDAp1YlIf3NI/MpoBS+yfAiafWg3\ng0jlu2K2U7oKtKlL68pS9enOXJYMSvqO/gX9JuiiH3OgHe/C71WWJmsIEbM7acyb\nx9GuzTqnR2wnf/ayUY8TSSei+yxZH3OoxjODxXDt4mhhPvHwupqhBrf1FQfTSs2z\nKhPEoG1vAgMBAAECggEAD+EU0OIyFvpH59Sl6hob82qmOoXnVLVr9l5LzYq9PnII\nM5mGqCvAN+0k0YYEqbI46HUVS9jEexzJmsFTSTMwlUlTR7zw8frZGW5n5ClL0m+I\n4jSK/pOFN4cicl7K1zP9/x2/mWSY5R/1Taut7DOoHJ4D9eefWrE+s4BLRI/y28I/\na3+kIGj2YIw6My+3E5rHk/Ei/aC3EAab/zYKnjPc9Jx7te+me/f/cS5L/OPeFAot\nwN+1fpDNP+BjL4hOUXEst2fpjx7W4RHlvWcTJYiKajEKfnLD8U8euWQK2tPVBV4Q\nQ+Cl6uWdZ/sEovPUgVTHnk534YM3erT3op/p6osFKQKBgQDqa7BsiEN32mSnVWTi\n+gFD9MIjgjrC0aJ3nBut8NK1LGM+FHeiMaHn9iyq6hHVW1afZKXtOaGYUrysgk+R\nHanxQsDVzTuTmT6fGOPUghgEo62DgdST2lQXtMtHny2bo2ddmy38vbMEvQvA22zH\n90Sy5wU4XA6LT/mm2Af7jkh71QKBgQC4/cCPHSfJym+knBcpJtwOYinuaX1O2sdr\nnCDQV+gnkpjSEcjMg0mAGo6kKRiutcLNMwi3HiaNx43rzGCwsosiPsB+RrZv6Wjx\nFaVeSKYLhWUXezigElOXCMSfKfhCU8OrVBaihRXJCqzobihUC/3+3e5Fprbam9FE\nRp7tB9u6MwKBgQCcSGc6NC4mvWbVWE0GNX6ae5bibXQXZgNWkrCxahhPyOPxA1wu\nucAjES/+UkbJYzeA1Gz6lq1xC9fVeprpOEmQGtzMrSLG6CejkchyaLjyftyzC99Z\nIvllRJcxjKGvXWUQNuCV2zJ6Oj6XuLHxLpySWQpV5Kmdnxflb6kCwHz6cQKBgB18\nZMrq7MKfP7hPIOnwRbcNMn3L1qtQ9+RRGHHc8SYNmcoyB32Bl5+RnBbSbhq64ffv\nIH5/kcmbeyWQiADiFIc61VfLUZz46T80Ig2rKrw/YOOjQl1RTn2OajisaeO4kkGm\nv4zcBaLrzq+lj0wGNVAAc9AqSI8DsxFc6EwDqqQ9AoGAXpRLsqLhIMYot0lV0b7f\nWukfsZiWz9KDMg9oIxUv9FqarLRme95M3g5r63udbGE4RGNuk9d0t2UHTTSUOmv1\nBUG9/TyIwipH6jL2YbcGghwIqB3HPWFcM1BZQ4mL6c8funIM7LCWAr+KntkQAoJJ\n4nSKnfx+p4b8hvK+LTCvYlE=\n-----END PRIVATE KEY-----\n",
     "client_email": "[email protected]",
     "client_id": "104912621642971586511",
     "auth_uri": "https://accounts.google.com/o/oauth2/auth",

cloud_analysis/main.py

@@ -111,7 +111,7 @@ def fetch_audio_data(bucket_name, blob_name):
 
     return wav_file_object
 
-def generate_signed_url(bucket_name, blob_name, expiration_time=600):
+def generate_signed_url(bucket_name, blob_name, expiration_time=86400):
     """
     Generates a signed URL for a GCS object.
     
@@ -164,6 +164,10 @@ def analyseAudioFile(
     # List of results
     results = []
 
+    # List of model confidence and HR
+    conf_arr = []
+    hr_arr = []
+
     for item_audioclip, item_hr in zip(prob_audioclip_array, hr_array):
 
         # Get the properties of the detection (start, end, label, confidence and harmonic ratio)
@@ -173,6 +177,10 @@ def analyseAudioFile(
         confidence = conf.max()
         hr = np.array(item_hr)
 
+        # Append the conf and hr of each segment
+        conf_arr.append(confidence)
+        hr_arr.append(hr)
+
         # If the label is not "soundscape" then write the row:
         if label != 0 and hr > min_hr and confidence > min_conf:
             item_properties = [idx_begin, idx_end, confidence, hr]
@@ -181,7 +189,10 @@ def analyseAudioFile(
         # Update the start time of the detection
         idx_begin = idx_end
 
-    return results
+    # Get the max confidence and hr for the file analyzed
+    maxes = [max(conf_arr), max(hr_arr)]
+
+    return results, maxes
 
 def on_process_audio(audio_id: str, audio_rec: dict, bucket_name: str, blob_name: str, hr: float, conf:float):
 
@@ -190,16 +201,18 @@ def on_process_audio(audio_id: str, audio_rec: dict, bucket_name: str, blob_name
 
     # A call out to your code here. Optionally we can pass on the recorder coordinates 
     audio_file_object = fetch_audio_data(bucket_name, blob_name)
-    results = analyseAudioFile(audio_file_object, hr, conf)
+    results, maxes = analyseAudioFile(audio_file_object, hr, conf)
     # The object results is a list containing detections in the form:
     # [start, end, confidence, harmonic ratio]
 
     # 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
+
         if harmonic_ratio > hr and confidence > conf:
             count += 1
 
@@ -214,7 +227,7 @@ def on_process_audio(audio_id: str, audio_rec: dict, bucket_name: str, blob_name
             # Add any other information you want to record here
         })
 
-    return count
+    return count, maxes
 
 
 @app.route('/process-audio', methods=['POST'])
@@ -227,9 +240,10 @@ def process_audio_endpoint():
     hr = data['hr']
     conf = data['conf']
 
-    results = on_process_audio(audio_id, audio_rec, bucket_name, blob_name, hr, conf)
+    results, maxes = on_process_audio(audio_id, audio_rec, bucket_name, blob_name, hr, conf)
+    max_conf, max_hr = maxes
 
-    if results > 0:
+    if results > 1:
         # Create a signed URL
         download_url = generate_signed_url(bucket_name, blob_name)
 
@@ -242,7 +256,7 @@ def process_audio_endpoint():
         email_body += f"Download the audio file here: {download_url}"
         send_email("Snowmobile Detection Alert", email_body)
 
-    return jsonify({"message": "Audio processing completed!"})
+    return jsonify({"message": f"file {blob_name} processed. Max CONF = {max_conf}, MAX HR = {max_hr}"})
 
 
 if __name__ == "__main__":

cloud_analysis/test_local.sh

@@ -2,7 +2,7 @@
 
 curl -X POST \
      -H "Content-Type: application/json" \
-     -d '{"hr": 0.00, "conf": 0.0001, "audio_id": "test-id", "audio_rec": {"location": {"latitude": 0, "longitude": 0}}, "bucket_name": "snoskuter-detector-test", "blob_name": "from_BUGG.mp3"}' \
+     -d '{"hr": 0.00, "conf": 0.0001, "audio_id": "test-id", "audio_rec": {"location": {"latitude": 0, "longitude": 0}}, "bucket_name": "snoskuter-detector-test", "blob_name": "other.mp3"}' \
      http://localhost:8080/process-audio