Merge branch 'main' into sponsor-mgmt-ui

Author: JacobCoffee

.github/workflows/lint.yml

@@ -21,4 +21,4 @@ jobs:
         with:
           python-version: "3.x"
 
-      - uses: j178/prek-action@v1
+      - uses: j178/prek-action@v2

apps/sponsors/admin.py

@@ -736,24 +736,35 @@ def get_sponsor_landing_page_url(self, obj):
     @admin.display(description="Web Logo")
     def get_sponsor_web_logo(self, obj):
         """Render and return the sponsor's web logo as a thumbnail image."""
-        html = "{% load thumbnail %}{% thumbnail sponsor.web_logo '150x150' format='PNG' quality=100 as im %}<img src='{{ im.url}}'/>{% endthumbnail %}"
+        img = obj.sponsor.web_logo
+        if not img:
+            return "---"
+        if img.name and img.name.lower().endswith(".svg"):
+            return format_html(
+                '<img src="{}" style="max-width:150px;max-height:150px"/>',
+                img.url,
+            )
+        html = "{% load thumbnail %}{% thumbnail img '150x150' format='PNG' quality=100 as im %}<img src='{{ im.url}}'/>{% endthumbnail %}"
         template = Template(html)
-        context = Context({"sponsor": obj.sponsor})
-        html = template.render(context)
-        return mark_safe(html)  # noqa: S308
+        context = Context({"img": img})
+        return mark_safe(template.render(context))  # noqa: S308
 
     @admin.display(description="Print Logo")
     def get_sponsor_print_logo(self, obj):
         """Render and return the sponsor's print logo as a thumbnail image."""
         img = obj.sponsor.print_logo
-        html = "---"
-        if img:
-            template = Template(
-                "{% load thumbnail %}{% thumbnail img '150x150' format='PNG' quality=100 as im %}<img src='{{ im.url}}'/>{% endthumbnail %}"
+        if not img:
+            return "---"
+        if img.name and img.name.lower().endswith(".svg"):
+            return format_html(
+                '<img src="{}" style="max-width:150px;max-height:150px"/>',
+                img.url,
             )
-            context = Context({"img": img})
-            html = mark_safe(template.render(context))  # noqa: S308
-        return html
+        template = Template(
+            "{% load thumbnail %}{% thumbnail img '150x150' format='PNG' quality=100 as im %}<img src='{{ im.url}}'/>{% endthumbnail %}"
+        )
+        context = Context({"img": img})
+        return mark_safe(template.render(context))  # noqa: S308
 
     @admin.display(description="Primary Phone")
     def get_sponsor_primary_phone(self, obj):
@@ -807,7 +818,7 @@ def get_custom_benefits_added_by_user(self, obj):
         if not benefits:
             return "---"
 
-        return format_html_join("", "<p>{}</p>", benefits)
+        return format_html_join("", "<p>{}</p>", ((b,) for b in benefits))
 
     @admin.display(description="Removed by User")
     def get_custom_benefits_removed_by_user(self, obj):
@@ -816,7 +827,7 @@ def get_custom_benefits_removed_by_user(self, obj):
         if not benefits:
             return "---"
 
-        return format_html_join("", "<p>{}</p>", benefits)
+        return format_html_join("", "<p>{}</p>", ((b,) for b in benefits))
 
     def rollback_to_editing_view(self, request, pk):
         """Delegate to the rollback_to_editing admin view."""
@@ -1277,7 +1288,7 @@ def get_value(self, obj):
         """Return the asset value, linking to the file URL if applicable."""
         html = obj.value
         if obj.value and getattr(obj.value, "url", None):
-            html = format_html("<a href='{}' target='_blank'>{}</a>", (obj.value.url, obj.value))
+            html = format_html("<a href='{}' target='_blank'>{}</a>", obj.value.url, obj.value)
         return html
 
     @admin.display(description="Associated with")
@@ -1289,9 +1300,9 @@ def get_related_object(self, obj):
         """
         content_object = None
         if obj.from_sponsorship:
-            content_object = self.all_sponsorships[obj.object_id]
+            content_object = self.all_sponsorships.get(obj.object_id)
         elif obj.from_sponsor:
-            content_object = self.all_sponsors[obj.object_id]
+            content_object = self.all_sponsors.get(obj.object_id)
 
         if not content_object:  # safety belt
             return obj.content_object

apps/sponsors/models/benefits.py

@@ -1,7 +1,7 @@
 """Benefit feature and configuration models for the sponsors app."""
 
 from django import forms
-from django.db import models
+from django.db import IntegrityError, models, transaction
 from django.db.models import UniqueConstraint
 from django.urls import reverse
 from polymorphic.models import PolymorphicModel
@@ -155,11 +155,16 @@ def create_benefit_feature(self, sponsor_benefit, **kwargs):
 
         asset_qs = content_object.assets.filter(internal_name=self.internal_name)
         if not asset_qs.exists():
-            asset = self.ASSET_CLASS(
-                content_object=content_object,
-                internal_name=self.internal_name,
-            )
-            asset.save()
+            try:
+                with transaction.atomic():
+                    asset = self.ASSET_CLASS(
+                        content_object=content_object,
+                        internal_name=self.internal_name,
+                    )
+                    asset.save()
+            except IntegrityError:
+                if not content_object.assets.filter(internal_name=self.internal_name).exists():
+                    raise
 
         return benefit_feature
 

apps/sponsors/templates/sponsors/partials/sponsors-list.html

@@ -10,14 +10,18 @@ <h2 class="widget-title" style="text-align: center;">Sponsors</h2>
   <p style="text-align: center;">Visionary sponsors help to host Python downloads.</p>
   <div style="display: grid; grid-gap: 2em; grid-template-columns: repeat(auto-fit, minmax(150px, 0fr)); align-items: center; justify-content: center; margin-top: 1.5em;">
   {% for sponsorship in sponsorships %}
-  {% thumbnail sponsorship.sponsor.web_logo "x150" format="PNG" quality=100 as im %}
     <div style="text-align: center;">
       <a href="{{ sponsorship.sponsor.landing_page_url }}" rel="sponsored noopener" target="_blank" style="border-bottom: 0;">
+        {% if sponsorship.sponsor.web_logo.name|lower|slice:"-4:" == ".svg" %}
+        <img src="{{ sponsorship.sponsor.web_logo.url }}" alt="{{ sponsorship.sponsor.name }} logo" style="max-height:150px;max-width:150px;height:auto;width:auto;">
+        {% else %}
+        {% thumbnail sponsorship.sponsor.web_logo "x150" format="PNG" quality=100 as im %}
         <img src="{{ im.url }}" alt="{{ sponsorship.sponsor.name }} logo" style="max-height:150px;max-width:150px;height:auto;width:auto;">
+        {% endthumbnail %}
+        {% endif %}
       </a>
       <p style="margin-top: 0.5em; margin-bottom: 0; font-size: 0.875em; color: #4d4d4d;">{{ sponsorship.sponsor.name }}</p>
     </div>
-  {% endthumbnail %}
   {% endfor %}
   </div>
 {% endcache CACHED_DOWNLOAD_SPONSORS_LIST %}
@@ -28,11 +32,15 @@ <h2 class="widget-title" style="text-align: center;">Sponsors</h2>
   <h3 class="widget-title">Job Board Sponsors</h3>
   <div style="display: grid; grid-gap: 1em; grid-template-columns: repeat(auto-fit, minmax(100px, 0fr)); grid-template-rows: repeat(1, minmax(50px, 0fr)); align-items: center; justify-content: center; margin-top: 1em;">
   {% for sponsorship in sponsorships %}
-  {% thumbnail sponsorship.sponsor.web_logo "x100" format="PNG" quality=100 as im %}
     <div>
+      {% if sponsorship.sponsor.web_logo.name|lower|slice:"-4:" == ".svg" %}
+      <img src="{{ sponsorship.sponsor.web_logo.url }}" alt="{{ sponsorship.sponsor.name }} logo" style="max-height:100px;max-width:100px;height:auto;width:auto;">
+      {% else %}
+      {% thumbnail sponsorship.sponsor.web_logo "x100" format="PNG" quality=100 as im %}
       <img src="{{ im.url }}" alt="{{ sponsorship.sponsor.name }} logo" style="max-height:100px;max-width:100px;height:auto;width:auto;">
+      {% endthumbnail %}
+      {% endif %}
     </div>
-  {% endthumbnail %}
   {% endfor %}
   </div>
 {% endcache CACHED_JOBS_SPONSORS_LIST %}

apps/sponsors/tests/test_models.py

@@ -1127,6 +1127,30 @@ def test_cant_create_same_asset_twice(self):
         self.config.create_benefit_feature(self.sponsor_benefit)
         self.assertEqual(1, TextAsset.objects.count())
 
+    def test_create_benefit_feature_with_preexisting_asset_no_crash(self):
+        """Regression: submitting a new sponsorship when the sponsor already
+        has an asset with the same internal_name (from a prior application)
+        should not raise an IntegrityError."""
+        sponsor = self.sponsor_benefit.sponsorship.sponsor
+        TextAsset.objects.create(
+            content_object=sponsor,
+            internal_name=self.config.internal_name,
+        )
+        # should not raise IntegrityError
+        self.config.create_benefit_feature(self.sponsor_benefit)
+        self.assertEqual(1, TextAsset.objects.count())
+
+    def test_integrity_error_reraised_when_asset_missing(self):
+        """An IntegrityError that is NOT a duplicate-asset collision must
+        propagate so it doesn't get silently swallowed."""
+        from unittest.mock import patch
+
+        with (
+            patch.object(TextAsset, "save", side_effect=IntegrityError("unrelated")),
+            self.assertRaises(IntegrityError),
+        ):
+            self.config.create_benefit_feature(self.sponsor_benefit)
+
     def test_clone_configuration_for_new_sponsorship_benefit_with_new_due_date(self):
         sp_benefit = baker.make(SponsorshipBenefit, year=2023)
 

bin/start-nginx

@@ -54,6 +54,7 @@ fi
   # We expect nginx to run in foreground.
   # We also expect a socket to be at /tmp/nginx.socket.
   echo 'buildpack=nginx at=nginx-start'
+  rm -f /var/run/cabotage/cabotage.sock
   cd /tmp
   /usr/bin/nginx -p . -c /code/config/nginx.conf
   echo 'nginx' >$psmgr

gunicorn.conf

@@ -1,5 +1,6 @@
 bind = 'unix:/var/run/cabotage/nginx.sock'
 backlog = 1024
+workers = 2
 preload_app = True
 max_requests = 2048
 max_requests_jitter = 128

infra/main.tf

@@ -5,7 +5,7 @@ module "fastly_production" {
   domain          = "python.org"
   subdomain       = "www.python.org"
   extra_domains   = ["www.python.org"]
-  backend_address = "pythondotorg.ingress.us-east-2.psfhosted.computer"
+  backend_address = "psf-pythondotorg-pythondotorg-b0dbd19e-web.psfhosted.net"
   default_ttl     = 3600
 
   datadog_key         = var.DATADOG_API_KEY
@@ -27,7 +27,7 @@ module "fastly_staging" {
   subdomain     = "www.test.python.org"
   extra_domains = ["www.test.python.org"]
   # TODO: adjust to test-pythondotorg when done testing NGWAF
-  backend_address = "pythondotorg.ingress.us-east-2.psfhosted.computer"
+  backend_address = "psf-pythondotorg-pythondotorg-b0dbd19e-web.psfhosted.net"
   default_ttl     = 3600
 
   datadog_key         = var.DATADOG_API_KEY