chore: BEG-7: Django 5 upgrade (#6614)

Co-authored-by: Wesley Lima <[email protected]> Co-authored-by: niklub <[email protected]> Co-authored-by: nik <[email protected]>
HumanSignal · Dec 13, 2024 · 510fe94 · 510fe94
1 parent 769ced2
commit 510fe94
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 33 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -179,7 +179,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.9'
+          - '3.10'
 
     # required for poetry action
     # see https://github.com/marketplace/actions/install-poetry-action#running-on-windows

diff --git a/label_studio/core/settings/base.py b/label_studio/core/settings/base.py
@@ -411,7 +411,14 @@
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
-STATICFILES_STORAGE = 'core.storage.SkipMissedManifestStaticFilesStorage'
+STORAGES = {
+    'default': {
+        'BACKEND': 'django.core.files.storage.FileSystemStorage',
+    },
+    'staticfiles': {
+        'BACKEND': 'core.storage.SkipMissedManifestStaticFilesStorage',
+    },
+}
 
 # Sessions and CSRF
 SESSION_COOKIE_SECURE = bool(int(get_env('SESSION_COOKIE_SECURE', False)))
@@ -648,7 +655,7 @@ def collect_versions_dummy(**kwargs):
 
 if get_env('MINIO_STORAGE_ENDPOINT') and not get_bool_env('MINIO_SKIP', False):
     CLOUD_FILE_STORAGE_ENABLED = True
-    DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+    STORAGES['default']['BACKEND'] = 'storages.backends.s3boto3.S3Boto3Storage'
     AWS_STORAGE_BUCKET_NAME = get_env('MINIO_STORAGE_BUCKET_NAME')
     AWS_ACCESS_KEY_ID = get_env('MINIO_STORAGE_ACCESS_KEY')
     AWS_SECRET_ACCESS_KEY = get_env('MINIO_STORAGE_SECRET_KEY')
@@ -661,7 +668,7 @@ def collect_versions_dummy(**kwargs):
 
 if get_env('STORAGE_TYPE') == 's3':
     CLOUD_FILE_STORAGE_ENABLED = True
-    DEFAULT_FILE_STORAGE = 'core.storage.CustomS3Boto3Storage'
+    STORAGES['default']['BACKEND'] = 'core.storage.CustomS3Boto3Storage'
     if get_env('STORAGE_AWS_ACCESS_KEY_ID'):
         AWS_ACCESS_KEY_ID = get_env('STORAGE_AWS_ACCESS_KEY_ID')
     if get_env('STORAGE_AWS_SECRET_ACCESS_KEY'):
@@ -681,7 +688,7 @@ def collect_versions_dummy(**kwargs):
 
 if get_env('STORAGE_TYPE') == 'azure':
     CLOUD_FILE_STORAGE_ENABLED = True
-    DEFAULT_FILE_STORAGE = 'core.storage.CustomAzureStorage'
+    STORAGES['default']['BACKEND'] = 'core.storage.CustomAzureStorage'
     AZURE_ACCOUNT_NAME = get_env('STORAGE_AZURE_ACCOUNT_NAME')
     AZURE_ACCOUNT_KEY = get_env('STORAGE_AZURE_ACCOUNT_KEY')
     AZURE_CONTAINER = get_env('STORAGE_AZURE_CONTAINER_NAME')
@@ -690,8 +697,7 @@ def collect_versions_dummy(**kwargs):
 
 if get_env('STORAGE_TYPE') == 'gcs':
     CLOUD_FILE_STORAGE_ENABLED = True
-    # DEFAULT_FILE_STORAGE = 'storages.backends.gcloud.GoogleCloudStorage'
-    DEFAULT_FILE_STORAGE = 'core.storage.AlternativeGoogleCloudStorage'
+    STORAGES['default']['BACKEND'] = 'core.storage.AlternativeGoogleCloudStorage'
     GS_PROJECT_ID = get_env('STORAGE_GCS_PROJECT_ID')
     GS_BUCKET_NAME = get_env('STORAGE_GCS_BUCKET_NAME')
     GS_EXPIRATION = timedelta(seconds=int(get_env('STORAGE_GCS_EXPIRATION_SECS', '86400')))

diff --git a/label_studio/data_manager/managers.py b/label_studio/data_manager/managers.py
@@ -599,7 +599,7 @@ def annotate_annotations_results(queryset):
             )
         )
     else:
-        return queryset.annotate(annotations_results=ArrayAgg('annotations__result', distinct=True))
+        return queryset.annotate(annotations_results=ArrayAgg('annotations__result', distinct=True, default=Value([])))
 
 
 def annotate_predictions_results(queryset):
@@ -610,7 +610,7 @@ def annotate_predictions_results(queryset):
             )
         )
     else:
-        return queryset.annotate(predictions_results=ArrayAgg('predictions__result', distinct=True))
+        return queryset.annotate(predictions_results=ArrayAgg('predictions__result', distinct=True, default=Value([])))
 
 
 def annotate_annotators(queryset):
@@ -619,7 +619,7 @@ def annotate_annotators(queryset):
             annotators=Coalesce(GroupConcat('annotations__completed_by'), Value(''), output_field=models.CharField())
         )
     else:
-        return queryset.annotate(annotators=ArrayAgg('annotations__completed_by', distinct=True))
+        return queryset.annotate(annotators=ArrayAgg('annotations__completed_by', distinct=True, default=Value([])))
 
 
 def annotate_predictions_score(queryset):
@@ -653,7 +653,7 @@ def annotate_annotations_ids(queryset):
     if settings.DJANGO_DB == settings.DJANGO_DB_SQLITE:
         return queryset.annotate(annotations_ids=GroupConcat('annotations__id', output_field=models.CharField()))
     else:
-        return queryset.annotate(annotations_ids=ArrayAgg('annotations__id'))
+        return queryset.annotate(annotations_ids=ArrayAgg('annotations__id', default=Value([])))
 
 
 def annotate_predictions_model_versions(queryset):
@@ -662,7 +662,7 @@ def annotate_predictions_model_versions(queryset):
             predictions_model_versions=GroupConcat('predictions__model_version', output_field=models.CharField())
         )
     else:
-        return queryset.annotate(predictions_model_versions=ArrayAgg('predictions__model_version'))
+        return queryset.annotate(predictions_model_versions=ArrayAgg('predictions__model_version', default=Value([])))
 
 
 def annotate_avg_lead_time(queryset):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -143,7 +143,7 @@ exclude = [
 label-studio = "label_studio.server:main"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4"
+python = ">=3.10,<4"
 wheel = "<=0.40.0,>=0.38.1"
 appdirs = ">=1.4.3"
 attr = "0.3.1"
@@ -154,12 +154,12 @@ boto = "^2.49.0"
 boto3 = "^1.28.58"
 botocore = "^1.31.58"
 bleach = "~=5.0.0"
-Django = "~=4.2.13"
+Django = "~=5.1.4"
 django-storages = "1.12.3"
 django-annoying = "0.10.6"
 django-debug-toolbar = "3.2.1"
 django-environ = "0.10.0"
-django-filter = "2.4.0"
+django-filter = "24.3"
 django-model-utils = "4.1.1"
 django-rq = "2.5.1"
 django-cors-headers = "3.6.0"