Correct code

birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py

@@ -1,9 +1,5 @@
 #! /usr/bin/env python3
 # birdnet_to_mqtt.py
-#
-# Adapted from : https://gist.github.com/deepcoder/c309087c456fc733435b47d83f4113ff
-# Adapted from : https://gist.github.com/JuanMeeske/08b839246a62ff38778f701fc1da5554
-#
 
 import time
 import re
@@ -15,6 +11,8 @@ import paho.mqtt.client as mqtt
 import subprocess
 import requests
 import sys
+import os
+
 sys.path.append('/home/pi/BirdNET-Pi/scripts/utils')
 from helpers import get_settings
 
@@ -23,16 +21,13 @@ flickr_images = {}
 conf = get_settings()
 settings_dict = dict(conf)
 
-# mqtt server
+# MQTT server configuration
-mqtt_server = "%%mqtt_server%%" # server for mqtt
+mqtt_server = "%%mqtt_server%%"
-mqtt_user = "%%mqtt_user%%"  # Replace with your MQTT username
+mqtt_user = "%%mqtt_user%%"
-mqtt_pass = "%%mqtt_pass%%"  # Replace with your MQTT password
+mqtt_pass = "%%mqtt_pass%%"
-mqtt_port = %%mqtt_port%% # port for mqtt
+mqtt_port = %%mqtt_port%%
 
-# mqtt topic for bird heard above threshold will be published
 mqtt_topic_confident_birds = 'birdnet'
-
-# url base for website that will be used to look up info about bird
 bird_lookup_url_base = 'http://en.wikipedia.org/wiki/'
 
 def on_connect(client, userdata, flags, rc, properties=None):
@@ -46,80 +41,65 @@ def get_bird_code(scientific_name):
     with open('/home/pi/BirdNET-Pi/scripts/ebird.php', 'r') as file:
         data = file.read()
 
-    # Extract the array from the PHP file
     array_str = re.search(r'\$ebirds = \[(.*?)\];', data, re.DOTALL).group(1)
 
-    # Convert the PHP array to a Python dictionary
     bird_dict = {re.search(r'"(.*?)"', line).group(1): re.search(r'=> "(.*?)"', line).group(1)
                  for line in array_str.split('\n') if '=>' in line}
 
-    # Return the corresponding value for the given bird's scientific name
     return bird_dict.get(scientific_name)
 
-# this little hack is to make each received record for the all birds section unique
-# the date and time that the log returns is only down to the 1 second accuracy, do
-# you can get multiple records with same date and time, this will make Home Assistant not
-# think there is a new reading so we add a incrementing tenth of second to each record received
 ts_noise = 0.0
 
-#try :
+mqttc = mqtt.Client('birdnet_mqtt')
-# connect to MQTT server
+mqttc.username_pw_set(mqtt_user, mqtt_pass)
-mqttc = mqtt.Client('birdnet_mqtt')  # Create instance of client with client ID
-mqttc.username_pw_set(mqtt_user, mqtt_pass) # Use credentials
-mqttc.connect(mqtt_server, mqtt_port)  # Connect to (broker, port, keepalive-time)
 mqttc.on_connect = on_connect
-mqttc.loop_start()
 
+try:
+    mqttc.connect(mqtt_server, mqtt_port)
+    mqttc.loop_start()
 
-# Call function
+    def automatic_mqtt_publish(file, detections):
-def automatic_mqtt_publish(species, confidence, confidencepct, path,
+        for detection in detections:
-                             date, time, week, latitude, longitude, cutoff,
+            bird = {}
-                             sens, overlap, settings_dict, db_path=DB_PATH):
+            bird['Date'] = file.date
+            bird['Time'] = file.time
+            bird['ScientificName'] = detection.scientific_name.replace('_', ' ')
+            bird['CommonName'] = detection.common_name
+            bird['Confidence'] = detection.confidence
+            bird['SpeciesCode'] = get_bird_code(detection.scientific_name)
+            bird['ClipName'] = os.path.basename(detection.file_name_ext)
+            bird['url'] = bird_lookup_url_base + detection.scientific_name
 
-        # the fields we want are separated by semicolons, so split
+            image_url = ""
-        high_bird_fields = raw_high_bird.split(';')
+            common_name = detection.common_name
+            if len(settings_dict.get('FLICKR_API_KEY', '')) > 0:
+                if common_name not in flickr_images:
+                    try:
+                        headers = {'User-Agent': 'Python_Flickr/1.0'}
+                        url = ('https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=' +
+                               str(settings_dict.get('FLICKR_API_KEY')) +
+                               '&text=' + str(common_name) + ' bird&sort=relevance&per_page=5&media=photos&format=json&license=2%2C3%2C4%2C5%2C6%2C9&nojsoncallback=1')
+                        resp = requests.get(url=url, headers=headers, timeout=10)
 
-        # build a structure in python that will be converted to json
+                        resp.encoding = "utf-8"
-        bird = {}
+                        data = resp.json()["photos"]["photo"][0]
 
-        #bird['ts'] = str(datetime.datetime.timestamp(dateparser.parse(raw_ts)))
+                        image_url = 'https://farm'+str(data["farm"])+'.static.flickr.com/'+str(data["server"])+'/'+str(data["id"])+'_'+str(data["secret"])+'_n.jpg'
-        bird['Date'] = date
+                        flickr_images[common_name] = image_url
-        bird['Time'] = time
+                    except Exception as e:
-        bird['ScientificName'] = sciName
+                        logging.error("FLICKR API ERROR: " + str(e))
-        bird['CommonName'] = comName
+                        image_url = ""
-        bird['Confidence'] = confidence
+                else:
-        bird['SpeciesCode'] = get_bird_code(sciName)
+                    image_url = flickr_images[common_name]
-        bird['ClipName'] = path
+                bird['Flickrimage'] = image_url
 
-        # build a url from scientific name of bird that can be used to lookup info about bird
+            json_bird = json.dumps(bird)
-        bird['url'] = bird_lookup_url_base + sciName.replace(' ', '_')
+            mqttc.publish(mqtt_topic_confident_birds, json_bird, 1)
+            logging.info('Posted to MQTT: ok')
 
-        # Flickimage
+except Exception as e:
-        image_url = ""
+    logging.error(f"An error occurred: {e}")
-        common_name = high_bird_fields[3]
-        if len(settings_dict.get('FLICKR_API_KEY')) > 0:
-            if common_name not in flickr_images:
-                try:
-                    headers = {'User-Agent': 'Python_Flickr/1.0'}
-                    url = ('https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=' + str(settings_dict.get('FLICKR_API_KEY')) +
-                           '&text=' + str(common_name) + ' bird&sort=relevance&per_page=5&media=photos&format=json&license=2%2C3%2C4%2C5%2C6%2C9&nojsoncallback=1')
-                    resp = requests.get(url=url, headers=headers, timeout=10)
 
-                    resp.encoding = "utf-8"
+finally:
-                    data = resp.json()["photos"]["photo"][0]
+    mqttc.loop_stop()
-
+    mqttc.disconnect()
-                    image_url = 'https://farm'+str(data["farm"])+'.static.flickr.com/'+str(data["server"])+'/'+str(data["id"])+'_'+str(data["secret"])+'_n.jpg'
-                    flickr_images[comName] = image_url
-                except Exception as e:
-                    print("FLICKR API ERROR: "+str(e))
-                    image_url = ""
-            else:
-                image_url = flickr_images[comName]
-            bird['Flickrimage'] = image_url
-
-        # convert to json string we can sent to mqtt
-        json_bird = json.dumps(bird)
-
-        print('Posted to MQTT : ok')
-
-        mqttc.publish(mqtt_topic_confident_birds, json_bird, 1)