From a72c8a40fbd0a16f30b035825a4d714020d6d797 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:24:43 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/noise_processing.yml | 5 ++-- noise_processing.py | 36 ++++++++++++-------------- requirements_noise.txt | 6 ++--- tests/test_ooi.py | 1 + tests/test_spectrograms.py | 1 + 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/noise_processing.yml b/.github/workflows/noise_processing.yml index f7f35b3e..81b7cc3d 100644 --- a/.github/workflows/noise_processing.yml +++ b/.github/workflows/noise_processing.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: # schedule: # - cron: '9 * * * *' - + jobs: process: runs-on: ubuntu-latest @@ -22,7 +22,7 @@ jobs: python -m pip install -U setuptools wheel python -m pip install -r requirements_noise.txt - + - name: Install ffmpeg run: | sudo apt-get update @@ -43,4 +43,3 @@ jobs: with: commit_message: Commit to Github file_pattern: 'img/*.png' - diff --git a/noise_processing.py b/noise_processing.py index b4098b15..9a2030b6 100644 --- a/noise_processing.py +++ b/noise_processing.py @@ -1,46 +1,44 @@ # importing general Python libraries -import pandas as pd import datetime as dt import os + import matplotlib.pyplot as plt -import pytz +import pandas as pd import plotly.graph_objects as go +import pytz +from orcasound_noise.pipeline.acoustic_util import plot_bb, plot_spec # importing orcasound_noise libraries from orcasound_noise.pipeline.pipeline import NoiseAnalysisPipeline from orcasound_noise.utils import Hydrophone -from orcasound_noise.pipeline.acoustic_util import plot_spec, plot_bb - # Set Location and Resolution # Port Townsend, 1 Hz Frequency, 60-second samples -if __name__ == '__main__': - pipeline = NoiseAnalysisPipeline(Hydrophone.PORT_TOWNSEND, - delta_f=10, bands=None, - delta_t=60, mode='safe') - - +if __name__ == "__main__": + pipeline = NoiseAnalysisPipeline( + Hydrophone.PORT_TOWNSEND, delta_f=10, bands=None, delta_t=60, mode="safe" + ) # Generate parquet dataframes with noise levels for a time period -now = dt.datetime.now(pytz.timezone('US/Pacific')) -psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 6), - now - dt.timedelta(hours = 1), - upload_to_s3=False) +now = dt.datetime.now(pytz.timezone("US/Pacific")) +psd_path, broadband_path = pipeline.generate_parquet_file( + now - dt.timedelta(hours=6), now - dt.timedelta(hours=1), upload_to_s3=False +) # Read the parquet files psd_df = pd.read_parquet(psd_path) bb_df = pd.read_parquet(broadband_path) # Create a new directory if it does not exist -if not os.path.exists('img'): - os.makedirs('img') +if not os.path.exists("img"): + os.makedirs("img") -# Create and save psd plot +# Create and save psd plot fig = plot_spec(psd_df) -fig.write_image('img/psd.png') +fig.write_image("img/psd.png") # Create and save bb plot fig = plot_bb(bb_df) -fig.savefig('img/broadband.png') +fig.savefig("img/broadband.png") diff --git a/requirements_noise.txt b/requirements_noise.txt index 4a316d2c..be1293ed 100644 --- a/requirements_noise.txt +++ b/requirements_noise.txt @@ -1,6 +1,6 @@ -matplotlib -scipy -m3u8 +matplotlib +scipy +m3u8 git+https://github.com/kkroening/ffmpeg-python orcasound_noise@git+https://github.com/orcasound/ambient-sound-analysis@plotting_update kaleido diff --git a/tests/test_ooi.py b/tests/test_ooi.py index 941e2773..ee9dda6f 100644 --- a/tests/test_ooi.py +++ b/tests/test_ooi.py @@ -1,4 +1,5 @@ """Unit tests for OOI workflow""" + import datetime import os import shutil diff --git a/tests/test_spectrograms.py b/tests/test_spectrograms.py index f33787aa..75a319c8 100644 --- a/tests/test_spectrograms.py +++ b/tests/test_spectrograms.py @@ -1,4 +1,5 @@ """Unit tests for various util functions relating to spectrogram creation""" + import os.path import matplotlib.pyplot as plt