Celery task structure improvements

bats_ai/core/admin/recording.py

@@ -5,7 +5,7 @@
 from django.utils.safestring import mark_safe
 
 from bats_ai.core.models import Recording
-from bats_ai.tasks.tasks import recording_compute_spectrogram
+from bats_ai.core.tasks.tasks import recording_compute_spectrogram
 
 
 @admin.register(Recording)

bats_ai/core/management/commands/generateNABat.py

@@ -12,7 +12,7 @@
 
 from bats_ai.core.models import Species
 from bats_ai.core.models.nabat import NABatRecording, NABatRecordingAnnotation
-from bats_ai.tasks.nabat.tasks import generate_compress_spectrogram, generate_spectrogram
+from bats_ai.core.tasks.nabat.tasks import generate_compress_spectrogram, generate_spectrogram
 
 fake = Faker()
 

bats_ai/core/management/commands/importRecordings.py

@@ -8,8 +8,8 @@
 from django.utils import timezone
 
 from bats_ai.core.models import Recording
+from bats_ai.core.tasks.tasks import recording_compute_spectrogram
 from bats_ai.core.utils.guano_utils import extract_guano_metadata
-from bats_ai.tasks.tasks import recording_compute_spectrogram
 
 logger = logging.getLogger(__name__)
 

bats_ai/tasks/periodic.py → bats_ai/core/tasks/periodic.py

@@ -1,10 +1,10 @@
-from celery import shared_task
 from django.utils import timezone
 
+from bats_ai.celery import app
 from bats_ai.core.models import ExportedAnnotationFile
 
 
-@shared_task
+@app.task
 def delete_expired_exported_files():
     now = timezone.now()
     expired_files = ExportedAnnotationFile.objects.filter(expires_at__lt=now)

bats_ai/tasks/tasks.py → bats_ai/core/tasks/tasks.py

@@ -2,10 +2,10 @@
 import os
 import tempfile
 
-from celery import shared_task
 from django.contrib.contenttypes.models import ContentType
 from django.core.files import File
 
+from bats_ai.celery import app
 from bats_ai.core.models import (
     CompressedSpectrogram,
     Configuration,
@@ -21,7 +21,7 @@
 logger = logging.getLogger('NABatDataRetrieval')
 
 
-@shared_task
+@app.task
 def recording_compute_spectrogram(recording_id: int):
     recording = Recording.objects.get(pk=recording_id)
 

bats_ai/core/views/nabat/nabat_configuration.py

@@ -15,8 +15,8 @@
 
 from bats_ai.core.models import ExportedAnnotationFile, ProcessingTask, ProcessingTaskType
 from bats_ai.core.models.nabat import NABatRecording, NABatRecordingAnnotation
-from bats_ai.tasks.nabat.nabat_export_task import export_nabat_annotations_task
-from bats_ai.tasks.nabat.nabat_update_species import update_nabat_species
+from bats_ai.core.tasks.nabat.nabat_export_task import export_nabat_annotations_task
+from bats_ai.core.tasks.nabat.nabat_update_species import update_nabat_species
 
 logger = logging.getLogger(__name__)
 

bats_ai/core/views/nabat/nabat_recording.py

@@ -17,8 +17,8 @@
     NABatRecording,
     NABatRecordingAnnotation,
 )
+from bats_ai.core.tasks.nabat.nabat_data_retrieval import nabat_recording_initialize
 from bats_ai.core.views.species import SpeciesSchema
-from bats_ai.tasks.nabat.nabat_data_retrieval import nabat_recording_initialize
 
 logger = logging.getLogger(__name__)
 router = RouterPaginated()

bats_ai/core/views/recording.py

@@ -22,13 +22,13 @@
     SequenceAnnotations,
     Species,
 )
+from bats_ai.core.tasks.tasks import recording_compute_spectrogram
 from bats_ai.core.views.recording_tag import RecordingTagSchema
 from bats_ai.core.views.sequence_annotations import (
     SequenceAnnotationSchema,
     UpdateSequenceAnnotationSchema,
 )
 from bats_ai.core.views.species import SpeciesSchema
-from bats_ai.tasks.tasks import recording_compute_spectrogram
 from bats_ai.utils.spectrogram_utils import predict_from_compressed
 
 logger = logging.getLogger(__name__)