Merge branch 'hotfix/5.18.1'

Author: JeltevanBoheemen

CITATION.cff

@@ -35,5 +35,5 @@ keywords:
   - elasticsearch
   - natural language processing
 license: MIT
-version: 5.18.0
-date-released: '2025-04-10'
+version: 5.18.1
+date-released: '2025-05-22'

backend/download/apps.py

@@ -4,3 +4,6 @@
 class DownloadConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'download'
+
+    def ready(self):
+        import download.signals

backend/download/signals.py

@@ -0,0 +1,27 @@
+import logging
+import os
+
+from django.conf import settings
+from django.db.models.signals import post_delete
+from django.dispatch import receiver
+from download.convert_csv import output_path
+
+from .models import Download
+
+logger = logging.getLogger()
+
+
+@receiver(post_delete, sender=Download)
+def after_download_delete(sender, instance, **kwargs):
+    if instance.filename:
+        try:
+            full_path = os.path.join(settings.CSV_FILES_PATH, instance.filename)
+            os.remove(full_path)
+
+            converted_path = output_path(
+                settings.CSV_FILES_PATH, instance.filename)[0]
+            if os.path.exists(converted_path):
+                os.remove(converted_path)
+
+        except Exception as e:
+            logger.error(f"Error deleting file {instance.filename}: {e}")

backend/download/tests/test_download_views.py

@@ -243,9 +243,9 @@ def test_unauthenticated_download(db, client, basic_mock_corpus, basic_corpus_pu
                            content_type='application/json'
                            )
     assert status.is_success(response.status_code)
+    # check that download object is removed
     download_objects = Download.objects.all()
-    assert download_objects.count() == 1
-    assert download_objects.first().user == None
+    assert download_objects.count() == 0
 
 def test_query_text_in_csv(db, client, basic_mock_corpus, basic_corpus_public, index_basic_mock_corpus):
     es_query = query.set_query_text(mock_match_all_query(), 'ghost')

backend/download/views.py

@@ -19,15 +19,20 @@
 
 logger = logging.getLogger()
 
-def send_csv_file(download, directory, encoding, format=None):
+
+def send_csv_file(download, directory, encoding, format=None, delete_after_sent=False):
     '''
     Perform final formatting and send a CSV file as a FileResponse
     '''
-    converted_filename = convert_csv.convert_csv(
-        directory, download.filename, download.download_type, encoding, format)
-    path = os.path.join(directory, converted_filename)
+    try:
+        converted_filename = convert_csv.convert_csv(
+            directory, download.filename, download.download_type, encoding, format)
+        path = os.path.join(directory, converted_filename)
+        return FileResponse(open(path, 'rb'), filename=download.descriptive_filename(), as_attachment=True)
+    finally:
+        if delete_after_sent:
+            download.delete()
 
-    return FileResponse(open(path, 'rb'), filename=download.descriptive_filename(), as_attachment=True)
 
 class ResultsDownloadView(APIView):
     '''
@@ -49,7 +54,8 @@ def post(self, request, *args, **kwargs):
             directory, filename = os.path.split(csv_path)
             # Create download for download history
             download.complete(filename=filename)
-            return send_csv_file(download, directory, request.data['encoding'])
+            delete_after_sent = user is None
+            return send_csv_file(download, directory, request.data['encoding'], delete_after_sent=delete_after_sent)
         except Exception as e:
             logger.error(e)
             raise APIException(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "i-analyzer",
-  "version": "5.18.0",
+  "version": "5.18.1",
   "license": "MIT",
   "scripts": {
     "postinstall": "yarn install-back && yarn install-front",