start restructuring

Author: stefantaubert

benchmarks/consistency_test.py

@@ -8,8 +8,8 @@
 import numpy as np
 
 from birdnet.acoustic_models.v2_4.model import AcousticModelV2_4
-from birdnet.backends import litert_installed
-from birdnet.local_data import get_package_version
+from birdnet.core.backends import litert_installed
+from birdnet.utils.local_data import get_package_version
 from birdnet.model_loader import load
 
 

src/birdnet/__init__.py

@@ -11,7 +11,7 @@
   AcousticFilePredictionResult,
   AcousticPredictionResultBase,
 )
-from birdnet.acoustic_models.inference_pipeline.api import (
+from birdnet.acoustic_models.api import (
   AcousticEncodingSession,
   AcousticPredictionSession,
 )
@@ -20,7 +20,7 @@
 from birdnet.geo_models.inference.api import GeoPredictionSession
 from birdnet.geo_models.inference.prediction_result import GeoPredictionResult
 from birdnet.geo_models.v2_4.model import GeoModelV2_4
-from birdnet.logging_utils import get_package_logger, init_package_logger
+from birdnet.utils.logging_utils import get_package_logger, init_package_logger
 from birdnet.model_loader import load, load_custom, load_perch_v2  # noqa: F401
 
 init_package_logger(logging.INFO)

src/birdnet/acoustic/__init__.py

@@ -0,0 +1 @@
+#

src/birdnet/acoustic/inference/__init__.py

@@ -0,0 +1 @@
+#

src/birdnet/acoustic/models/__init__.py

@@ -0,0 +1 @@
+#

…coustic_models/inference_pipeline/api.py src/birdnet/acoustic_models/api.pysrc/birdnet/acoustic_models/inference_pipeline/api.py renamed to src/birdnet/acoustic_models/api.py src/birdnet/acoustic_models/inference_pipeline/api.py renamed to src/birdnet/acoustic_models/api.py

@@ -31,8 +31,8 @@
 from birdnet.acoustic_models.inference_pipeline.prediction_strategy import (
   PredictionStrategy,
 )
-from birdnet.acoustic_models.inference_pipeline.session import AcousticSessionBase
-from birdnet.backends import VersionedAcousticBackendProtocol
+from birdnet.acoustic_models.session import AcousticSessionBase
+from birdnet.core.backends import VersionedAcousticBackendProtocol
 from birdnet.globals import ACOUSTIC_MODEL_VERSIONS
 
 

src/birdnet/acoustic_models/base.py

@@ -3,7 +3,9 @@
 
 from ordered_set import OrderedSet
 
-from birdnet.base import ModelBase, ResultBase
+from birdnet.acoustic_models.inference.result_base import SessionBase
+from birdnet.acoustic_models.session import AcousticSessionBase
+from birdnet.core.base import ModelBase, ResultBase
 from birdnet.globals import ACOUSTIC_MODEL_VERSIONS
 
 
@@ -20,7 +22,10 @@ def __init__(
   @abstractmethod
   def get_version(cls) -> ACOUSTIC_MODEL_VERSIONS: ...
 
-  @classmethod
   @abstractmethod
-  def encode(cls, *args, **kwargs) -> ResultBase:  # noqa: ANN002, ANN003
+  def encode(self, *args, **kwargs) -> ResultBase:  # noqa: ANN002, ANN003
+    ...
+
+  @abstractmethod
+  def encode_session(self, *args, **kwargs) -> AcousticSessionBase:  # noqa: ANN002, ANN003
     ...

src/birdnet/acoustic_models/inference/benchmarking.py

@@ -11,7 +11,7 @@
 import numpy as np
 import psutil
 
-from birdnet.backends import (
+from birdnet.core.backends import (
   litert_installed,
   tf_installed,
 )
@@ -21,7 +21,7 @@
   MODEL_TYPES,
   NA,
 )
-from birdnet.local_data import get_package_version
+from birdnet.utils.local_data import get_package_version
 
 
 @dataclass

src/birdnet/acoustic_models/inference/encoding/result.py

@@ -6,7 +6,7 @@
 
 from birdnet.acoustic_models.inference.encoding.tensor import AcousticEncodingTensor
 from birdnet.acoustic_models.inference.result_base import AcousticResultBase
-from birdnet.helper import get_uint_dtype
+from birdnet.utils.helper import get_uint_dtype
 
 NP_EMB_KEY = "embeddings"
 NP_EMB_MASKED_KEY = "embeddings_masked"

src/birdnet/acoustic_models/inference/encoding/worker.py

@@ -6,7 +6,7 @@
 import numpy as np
 
 from birdnet.acoustic_models.inference.worker import WorkerBase
-from birdnet.backends import BackendLoader, BatchT
+from birdnet.core.backends import BackendLoader, BatchT
 from birdnet.shm import RingField