Merge branch 'main' into rel

Author: davidfischer

adserver/auth/migrations/0011_alter_useradvertisermember_unique_together.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-11-01 16:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adserver', '0104_auto_renew_payment_method'),
+        ('adserver_auth', '0010_data_all_emails_verified'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='useradvertisermember',
+            unique_together={('user', 'advertiser')},
+        ),
+    ]

adserver/auth/models.py

@@ -255,6 +255,8 @@ class Meta:
         # To do that, we needed to start with the same table
         db_table = "adserver_auth_user_advertisers"
 
+        unique_together = ("user", "advertiser")
+
 
 class UserPublisherMember(models.Model):
     """User-Publisher 'through' model."""

adserver/forms.py

@@ -903,6 +903,16 @@ def save(self, commit=True):
             for field in fields:
                 setattr(self.instance, field, getattr(self.old_flight, field))
 
+            # Set sold impressions/clicks appropriately based on supplied budget
+            if self.cleaned_data["budget"] > 0 and self.instance.cpm > 0:
+                self.instance.sold_impressions = int(
+                    self.cleaned_data["budget"] * 1000 / float(self.instance.cpm)
+                )
+            elif self.cleaned_data["budget"] > 0 and self.instance.cpc > 0:
+                self.instance.sold_clicks = int(
+                    self.cleaned_data["budget"] / float(self.instance.cpc)
+                )
+
         # We must set the campaign
         self.instance.campaign = (
             self.old_flight.campaign

adserver/tests/test_advertiser_dashboard.py

@@ -1252,6 +1252,7 @@ def test_authorized_users_invite_existing(self):
         self.assertContains(response, "Successfully invited")
         self.assertEqual(User.objects.filter(email=email).count(), 1)
         self.assertEqual(User.objects.filter(name=name).count(), 1)
+        self.assertEqual(UserAdvertiserMember.objects.filter(advertiser=self.advertiser, user__email=email).count(), 1)
 
         # The 2nd request didn't create a user or update the user's name
         self.assertEqual(User.objects.filter(name="Yet Another User").count(), 0)

adserver/views.py

@@ -1857,13 +1857,16 @@ def dispatch(self, request, *args, **kwargs):
     def form_valid(self, form):
         result = super().form_valid(form)
 
-        # Add m2m and role
-        role = form.cleaned_data["role"]
-        UserAdvertiserMember.objects.create(
-            advertiser=self.advertiser,
-            user=self.object,
-            role=role,
-        )
+        if not UserAdvertiserMember.objects.filter(
+            advertiser=self.advertiser, user=self.object
+        ).exists():
+            # Add m2m and role
+            role = form.cleaned_data["role"]
+            UserAdvertiserMember.objects.create(
+                advertiser=self.advertiser,
+                user=self.object,
+                role=role,
+            )
 
         messages.success(
             self.request,

config/settings/production.py

@@ -45,6 +45,9 @@
 USE_DB_POOLING = env.bool("USE_DB_POOLING", default=False)
 for db in ("default", "replica"):
     if db in DATABASES:
+        # https://docs.djangoproject.com/en/dev/topics/db/transactions/#tying-transactions-to-http-requests
+        DATABASES[db]["ATOMIC_REQUESTS"] = True
+
         if "OPTIONS" not in DATABASES[db]:
             DATABASES[db]["OPTIONS"] = {}
 
@@ -66,6 +69,16 @@
     "propagate": False,
 }
 
+# The analyzer can log very verbosely on error URLs
+LOGGING["loggers"]["trafilatura.downloads"] = {
+    "handlers": ["null"],
+    "propagate": False,
+}
+LOGGING["loggers"]["trafilatura.core"] = {
+    "handlers": ["null"],
+    "propagate": False,
+}
+
 
 # Cache
 # https://docs.djangoproject.com/en/dev/topics/cache/

requirements/analyzer.in

@@ -1,6 +1,7 @@
 # Used by the keyword/topic analyzer
 beautifulsoup4
 textacy
+markdownify >= 1.2.0
 
 # Must pin to a version compatible with the spacy-model below
 spacy[transformers] >=3.8.7,< 4.0

requirements/analyzer.txt

@@ -36,7 +36,9 @@ azure-storage-blob==12.26.0
 babel==2.17.0
     # via courlan
 beautifulsoup4==4.13.5
-    # via -r analyzer.in
+    # via
+    #   -r analyzer.in
+    #   markdownify
 blis==1.2.1
     # via thinc
 boto3==1.40.39
@@ -176,6 +178,8 @@ marisa-trie==1.3.1
     # via language-data
 markdown-it-py==4.0.0
     # via rich
+markdownify==1.2.0
+    # via -r analyzer.in
 markupsafe==3.0.2
     # via jinja2
 mdurl==0.1.2
@@ -345,6 +349,7 @@ six==1.17.0
     # via
     #   azure-core
     #   langdetect
+    #   markdownify
     #   python-dateutil
 smart-open==7.3.1
     # via weasel

requirements/base.txt

@@ -54,7 +54,7 @@ cryptography==45.0.6
     # via fido2
 dj-stripe==2.8.4
     # via -r base.in
-django==5.2.7
+django==5.2.8
     # via
     #   -r base.in
     #   crispy-bootstrap4

requirements/development.txt

@@ -86,7 +86,7 @@ distlib==0.4.0
     # via virtualenv
 dj-stripe==2.8.4
     # via -r base.in
-django==5.2.7
+django==5.2.8
     # via
     #   -r base.in
     #   crispy-bootstrap4