From 1b247fbddd85a5032b1ee2e14013b357fa78ddb5 Mon Sep 17 00:00:00 2001 From: Patrick McGuire Date: Mon, 29 Nov 2021 11:00:17 -0500 Subject: [PATCH] adding new aesthetic changes and preparing for birdweather changes --- homepage/index.html | 71 ++++++++++--------- homepage/menu.html | 16 ++--- homepage/mobile.html | 14 +++- homepage/style.css | 23 ++++--- homepage/top.html | 69 ++++++++++--------- requirements.txt | 40 +++++++++++ scripts/daily_plot.py | 62 +++++++++++++++++ scripts/install_birdnet.sh | 4 +- scripts/install_noip2.sh | 3 +- scripts/install_services.sh | 19 ++++++ scripts/overview.php | 131 ++++++++++++++++++++++++++++++++++++ scripts/spectrogram.php | 2 +- scripts/update_services.sh | 21 +++++- scripts/viewday.php | 97 ++++++++++++++++++++++++++ 14 files changed, 478 insertions(+), 94 deletions(-) create mode 100644 requirements.txt create mode 100755 scripts/daily_plot.py create mode 100644 scripts/overview.php create mode 100644 scripts/viewday.php diff --git a/homepage/index.html b/homepage/index.html index 9d2922c..ce4d4d4 100644 --- a/homepage/index.html +++ b/homepage/index.html @@ -1,45 +1,42 @@ - - -BirdNET-Pi - - - - + + + + - - - - - - - - - + + + + + + + + - --> + + <p>This section (everything between the 'noframes' tags) will only be displayed if the users' browser doesn't support frames. You can provide a link to a non-frames version of the website here. Feel free to use HTML tags within this section.</p> + - - <p>This section (everything between the 'noframes' tags) will only be displayed if the users' browser doesn't support frames. You can provide a link to a non-frames version of the website here. Feel free to use HTML tags within this section.</p> - - - + diff --git a/homepage/menu.html b/homepage/menu.html index 6feb129..a1e0d3e 100644 --- a/homepage/menu.html +++ b/homepage/menu.html @@ -34,7 +34,7 @@ hr {

Extractions

-

+

By Date
By Common Name
By Scientific Name
@@ -43,28 +43,28 @@ hr {

System Links

-

+

Tools
System Info
-BirdNET-Lite Log
+BirdNET-Lite Log
-Extraction Log
+Extraction Log

External Links

-

+

Repository
Wiki Help Page
-Wttr.in Report
+Wttr.in Report
Cornell Lab of Ornithology

Other
BirdNET-Pis

-United States, -South Africa, +United States
+South Africa
Germany

diff --git a/homepage/mobile.html b/homepage/mobile.html index 355ec31..90986c6 100644 --- a/homepage/mobile.html +++ b/homepage/mobile.html @@ -324,9 +324,21 @@ footer {

+

+ + 🐦 Overview + +

+

+

+ + 🐦 Today's Top 10 + +

+

- 🐦 Recognized Birds + 🐦 View the Database

diff --git a/homepage/style.css b/homepage/style.css index 5ef8516..55a78e6 100644 --- a/homepage/style.css +++ b/homepage/style.css @@ -7,12 +7,21 @@ display: flex; } +.column1 { + flex: 70%; +} + +.column2 { + flex: 30%; +} + .column { flex: 50%; padding-right: 5px; } table { + background-color: rgb(219, 255, 235); margin: 0 auto; font-size: large; border-collapse: collapse; @@ -37,18 +46,13 @@ h2 { ' Calibri', 'Trebuchet MS', 'sans-serif'; } -td { - background-color: rgb(119, 196, 135); - border: 1px solid black; -} - th, td { + background-color: rgb(219, 255, 235); font-weight: bold; border: 1px solid black; padding: 10px; text-align: center; - background-color: rgb(219, 296, 235); } @media screen and (max-width: 800px) { @@ -57,6 +61,7 @@ td { width: 100%; } table { + background-color: rgb(219, 255, 235); margin: 0 auto; font-size: medium; border-collapse: collapse; @@ -81,13 +86,9 @@ td { ' Calibri', 'Trebuchet MS', 'sans-serif'; } - td { - background-color: rgb(119, 196, 135); - border: 1px solid black; - } - th, td { + background-color: rgb(219, 255, 235); font-weight: bold; border: 1px solid black; padding: 10px; diff --git a/homepage/top.html b/homepage/top.html index 009bf50..8308b52 100644 --- a/homepage/top.html +++ b/homepage/top.html @@ -1,45 +1,50 @@ - - BirdNET-Pi - - - -

BirdNET-Pi

- -

- Database View | - Spectrogram View -

- + + + + +

+ +

BirdNET-Pi

+ +

+ Overview | + Database View | + Today View | + Spectrogram View +

+ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e1cb996 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,40 @@ +appdirs +audioread +certifi +cffi +charset-normalizer +colorama +cycler +decorator +idna +joblib +kiwisolver +librosa +llvmlite +matplotlib +mysql-connector-python +numba +numpy +packaging +pandas +Pillow +pip +pkg_resources +pooch +protobuf +pycparser +pyparsing +python-dateutil +pytz +requests +resampy +scikit-learn +scipy +seaborn +setuptools +six +SoundFile +tflite-runtime +threadpoolctl +urllib3 +wheel diff --git a/scripts/daily_plot.py b/scripts/daily_plot.py new file mode 100755 index 0000000..26d777d --- /dev/null +++ b/scripts/daily_plot.py @@ -0,0 +1,62 @@ +#!/home/pi/BirdNET-Pi/birdnet/bin/python3 +import pandas as pd +import seaborn as sns +# import numpy as np +import matplotlib.pyplot as plt +from datetime import datetime +import textwrap + +#Read database into Pandas dataframe +df = pd.read_csv('~/BirdNET-Pi/BirdDB.txt', sep=';') + +#Convert Date and Time Fields to Panda's format +df['Date']=pd.to_datetime(df['Date']) +df['Time']=pd.to_datetime(df['Time']) + + +#Create separate dataframes for separate locations +df_clt=df[df.Lat == 35.0] + +now = datetime.now() +df_clt_today = df_clt[df_clt['Date']==now.strftime("%d-%m-%y")] + +#Get top 10 today +clt_top10_today=(df_clt_today['Com_Name'].value_counts()[:10]) +df_clt_top10_today = df_clt_today[df_clt_today.Com_Name.isin(clt_top10_today.index)] + +pal = "Greens" + +#Set up plot axes and titles +plot=sns.countplot(y='Com_Name', data = df_clt_top10_today, order = pd.value_counts(df_clt_top10_today['Com_Name']).iloc[:10].index) +plot.set_yticklabels(['\n'.join(textwrap.wrap(ticklabel.get_text(),15)) for ticklabel in plot.get_yticklabels()]) +plot.set_title('Top 10 Today --'+ str(now.strftime(" Last updated %B %d, %Y %I:%M%P"))) +plot.set_xlabel("Detections", fontsize = 12) +plot.set_ylabel("", fontsize = 12) +plt.tight_layout() + +#Save plot +savename='/home/pi/BirdSongs/Extracted/Top_10_Today-'+str(now.strftime("%d-%m-%Y"))+'.png' +plt.savefig(savename) +plt.clf() + +#Generate heatmap plot +df_clt_top10_today['Hour'] = [r.hour for r in df_clt_top10_today.Time] +heat = pd.crosstab(df_clt_top10_today['Com_Name'],df_clt_top10_today['Hour']) + + + +plot = sns.heatmap(heat, annot=True, annot_kws={"fontsize":7}, cmap = "gray_r", square = False, cbar=False, linewidths = 0) +plot.set_yticklabels(['\n'.join(textwrap.wrap(ticklabel.get_text(),15)) for ticklabel in plot.get_yticklabels()]) +plot.set_title('Phenology --'+ str(now.strftime(" Last updated %B %d, %Y %I:%M%P"))) +plot.set_xlabel("Hour (24h)", fontsize = 12) +plot.set_ylabel("", fontsize = 12) +plt.tight_layout() + +#Save plot +savename='/home/pi/BirdSongs/Extracted/When_today-'+str(now.strftime("%d-%m-%Y"))+'.png' +plt.savefig(savename) + +plt.clf() + + + diff --git a/scripts/install_birdnet.sh b/scripts/install_birdnet.sh index 6d00d4d..3e7b49f 100755 --- a/scripts/install_birdnet.sh +++ b/scripts/install_birdnet.sh @@ -52,7 +52,6 @@ install_birdnet() { source ./birdnet/bin/activate echo "Upgrading pip, wheel, and setuptools" pip3 install --upgrade pip wheel setuptools -set -x python_version="$(awk -F. '{print $2}' <(ls -l $(which /usr/bin/python3)))" echo "python_version=${python_version}" # TFLite Pre-built binaires from https://github.com/PINTO0309/TensorflowLite-bin @@ -67,13 +66,14 @@ set -x echo "Installing the TFLite bin wheel" pip3 install --upgrade tflite_runtime-2.6.0-cp39-none-linux_aarch64.whl fi -set +x echo "Installing colorama==0.4.4" pip3 install colorama==0.4.4 echo "Installing librosa" pip3 install librosa echo "Installing mysql-connector-python" pip3 install mysql-connector-python + echo "Making sure everything else is installed" + pip3 install -U -r /home/pi/BirdNET-Pi/requirements.txt } read -sp "\ diff --git a/scripts/install_noip2.sh b/scripts/install_noip2.sh index 565d340..b23a71e 100755 --- a/scripts/install_noip2.sh +++ b/scripts/install_noip2.sh @@ -5,5 +5,6 @@ tar -vzxf noip-duc-linux.tar.gz cd noip-2* make make install -sed '/^exit 0$/i \/usr\/local\/bin\/noip2' /etc/rc.local +chmod a+wr /usr/local/etc/no-ip2.conf +sed -i '/^exit 0$/i \/usr\/local\/bin\/noip2' /etc/rc.local noip2 -S diff --git a/scripts/install_services.sh b/scripts/install_services.sh index 48be958..161e430 100755 --- a/scripts/install_services.sh +++ b/scripts/install_services.sh @@ -302,6 +302,24 @@ EOF systemctl enable spectrogram_viewer.service } +install_chart_viewer_service() { + echo "Installing the chart_viewer.service" + cat << EOF > /etc/systemd/system/chart_viewer.service +[Unit] +Description=BirdNET-Pi Chart Viewer Service + +[Service] +Restart=always +RestartSec=300 +Type=simple +User=pi +ExecStart=/usr/local/bin/daily_plot.py +[Install] +WantedBy=multi-user.target +EOF + sudo systemctl enable chart_viewer.service +} + install_gotty_logs() { echo "Installing GoTTY logging" if ! which gotty &> /dev/null;then @@ -492,6 +510,7 @@ install_selected_services() { install_sox install_mariadb install_spectrogram_service + install_chart_viewer_service install_edit_birdnet_conf install_pushed_notifications diff --git a/scripts/overview.php b/scripts/overview.php new file mode 100644 index 0000000..671f4a9 --- /dev/null +++ b/scripts/overview.php @@ -0,0 +1,131 @@ + connect_error) { + die('Connect Error (' . + $mysqli->connect_errno . ') '. + $mysqli->connect_error); +} + +// SQL query to select data from database +$sql0 = "SELECT * FROM detections"; +$fulltable = $mysqli->query($sql0); +$totalcount = mysqli_num_rows($fulltable); + +$sql1 = "SELECT Com_Name, Date, Time FROM detections + ORDER BY Date DESC, Time DESC LIMIT 1"; +$mostrecent = $mysqli->query($sql1); + +$sql2 = "SELECT * FROM detections + WHERE Date = CURDATE()"; +$todaystable = $mysqli->query($sql2); +$todayscount = mysqli_num_rows($todaystable); + + +$sql3 = "SELECT * FROM detections + WHERE Date = CURDATE() + AND Time >= DATE_SUB(NOW(),INTERVAL 1 HOUR)"; +$lasthourtable = $mysqli->query($sql3); +$lasthourcount = mysqli_num_rows($lasthourtable); + +$sql4 = "SELECT Com_Name, Date, Time, MAX(Confidence) + FROM detections + WHERE Date = CURDATE() + GROUP BY Com_Name + ORDER BY MAX(Confidence) DESC"; +$specieslist = $mysqli->query($sql4); +$speciescount = mysqli_num_rows($specieslist); + +$mysqli->close(); +?> + + + + + + + + Overview + + + + + + + +

Overview

+

+

+fetch_assoc()) +{ +?> + + + + + + + +

Most Recent Detection

+

+

+ + +

+

+ + + + + + + + + + + + + +

	Total	Today	Last Hour
Number of Detections

+

+

+ + + + + +

Species Detected Today

+

+

+

Today's Top 10 Species

+

+

Currently Analyzing

+

+ diff --git a/scripts/spectrogram.php b/scripts/spectrogram.php index 6b43be7..57b9496 100644 --- a/scripts/spectrogram.php +++ b/scripts/spectrogram.php @@ -1,5 +1,5 @@ "; -echo "

"; ?> +

diff --git a/scripts/update_services.sh b/scripts/update_services.sh index df4d35b..af149ed 100755 --- a/scripts/update_services.sh +++ b/scripts/update_services.sh @@ -7,7 +7,7 @@ USER=pi HOME=/home/pi my_dir=${HOME}/BirdNET-Pi/scripts tmpfile=$(mktemp) -nomachine_url="https://download.nomachine.com/download/7.6/Arm/nomachine_7.6.2_3_arm64.deb" +nomachine_url="https://download.nomachine.com/download/7.7/Arm/nomachine_7.7.4_1_arm64.deb" gotty_url="https://github.com/yudai/gotty/releases/download/v1.0.1/gotty_linux_arm.tar.gz" config_file="$(dirname ${my_dir})/birdnet.conf" @@ -300,6 +300,24 @@ EOF systemctl enable spectrogram_viewer.service } +install_chart_viewer_service() { + echo "Installing the chart_viewer.service" + cat << EOF > /etc/systemd/system/chart_viewer.service +[Unit] +Description=BirdNET-Pi Chart Viewer Service + +[Service] +Restart=always +RestartSec=300 +Type=simple +User=pi +ExecStart=/usr/local/bin/daily_plot.py +[Install] +WantedBy=multi-user.target +EOF + sudo systemctl enable chart_viewer.service +} + install_gotty_logs() { echo "Installing GoTTY logging" if ! which gotty &> /dev/null;then @@ -489,6 +507,7 @@ install_selected_services() { install_sox install_mariadb install_spectrogram_service + install_chart_viewer_service install_edit_birdnet_conf install_pushed_notifications diff --git a/scripts/viewday.php b/scripts/viewday.php new file mode 100644 index 0000000..a17a7a4 --- /dev/null +++ b/scripts/viewday.php @@ -0,0 +1,97 @@ +connect_error) { + die('Connect Error (' . + $mysqli->connect_errno . ') '. + $mysqli->connect_error); +} + +// SQL query to select data from database + +$sql1 = "SELECT * FROM detections + WHERE Date = CURDATE() + ORDER BY Date DESC, Time DESC"; +$mosttable = $mysqli->query($sql1); + +$sql2 = "SELECT * FROM detections + WHERE Date = CURDATE()"; +$todaystable = $mysqli->query($sql2); +$todayscount=mysqli_num_rows($todaystable); + + +$sql3 = "SELECT * FROM detections + WHERE Date = CURDATE() + AND Time >= DATE_SUB(NOW(),INTERVAL 1 HOUR)"; +$lasthourtable = $mysqli->query($sql3); +$lasthourcount=mysqli_num_rows($lasthourtable); + +$sql4 = "SELECT Com_Name, Date, Time, MAX(Confidence) + FROM detections + WHERE Date = CURDATE() + GROUP BY Com_Name + ORDER BY MAX(Confidence) DESC"; +$specieslist = $mysqli->query($sql4); +$speciescount=mysqli_num_rows($specieslist); + +$mysqli->close(); +?> + + + + + + + + Today's View + + + + + + + + +

+

+

+

Number of Detections

+ + + + + + + + + + + + + +

Today	Last Hour	Number of Unique Species Today

+ +

+ +

+

+ + +

+