Add Django 5.2 support and compatibility fixes

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['py312']
-        django-version: ['django42']
+        django-version: ['django42', 'django52']
         db-version: ['mysql80']
         pytest-split-group: [1, 2, 3, 4, 5, 6]
         status: ['']
@@ -43,7 +43,8 @@ jobs:
         # See https://github.com/actions/toolkit/issues/399
         continue-on-error: ${{ matrix.status == 'ignored' }}
       - name: Upload coverage
-        if: matrix.db-version == 'mysql80'
+        # Upload coverage only from the django52 job to avoid duplicate artifacts across the Django test matrix.
+        if: matrix.db-version == 'mysql80' && matrix.django-version == 'django52'
         uses: actions/upload-artifact@v4
         with:
           name: coverage${{ matrix.pytest-split-group }}

Makefile

@@ -66,7 +66,8 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
 	pip-compile --rebuild --upgrade -o requirements/local.txt requirements/local.in
 	pip-compile --rebuild --upgrade -o requirements/production.txt requirements/production.in
 	# Let tox control the Django version for tests
-	grep -e "^django==" requirements/local.txt > requirements/django.txt
+	sed -i.tmp '/^[dD]jango==/d' requirements/test.txt
+	rm requirements/test.txt.tmp
 	sed -i.tmp '/^[dD]jango==/d' requirements/local.txt
 	rm -rf requirements/local.txt.tmp
 	chmod a+rw requirements/*.txt

course_discovery/apps/api/fields.py

@@ -16,9 +16,9 @@ def to_representation(self, value):
         for size_key in value.field.variations:
             # Get different sizes specs from the model field
             # Then get the file path from the available files
-            sized_file = getattr(value, size_key, None)
-            if sized_file:
-                path = sized_file.url
+            if value and value.name:
+                variation_path = value.get_variation_name(value.name, size_key)
+                path = value.storage.url(variation_path)
                 serialized_image = serialized.setdefault(size_key, {})
                 # In case MEDIA_URL does not include scheme+host, ensure that the URLs are absolute and not relative
                 serialized_image['url'] = self.context['request'].build_absolute_uri(path)

course_discovery/apps/api/tests/test_fields.py

@@ -30,7 +30,12 @@ def test_to_representation(self):
         field._context = {'request': request}  # pylint: disable=protected-access
         expected = {
             size_key: {
-                'url': '{}{}'.format('http://testserver', getattr(program.banner_image, size_key).url),
+                'url': '{}{}'.format(
+                    'http://testserver',
+                    program.banner_image.storage.url(
+                        program.banner_image.get_variation_name(program.banner_image.name, size_key)
+                    )
+                ),
                 'width': program.banner_image.field.variations[size_key]['width'],
                 'height': program.banner_image.field.variations[size_key]['height']
             } for size_key in program.banner_image.field.variations}

course_discovery/apps/course_metadata/admin.py

@@ -387,6 +387,9 @@ def save_model(self, request, obj, form, change):
             obj.uploaded_by = request.user
         super().save_model(request, obj, form, change)
 
+    @admin.display(
+        description='Task Result Status Summary'
+    )
     def task_result_status_summary(self, obj):
         """
         Returns a formatted string with the status and result of the task
@@ -400,8 +403,6 @@ def task_result_status_summary(self, obj):
         except TaskResult.DoesNotExist:
             return "No result found"
 
-    task_result_status_summary.short_description = 'Task Result Status Summary'
-
 
 class CourseInline(admin.TabularInline):
     model = Course

course_discovery/apps/course_metadata/data_loaders/api.py

@@ -446,7 +446,11 @@ def _load_ecommerce_data(self):
         empty_course_run_type = CourseRunType.objects.get(slug=CourseRunType.EMPTY)
         has_empty_type = (Q(type=empty_course_type, course_runs__seats__isnull=False) |
                           Q(course_runs__type=empty_course_run_type, course_runs__seats__isnull=False))
-        for course in Course.everything.filter(has_empty_type, partner=self.partner).distinct().iterator():
+        for course in (
+            Course.everything.filter(has_empty_type, partner=self.partner)
+            .distinct()
+            .iterator(chunk_size=settings.ITERATOR_CHUNK_SIZE)
+        ):
             if not calculate_course_type(course, commit=True):
                 logger.warning('Calculating course type failure occurred for [%s].', course)
                 self.processing_failure_occurred = True

course_discovery/apps/course_metadata/management/commands/deduplicate_course_metadata_history.py

@@ -16,6 +16,7 @@
 
 https://django-simple-history.readthedocs.io/en/latest/utils.html#clean-duplicate-history
 """
+from django.conf import settings
 from django.core.management import CommandError
 from django.utils import timezone
 from simple_history.management.commands import clean_duplicate_history
@@ -100,5 +101,5 @@ def _process(self, to_process, date_back=None, dry_run=True):
                     pk__in=(m_qs.values_list(model._meta.pk.name).distinct())
                 )
 
-            for o in model_query.iterator():
+            for o in model_query.iterator(chunk_size=settings.ITERATOR_CHUNK_SIZE):
                 self._process_instance(o, model, stop_date=stop_date, dry_run=dry_run)

course_discovery/apps/course_metadata/management/commands/send_course_deadline_emails.py

@@ -56,7 +56,8 @@ def handle(self, *args, **options):
             'editors',
         ).distinct()
         logger.info(f'Found {courses_with_self_paced_runs.count()} courses with self-paced runs.')
-        courses_with_self_paced_runs = courses_with_self_paced_runs.iterator()
+        courses_with_self_paced_runs = courses_with_self_paced_runs.iterator(
+            chunk_size=settings.ITERATOR_CHUNK_SIZE)
 
         for course in courses_with_self_paced_runs:
             advertised_run = course.advertised_course_run

course_discovery/apps/course_metadata/management/commands/tests/test_populate_product_catalog.py

@@ -32,7 +32,6 @@ def setUp(self):
             2,
             product_source=self.source,
             partner=self.partner,
-            additional_metadata=None,
             type=self.course_type,
             authoring_organizations=[self.organization]
         )
@@ -55,7 +54,6 @@ def setUp(self):
             2,
             product_source=self.source,
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             authoring_organizations=[self.organization],
             card_image=factory.django.ImageField()
@@ -190,7 +188,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
             DegreeFactory.create(
                 product_source=self.source,
                 partner=self.partner,
-                additional_metadata=None,
                 type=self.program_type,
                 status=ProgramStatus.Unpublished,
                 marketing_slug="valid-slug-1",
@@ -199,7 +196,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
             DegreeFactory.create(
                 product_source=self.source,
                 partner=self.partner,
-                additional_metadata=None,
                 type=self.program_type,
                 status=ProgramStatus.Retired,
                 marketing_slug="valid-slug-2",
@@ -208,7 +204,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
             DegreeFactory.create(
                 product_source=self.source,
                 partner=self.partner,
-                additional_metadata=None,
                 type=self.program_type,
                 status=ProgramStatus.Deleted,
                 marketing_slug="valid-slug-3",
@@ -217,7 +212,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
             DegreeFactory.create(
                 product_source=self.source,
                 partner=self.partner,
-                additional_metadata=None,
                 type=self.program_type,
                 status=ProgramStatus.Active,
                 marketing_slug="",
@@ -228,7 +222,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
         marketable_degree = DegreeFactory.create(
             product_source=self.source,
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             status=ProgramStatus.Active,
             marketing_slug="valid-marketing-slug",
@@ -239,7 +232,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
         marketable_degree_with_no_language = DegreeFactory.create(
             product_source=self.source,
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             status=ProgramStatus.Active,
             marketing_slug="valid-marketing-slug",
@@ -252,7 +244,6 @@ def test_populate_product_catalog_excludes_non_marketable_degrees(self):
         marketable_degree_2 = DegreeFactory.create(
             product_source=self.source,
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             status=ProgramStatus.Active,
             marketing_slug="valid-marketing-slug",
@@ -312,7 +303,6 @@ def test_populate_product_catalog_with_degrees_having_overrides(self):
         degree = DegreeFactory.create(
             product_source=self.source,
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             status=ProgramStatus.Active,
             marketing_slug="valid-marketing-slug",
@@ -353,7 +343,6 @@ def test_populate_product_catalog_supports_multiple_product_sources(self):
         """
         marketable_degree = DegreeFactory.create(
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             status=ProgramStatus.Active,
             marketing_slug="valid-marketing-slug",
@@ -364,7 +353,6 @@ def test_populate_product_catalog_supports_multiple_product_sources(self):
         )
         marketable_degree_2 = DegreeFactory.create(
             partner=self.partner,
-            additional_metadata=None,
             type=self.program_type,
             status=ProgramStatus.Active,
             marketing_slug="valid-marketing-slug",

course_discovery/apps/course_metadata/management/commands/unpublish_inactive_runs.py

@@ -1,5 +1,6 @@
 import logging
 
+from django.conf import settings
 from django.core.management import BaseCommand, CommandError
 from django.utils.translation import gettext as _
 
@@ -19,7 +20,8 @@ def handle(self, *args, **options):
         # Since we know we will call unpublish_inactive_runs for nearly every single course in our catalog, let's
         # try to optimize a little bit by only making one database query. We ask for all course runs, sort by course,
         # then hand the set of published course runs into unpublish_inactive_runs.
-        published_runs = CourseRun.objects.filter(status=CourseRunStatus.Published).order_by('course').iterator()
+        published_runs = CourseRun.objects.filter(status=CourseRunStatus.Published).order_by(
+            'course').iterator(chunk_size=settings.ITERATOR_CHUNK_SIZE)
 
         current_course = None
         current_runs = set()

course_discovery/apps/course_metadata/management/commands/update_course_ai_languages.py

@@ -69,7 +69,7 @@ def handle(self, *args, **options):
             course_runs = course_runs.marketable()
 
         # Reduce the memory usage
-        course_runs = course_runs.iterator()
+        course_runs = course_runs.iterator(chunk_size=settings.ITERATOR_CHUNK_SIZE)
 
         for course_run in course_runs:
             try:

course_discovery/apps/course_metadata/models.py

@@ -1694,9 +1694,9 @@ def clean(self):
 
     @property
     def image_url(self):
-        if self.image:
-            return self.image.small.url
-
+        if self.image and self.image.name:
+            variation_path = self.image.get_variation_name(self.image.name, 'small')
+            return self.image.storage.url(variation_path)
         return self.card_image_url
 
     @property
@@ -1923,7 +1923,8 @@ def unpublish_inactive_runs(self, published_runs=None):
             return False
 
         if published_runs is None:
-            published_runs = self.course_runs.filter(status=CourseRunStatus.Published).iterator()
+            published_runs = self.course_runs.filter(status=CourseRunStatus.Published).iterator(
+                chunk_size=settings.ITERATOR_CHUNK_SIZE)
         published_runs = frozenset(published_runs)
 
         # Now separate out the active ones from the inactive

course_discovery/apps/course_metadata/search_indexes/documents/course.py

@@ -158,11 +158,11 @@ class Django:
         """
 
         model = Course
+        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION
 
     class Meta:
         """
         Meta options.
         """
 
         parallel_indexing = True
-        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION

course_discovery/apps/course_metadata/search_indexes/documents/course_run.py

@@ -165,11 +165,11 @@ class Django:
         """
 
         model = CourseRun
+        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION
 
     class Meta:
         """
         Meta options.
         """
 
         parallel_indexing = True
-        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION

course_discovery/apps/course_metadata/search_indexes/documents/learner_pathway.py

@@ -83,11 +83,11 @@ class Django:
         """
 
         model = LearnerPathway
+        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION
 
     class Meta:
         """
         Meta options.
         """
 
         parallel_indexing = True
-        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION

course_discovery/apps/course_metadata/search_indexes/documents/person.py

@@ -59,11 +59,11 @@ class Django:
         """
 
         model = Person
+        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION
 
     class Meta:
         """
         Meta options.
         """
 
         parallel_indexing = True
-        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION

course_discovery/apps/course_metadata/search_indexes/documents/program.py

@@ -136,11 +136,11 @@ class Django:
         """
 
         model = Program
+        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION
 
     class Meta:
         """
         Meta options.
         """
 
         parallel_indexing = True
-        queryset_pagination = settings.ELASTICSEARCH_DSL_QUERYSET_PAGINATION

course_discovery/apps/course_metadata/signals.py

@@ -186,7 +186,7 @@ def ensure_external_key_uniqueness__curriculum(sender, instance, **kwargs):  # p
     course_runs = CourseRun.objects.filter(
         course__degree_course_curricula=instance,
         external_key__isnull=False
-    ).iterator()
+    ).iterator(chunk_size=settings.ITERATOR_CHUNK_SIZE)
     check_curricula_and_related_programs_for_duplicate_external_key([instance], course_runs)
 
 

course_discovery/apps/course_metadata/tests/test_admin.py

@@ -3,6 +3,7 @@
 import ddt
 import pytest
 from bs4 import BeautifulSoup
+from django import VERSION as DJANGO_VERSION
 from django.contrib.admin.sites import AdminSite
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpRequest
@@ -485,7 +486,8 @@ def test_queryset_method_returns_eligible_programs(self):
         """ Verify that one click purchase eligible programs pass the filter. """
         verified_seat_type = factories.SeatTypeFactory.verified()
         program_type = factories.ProgramTypeFactory(applicable_seat_types=[verified_seat_type])
-        program_filter = ProgramEligibilityFilter(None, {self.parameter_name: 1}, None, None)
+        value = [1] if DJANGO_VERSION >= (5, 2) else 1
+        program_filter = ProgramEligibilityFilter(None, {self.parameter_name: value}, None, None)
         course_run = factories.CourseRunFactory(end=None, enrollment_end=None,)
         factories.SeatFactory(course_run=course_run, type=verified_seat_type, upgrade_deadline=None)
         one_click_purchase_eligible_program = factories.ProgramFactory(
@@ -498,7 +500,8 @@ def test_queryset_method_returns_eligible_programs(self):
 
     def test_queryset_method_returns_ineligible_programs(self):
         """ Verify programs ineligible for one-click purchase do not pass the filter. """
-        program_filter = ProgramEligibilityFilter(None, {self.parameter_name: 0}, None, None)
+        value = [0] if DJANGO_VERSION >= (5, 2) else 0
+        program_filter = ProgramEligibilityFilter(None, {self.parameter_name: value}, None, None)
         one_click_purchase_ineligible_program = factories.ProgramFactory(one_click_purchase_enabled=False)
         with self.assertNumQueries(4):
             assert list(program_filter.queryset({}, Program.objects.all())) == [one_click_purchase_ineligible_program]

course_discovery/apps/course_metadata/tests/test_algolia_models.py

@@ -2,6 +2,7 @@
 from collections import ChainMap
 
 import ddt
+import factory
 import pytest
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -32,6 +33,11 @@ class AlgoliaProxyProgramFactory(ProgramFactory):
     class Meta:
         model = AlgoliaProxyProgram
 
+    subscription = factory.RelatedFactory(
+        ProgramSubscriptionFactory,
+        factory_related_name='program',
+    )
+
 
 class TestAlgoliaDataMixin():
     ONE_MONTH_AGO = datetime.datetime.now(UTC) - datetime.timedelta(days=30)

course_discovery/apps/course_metadata/tests/test_mixins.py

@@ -38,7 +38,7 @@ def test_wildcard_query_early_exit(self):
         queryset = factories.CourseProxy.search(query=query)
 
         self.assertEqual(len(queryset), self.total_courses)
-        self.assertQuerysetEqual(
+        self.assertQuerySetEqual(
             queryset.order_by("id"),
             factories.Course.objects.all().order_by("id"),
             transform=lambda x: x