Skip to content

A live bird collage card for your Home Assistant dashboard.

cleanup the module structure a bit

frederikc1e70c3a2ded
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/scripts/birdnet_analysis.py b/scripts/birdnet_analysis.py
index 1e796e31..ec805286 100644
--- a/scripts/birdnet_analysis.py
+++ b/scripts/birdnet_analysis.py
@@ -11,7 +11,7 @@ from subprocess import CalledProcessError
import inotify.adapters
from inotify.constants import IN_CLOSE_WRITE
-from server import load_global_model, run_analysis
+from utils.analysis import load_global_model, run_analysis
from utils.helpers import get_settings, get_wav_files, ANALYZING_NOW
from utils.classes import ParseFileName
from utils.reporting import extract_detection, summary, write_to_file, write_to_db, apprise, bird_weather, heartbeat, \
diff --git a/scripts/server.py b/scripts/utils/analysis.py
similarity index 98%
rename from scripts/server.py
rename to scripts/utils/analysis.py
index 1b107152..32ca89d1 100644
--- a/scripts/server.py
+++ b/scripts/utils/analysis.py
@@ -5,9 +5,9 @@ import time
import librosa
import numpy as np
-from scripts.utils.classes import Detection, ParseFileName
-from scripts.utils.helpers import get_settings, get_language
-from scripts.utils.models import get_model
+from .classes import Detection, ParseFileName
+from .helpers import get_settings, get_language
+from .models import get_model
log = logging.getLogger(__name__)
diff --git a/tests/test_server.py b/tests/test_analysis.py
similarity index 92%
rename from tests/test_server.py
rename to tests/test_analysis.py
index 8487f8ac..bcf8a99e 100644
--- a/tests/test_server.py
+++ b/tests/test_analysis.py
@@ -2,7 +2,7 @@ import os
import unittest
from unittest.mock import patch
-from scripts.server import run_analysis
+from scripts.utils.analysis import run_analysis
from scripts.utils.classes import ParseFileName
from tests.helpers import TESTDATA, Settings
@@ -10,7 +10,7 @@ from tests.helpers import TESTDATA, Settings
class TestRunAnalysis(unittest.TestCase):
@patch('scripts.utils.helpers._load_settings')
- @patch('scripts.server.loadCustomSpeciesList')
+ @patch('scripts.utils.analysis.loadCustomSpeciesList')
def test_run_analysis(self, mock_loadCustomSpeciesList, mock_load_settings):
# Mock the settings and species list
mock_load_settings.return_value = Settings.with_defaults()