Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #74

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/noise_processing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
schedule:
- cron: '2 * * * *'

jobs:
process:
runs-on: ubuntu-latest
Expand All @@ -22,12 +22,12 @@ jobs:
run: |
pip install -r requirements_noise.txt


- name: Install ffmpeg
run: |
sudo apt-get update
sudo apt-get install ffmpeg

- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: ffmpeg
Expand All @@ -53,6 +53,6 @@ jobs:
# uses: AnimMouse/setup-rclone@v1
# with:
# rclone_config: ${{secrets.RCLONE_CONFIG}}
#
#
# - run: |
# rclone copy ambient_sound_analysis/img/broadband.png mydrive:rclone_uploads/
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
repos:
- repo: https://github.com/pycqa/isort
rev: 5.10.1
rev: 6.0.0
hooks:
- id: isort
args: ["--profile", "black"]

- repo: https://github.com/psf/black
rev: 22.1.0
rev: 25.1.0
hooks:
- id: black

- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v3.19.1
hooks:
- id: pyupgrade
args: ["--py39-plus"]

- repo: https://github.com/pycqa/flake8
rev: 4.0.1
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: [pep8-naming]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down
36 changes: 17 additions & 19 deletions noise_processing.py
Original file line number Diff line number Diff line change
@@ -1,48 +1,46 @@
# 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.BUSH_POINT,
delta_f=10, bands=None,
delta_t=60, mode='safe')


if __name__ == "__main__":
pipeline = NoiseAnalysisPipeline(
Hydrophone.BUSH_POINT, 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'))
now = dt.datetime.now(pytz.timezone("US/Pacific"))
# now = dt.datetime(2024, 11, 20, 10)
# now = dt.datetime(2025, 1, 16, 10)
psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 6),
now - dt.timedelta(hours = 1),
upload_to_s3=False)
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")
6 changes: 3 additions & 3 deletions requirements_noise.txt
Original file line number Diff line number Diff line change
@@ -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
kaleido
1 change: 1 addition & 0 deletions tests/test_ooi.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Unit tests for OOI workflow"""

import datetime
import os
import shutil
Expand Down
1 change: 1 addition & 0 deletions tests/test_spectrograms.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Unit tests for various util functions relating to spectrogram creation"""

import os.path

import matplotlib.pyplot as plt
Expand Down
Loading