A live bird collage card for your Home Assistant dashboard.
cleanup the module structure a bit
frederikc1e70c3a2ded
diff --git a/__init__.py b/__init__.pydeleted file mode 100644index e69de29b..00000000diff --git a/scripts/birdnet_analysis.py b/scripts/birdnet_analysis.pyindex 1e796e31..ec805286 100644--- a/scripts/birdnet_analysis.py+++ b/scripts/birdnet_analysis.py@@ -11,7 +11,7 @@ from subprocess import CalledProcessErrorimport inotify.adaptersfrom inotify.constants import IN_CLOSE_WRITE-from server import load_global_model, run_analysis+from utils.analysis import load_global_model, run_analysisfrom utils.helpers import get_settings, get_wav_files, ANALYZING_NOWfrom utils.classes import ParseFileNamefrom 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.pysimilarity index 98%rename from scripts/server.pyrename to scripts/utils/analysis.pyindex 1b107152..32ca89d1 100644--- a/scripts/server.py+++ b/scripts/utils/analysis.py@@ -5,9 +5,9 @@ import timeimport librosaimport 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_modellog = logging.getLogger(__name__)diff --git a/tests/test_server.py b/tests/test_analysis.pysimilarity index 92%rename from tests/test_server.pyrename to tests/test_analysis.pyindex 8487f8ac..bcf8a99e 100644--- a/tests/test_server.py+++ b/tests/test_analysis.py@@ -2,7 +2,7 @@ import osimport unittestfrom unittest.mock import patch-from scripts.server import run_analysis+from scripts.utils.analysis import run_analysisfrom scripts.utils.classes import ParseFileNamefrom tests.helpers import TESTDATA, Settings@@ -10,7 +10,7 @@ from tests.helpers import TESTDATA, Settingsclass 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 listmock_load_settings.return_value = Settings.with_defaults()