Updating script/server.py to correct pep8 violations
Used 'autopep8 --in-place --aggressive scripts/server.py' as initial style fixes.
This commit is contained in:
+95
-44
@@ -1,3 +1,18 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
from tzlocal import get_localzone
|
||||||
|
import pytz
|
||||||
|
from time import sleep
|
||||||
|
import datetime
|
||||||
|
import sqlite3
|
||||||
|
import requests
|
||||||
|
import json
|
||||||
|
from decimal import Decimal
|
||||||
|
import time
|
||||||
|
import math
|
||||||
|
import numpy as np
|
||||||
|
import librosa
|
||||||
|
import operator
|
||||||
|
import argparse
|
||||||
import socket
|
import socket
|
||||||
import threading
|
import threading
|
||||||
import os
|
import os
|
||||||
@@ -6,25 +21,9 @@ os.environ['CUDA_VISIBLE_DEVICES'] = ''
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
import tflite_runtime.interpreter as tflite
|
import tflite_runtime.interpreter as tflite
|
||||||
except:
|
except BaseException:
|
||||||
from tensorflow import lite as tflite
|
from tensorflow import lite as tflite
|
||||||
|
|
||||||
import argparse
|
|
||||||
import operator
|
|
||||||
import librosa
|
|
||||||
import numpy as np
|
|
||||||
import math
|
|
||||||
import time
|
|
||||||
from decimal import Decimal
|
|
||||||
import json
|
|
||||||
import requests
|
|
||||||
import sqlite3
|
|
||||||
import datetime
|
|
||||||
from time import sleep
|
|
||||||
import pytz
|
|
||||||
from tzlocal import get_localzone
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
|
|
||||||
HEADER = 64
|
HEADER = 64
|
||||||
PORT = 5050
|
PORT = 5050
|
||||||
@@ -36,12 +35,11 @@ DISCONNECT_MESSAGE = "!DISCONNECT"
|
|||||||
server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
try:
|
try:
|
||||||
server.bind(ADDR)
|
server.bind(ADDR)
|
||||||
except:
|
except BaseException:
|
||||||
print("Waiting on socket")
|
print("Waiting on socket")
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Open most recent Configuration and grab DB_PWD as a python variable
|
# Open most recent Configuration and grab DB_PWD as a python variable
|
||||||
userDir = os.path.expanduser('~')
|
userDir = os.path.expanduser('~')
|
||||||
with open(userDir + '/BirdNET-Pi/scripts/thisrun.txt', 'r') as f:
|
with open(userDir + '/BirdNET-Pi/scripts/thisrun.txt', 'r') as f:
|
||||||
@@ -60,7 +58,7 @@ def loadModel():
|
|||||||
|
|
||||||
# Load TFLite model and allocate tensors.
|
# Load TFLite model and allocate tensors.
|
||||||
modelpath = userDir + '/BirdNET-Pi/model/BirdNET_6K_GLOBAL_MODEL.tflite'
|
modelpath = userDir + '/BirdNET-Pi/model/BirdNET_6K_GLOBAL_MODEL.tflite'
|
||||||
myinterpreter = tflite.Interpreter(model_path=modelpath,num_threads=2)
|
myinterpreter = tflite.Interpreter(model_path=modelpath, num_threads=2)
|
||||||
myinterpreter.allocate_tensors()
|
myinterpreter.allocate_tensors()
|
||||||
|
|
||||||
# Get input and output tensors.
|
# Get input and output tensors.
|
||||||
@@ -83,6 +81,7 @@ def loadModel():
|
|||||||
|
|
||||||
return myinterpreter
|
return myinterpreter
|
||||||
|
|
||||||
|
|
||||||
def loadCustomSpeciesList(path):
|
def loadCustomSpeciesList(path):
|
||||||
|
|
||||||
slist = []
|
slist = []
|
||||||
@@ -93,6 +92,7 @@ def loadCustomSpeciesList(path):
|
|||||||
|
|
||||||
return slist
|
return slist
|
||||||
|
|
||||||
|
|
||||||
def splitSignal(sig, rate, overlap, seconds=3.0, minlen=1.5):
|
def splitSignal(sig, rate, overlap, seconds=3.0, minlen=1.5):
|
||||||
|
|
||||||
# Split signal with overlap
|
# Split signal with overlap
|
||||||
@@ -114,6 +114,7 @@ def splitSignal(sig, rate, overlap, seconds=3.0, minlen=1.5):
|
|||||||
|
|
||||||
return sig_splits
|
return sig_splits
|
||||||
|
|
||||||
|
|
||||||
def readAudioData(path, overlap, sample_rate=48000):
|
def readAudioData(path, overlap, sample_rate=48000):
|
||||||
|
|
||||||
print('READING AUDIO DATA...', end=' ', flush=True)
|
print('READING AUDIO DATA...', end=' ', flush=True)
|
||||||
@@ -128,6 +129,7 @@ def readAudioData(path, overlap, sample_rate=48000):
|
|||||||
|
|
||||||
return chunks
|
return chunks
|
||||||
|
|
||||||
|
|
||||||
def convertMetadata(m):
|
def convertMetadata(m):
|
||||||
|
|
||||||
# Convert week to cosine
|
# Convert week to cosine
|
||||||
@@ -145,9 +147,11 @@ def convertMetadata(m):
|
|||||||
|
|
||||||
return np.concatenate([m, mask])
|
return np.concatenate([m, mask])
|
||||||
|
|
||||||
|
|
||||||
def custom_sigmoid(x, sensitivity=1.0):
|
def custom_sigmoid(x, sensitivity=1.0):
|
||||||
return 1 / (1.0 + np.exp(-sensitivity * x))
|
return 1 / (1.0 + np.exp(-sensitivity * x))
|
||||||
|
|
||||||
|
|
||||||
def predict(sample, sensitivity):
|
def predict(sample, sensitivity):
|
||||||
global INTERPRETER
|
global INTERPRETER
|
||||||
# Make a prediction
|
# Make a prediction
|
||||||
@@ -173,6 +177,7 @@ def predict(sample, sensitivity):
|
|||||||
# Only return first the top ten results
|
# Only return first the top ten results
|
||||||
return p_sorted[:10]
|
return p_sorted[:10]
|
||||||
|
|
||||||
|
|
||||||
def analyzeAudioData(chunks, lat, lon, week, sensitivity, overlap,):
|
def analyzeAudioData(chunks, lat, lon, week, sensitivity, overlap,):
|
||||||
global INTERPRETER
|
global INTERPRETER
|
||||||
|
|
||||||
@@ -203,6 +208,7 @@ def analyzeAudioData(chunks, lat, lon, week, sensitivity, overlap,):
|
|||||||
|
|
||||||
return detections
|
return detections
|
||||||
|
|
||||||
|
|
||||||
def writeResultsToFile(detections, min_conf, path):
|
def writeResultsToFile(detections, min_conf, path):
|
||||||
|
|
||||||
print('WRITING RESULTS TO', path, '...', end=' ')
|
print('WRITING RESULTS TO', path, '...', end=' ')
|
||||||
@@ -211,12 +217,14 @@ def writeResultsToFile(detections, min_conf, path):
|
|||||||
rfile.write('Start (s);End (s);Scientific name;Common name;Confidence\n')
|
rfile.write('Start (s);End (s);Scientific name;Common name;Confidence\n')
|
||||||
for d in detections:
|
for d in detections:
|
||||||
for entry in detections[d]:
|
for entry in detections[d]:
|
||||||
if entry[1] >= min_conf and ((entry[0] in INCLUDE_LIST or len(INCLUDE_LIST) == 0) and (entry[0] not in EXCLUDE_LIST or len(EXCLUDE_LIST) == 0) ):
|
if entry[1] >= min_conf and ((entry[0] in INCLUDE_LIST or len(INCLUDE_LIST) == 0)
|
||||||
|
and (entry[0] not in EXCLUDE_LIST or len(EXCLUDE_LIST) == 0)):
|
||||||
rfile.write(d + ';' + entry[0].replace('_', ';') + ';' + str(entry[1]) + '\n')
|
rfile.write(d + ';' + entry[0].replace('_', ';') + ';' + str(entry[1]) + '\n')
|
||||||
rcnt += 1
|
rcnt += 1
|
||||||
print('DONE! WROTE', rcnt, 'RESULTS.')
|
print('DONE! WROTE', rcnt, 'RESULTS.')
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
def handle_client(conn, addr):
|
def handle_client(conn, addr):
|
||||||
global INCLUDE_LIST
|
global INCLUDE_LIST
|
||||||
global EXCLUDE_LIST
|
global EXCLUDE_LIST
|
||||||
@@ -245,8 +253,7 @@ def handle_client(conn, addr):
|
|||||||
args.sensitivity = 1.25
|
args.sensitivity = 1.25
|
||||||
args.min_conf = 0.70
|
args.min_conf = 0.70
|
||||||
args.lat = -1
|
args.lat = -1
|
||||||
args.lon = -1
|
args.lon = -1
|
||||||
|
|
||||||
|
|
||||||
for line in msg.split('||'):
|
for line in msg.split('||'):
|
||||||
inputvars = line.split('=')
|
inputvars = line.split('=')
|
||||||
@@ -273,8 +280,6 @@ def handle_client(conn, addr):
|
|||||||
elif inputvars[0] == 'lon':
|
elif inputvars[0] == 'lon':
|
||||||
args.lon = float(inputvars[1])
|
args.lon = float(inputvars[1])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Load custom species lists - INCLUDED and EXCLUDED
|
# Load custom species lists - INCLUDED and EXCLUDED
|
||||||
if not args.include_list == 'null':
|
if not args.include_list == 'null':
|
||||||
INCLUDE_LIST = loadCustomSpeciesList(args.include_list)
|
INCLUDE_LIST = loadCustomSpeciesList(args.include_list)
|
||||||
@@ -328,23 +333,24 @@ def handle_client(conn, addr):
|
|||||||
# Write detections to Database
|
# Write detections to Database
|
||||||
myReturn = ''
|
myReturn = ''
|
||||||
for i in detections:
|
for i in detections:
|
||||||
myReturn += str(i) + '-' + str(detections[i][0]) + '\n'
|
myReturn += str(i) + '-' + str(detections[i][0]) + '\n'
|
||||||
|
|
||||||
|
|
||||||
with open(userDir + '/BirdNET-Pi/BirdDB.txt', 'a') as rfile:
|
with open(userDir + '/BirdNET-Pi/BirdDB.txt', 'a') as rfile:
|
||||||
for d in detections:
|
for d in detections:
|
||||||
for entry in detections[d]:
|
for entry in detections[d]:
|
||||||
if entry[1] >= min_conf and ((entry[0] in INCLUDE_LIST or len(INCLUDE_LIST) == 0) and (entry[0] not in EXCLUDE_LIST or len(EXCLUDE_LIST) == 0) ):
|
if entry[1] >= min_conf and ((entry[0] in INCLUDE_LIST or len(INCLUDE_LIST) == 0) and (
|
||||||
rfile.write(str(current_date) + ';' + str(current_time) + ';' + entry[0].replace('_', ';') + ';' \
|
entry[0] not in EXCLUDE_LIST or len(EXCLUDE_LIST) == 0)):
|
||||||
+ str(entry[1]) +";" + str(args.lat) + ';' + str(args.lon) + ';' + str(min_conf) + ';' + str(week) + ';' \
|
rfile.write(str(current_date) + ';' + str(current_time) + ';' + entry[0].replace('_', ';') + ';'
|
||||||
+ str(args.sensitivity) +';' + str(args.overlap) + '\n')
|
+ str(entry[1]) + ";" + str(args.lat) + ';' + str(args.lon) +
|
||||||
|
';' + str(min_conf) + ';' + str(week) + ';'
|
||||||
|
+ str(args.sensitivity) + ';' + str(args.overlap) + '\n')
|
||||||
|
|
||||||
Date = str(current_date)
|
Date = str(current_date)
|
||||||
Time = str(current_time)
|
Time = str(current_time)
|
||||||
species = entry[0]
|
species = entry[0]
|
||||||
Sci_Name,Com_Name = species.split('_')
|
Sci_Name, Com_Name = species.split('_')
|
||||||
score = entry[1]
|
score = entry[1]
|
||||||
Confidence = str(round(score*100))
|
Confidence = str(round(score * 100))
|
||||||
Lat = str(args.lat)
|
Lat = str(args.lat)
|
||||||
Lon = str(args.lon)
|
Lon = str(args.lon)
|
||||||
Cutoff = str(args.min_conf)
|
Cutoff = str(args.min_conf)
|
||||||
@@ -353,34 +359,77 @@ def handle_client(conn, addr):
|
|||||||
Overlap = str(args.overlap)
|
Overlap = str(args.overlap)
|
||||||
Com_Name = Com_Name.replace("'", "")
|
Com_Name = Com_Name.replace("'", "")
|
||||||
File_Name = Com_Name.replace(" ", "_") + '-' + Confidence + '-' + \
|
File_Name = Com_Name.replace(" ", "_") + '-' + Confidence + '-' + \
|
||||||
Date.replace("/", "-") + '-birdnet-' + Time + audiofmt
|
Date.replace("/", "-") + '-birdnet-' + Time + audiofmt
|
||||||
|
|
||||||
#Connect to SQLite Database
|
# Connect to SQLite Database
|
||||||
for attempt_number in range(3):
|
for attempt_number in range(3):
|
||||||
try:
|
try:
|
||||||
con = sqlite3.connect(userDir + '/BirdNET-Pi/scripts/birds.db')
|
con = sqlite3.connect(userDir + '/BirdNET-Pi/scripts/birds.db')
|
||||||
cur = con.cursor()
|
cur = con.cursor()
|
||||||
cur.execute("INSERT INTO detections VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", (Date, Time, Sci_Name, Com_Name, str(score), Lat, Lon, Cutoff, Week, Sens, Overlap, File_Name))
|
cur.execute(
|
||||||
|
"INSERT INTO detections VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||||
|
(Date,
|
||||||
|
Time,
|
||||||
|
Sci_Name,
|
||||||
|
Com_Name,
|
||||||
|
str(score),
|
||||||
|
Lat,
|
||||||
|
Lon,
|
||||||
|
Cutoff,
|
||||||
|
Week,
|
||||||
|
Sens,
|
||||||
|
Overlap,
|
||||||
|
File_Name))
|
||||||
|
|
||||||
con.commit()
|
con.commit()
|
||||||
con.close()
|
con.close()
|
||||||
break
|
break
|
||||||
except:
|
except BaseException:
|
||||||
print("Database busy")
|
print("Database busy")
|
||||||
time.sleep(2)
|
time.sleep(2)
|
||||||
|
|
||||||
print(str(current_date) + ';' + str(current_time) + ';' + entry[0].replace('_', ';') + ';' + str(entry[1]) + ';' + str(args.lat) + ';' + str(args.lon) + ';' + str(min_conf) + ';' + str(week) + ';' + str(args.sensitivity) +';' + str(args.overlap) + Com_Name.replace(" ", "_") + '-' + str(score) + '-' + str(current_date) + '-birdnet-' + str(current_time) + audiofmt + '\n')
|
print(str(current_date) +
|
||||||
|
';' +
|
||||||
|
str(current_time) +
|
||||||
|
';' +
|
||||||
|
entry[0].replace('_', ';') +
|
||||||
|
';' +
|
||||||
|
str(entry[1]) +
|
||||||
|
';' +
|
||||||
|
str(args.lat) +
|
||||||
|
';' +
|
||||||
|
str(args.lon) +
|
||||||
|
';' +
|
||||||
|
str(min_conf) +
|
||||||
|
';' +
|
||||||
|
str(week) +
|
||||||
|
';' +
|
||||||
|
str(args.sensitivity) +
|
||||||
|
';' +
|
||||||
|
str(args.overlap) +
|
||||||
|
Com_Name.replace(" ", "_") +
|
||||||
|
'-' +
|
||||||
|
str(score) +
|
||||||
|
'-' +
|
||||||
|
str(current_date) +
|
||||||
|
'-birdnet-' +
|
||||||
|
str(current_time) +
|
||||||
|
audiofmt +
|
||||||
|
'\n')
|
||||||
|
|
||||||
if birdweather_id != "99999":
|
if birdweather_id != "99999":
|
||||||
try:
|
try:
|
||||||
|
|
||||||
if soundscape_uploaded is False:
|
if soundscape_uploaded is False:
|
||||||
# POST soundscape to server
|
# POST soundscape to server
|
||||||
soundscape_url = "https://app.birdweather.com/api/v1/stations/" + birdweather_id + "/soundscapes" + "?timestamp=" + current_iso8601
|
soundscape_url = "https://app.birdweather.com/api/v1/stations/" + \
|
||||||
|
birdweather_id + "/soundscapes" + "?timestamp=" + current_iso8601
|
||||||
|
|
||||||
with open(args.i, 'rb') as f:
|
with open(args.i, 'rb') as f:
|
||||||
wav_data = f.read()
|
wav_data = f.read()
|
||||||
response = requests.post(url=soundscape_url, data=wav_data, headers={'Content-Type': 'application/octet-stream'})
|
response = requests.post(
|
||||||
|
url=soundscape_url, data=wav_data, headers={
|
||||||
|
'Content-Type': 'application/octet-stream'})
|
||||||
print("Soundscape POST Response Status - ", response.status_code)
|
print("Soundscape POST Response Status - ", response.status_code)
|
||||||
sdata = response.json()
|
sdata = response.json()
|
||||||
soundscape_id = sdata['soundscape']['id']
|
soundscape_id = sdata['soundscape']['id']
|
||||||
@@ -393,7 +442,7 @@ def handle_client(conn, addr):
|
|||||||
post_begin = "{ "
|
post_begin = "{ "
|
||||||
now_p_start = now + datetime.timedelta(seconds=float(start_time))
|
now_p_start = now + datetime.timedelta(seconds=float(start_time))
|
||||||
current_iso8601 = now_p_start.astimezone(get_localzone()).isoformat()
|
current_iso8601 = now_p_start.astimezone(get_localzone()).isoformat()
|
||||||
post_timestamp = "\"timestamp\": \"" + current_iso8601 + "\","
|
post_timestamp = "\"timestamp\": \"" + current_iso8601 + "\","
|
||||||
post_lat = "\"lat\": " + str(args.lat) + ","
|
post_lat = "\"lat\": " + str(args.lat) + ","
|
||||||
post_lon = "\"lon\": " + str(args.lon) + ","
|
post_lon = "\"lon\": " + str(args.lon) + ","
|
||||||
post_soundscape_id = "\"soundscapeId\": " + str(soundscape_id) + ","
|
post_soundscape_id = "\"soundscapeId\": " + str(soundscape_id) + ","
|
||||||
@@ -405,18 +454,20 @@ def handle_client(conn, addr):
|
|||||||
post_confidence = "\"confidence\": " + str(entry[1])
|
post_confidence = "\"confidence\": " + str(entry[1])
|
||||||
post_end = " }"
|
post_end = " }"
|
||||||
|
|
||||||
post_json = post_begin + post_timestamp + post_lat + post_lon + post_soundscape_id + post_soundscape_start_time + post_soundscape_end_time + post_commonName + post_scientificName + post_algorithm + post_confidence + post_end
|
post_json = post_begin + post_timestamp + post_lat + post_lon + post_soundscape_id + post_soundscape_start_time + \
|
||||||
|
post_soundscape_end_time + post_commonName + post_scientificName + post_algorithm + post_confidence + post_end
|
||||||
print(post_json)
|
print(post_json)
|
||||||
response = requests.post(detection_url, json=json.loads(post_json))
|
response = requests.post(detection_url, json=json.loads(post_json))
|
||||||
print("Detection POST Response Status - ", response.status_code)
|
print("Detection POST Response Status - ", response.status_code)
|
||||||
except:
|
except BaseException:
|
||||||
print("Cannot POST right now")
|
print("Cannot POST right now")
|
||||||
conn.send(myReturn.encode(FORMAT))
|
conn.send(myReturn.encode(FORMAT))
|
||||||
|
|
||||||
#time.sleep(3)
|
# time.sleep(3)
|
||||||
|
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
def start():
|
def start():
|
||||||
# Load model
|
# Load model
|
||||||
global INTERPRETER, INCLUDE_LIST, EXCLUDE_LIST
|
global INTERPRETER, INCLUDE_LIST, EXCLUDE_LIST
|
||||||
|
|||||||
Reference in New Issue
Block a user