feat: precompute blob lookups for meeting materials

ietf/api/urls.py

@@ -51,6 +51,7 @@
     url(r'^iesg/position', views_ballot.api_set_position),
     # Find the blob to store for a given materials document path
     url(r'^meeting/(?:(?P<num>(?:interim-)?[a-z0-9-]+)/)?materials/%(document)s(?P<ext>\.[A-Za-z0-9]+)?/resolve/$' % settings.URL_REGEXPS, meeting_views.api_resolve_materials_name),
+    url(r'^meeting/(?:(?P<num>(?:interim-)?[a-z0-9-]+)/)?materials/%(document)s(?P<ext>\.[A-Za-z0-9]+)?/resolve-cached/$' % settings.URL_REGEXPS, meeting_views.api_resolve_materials_name_cached),
     url(r'^meeting/blob/(?P<bucket>[a-z0-9-]+)/(?P<name>[a-z][a-z0-9.-]+)$', meeting_views.api_retrieve_materials_blob),
     # Let Meetecho set session video URLs
     url(r'^meeting/session/video/url$', meeting_views.api_set_session_video_url),

ietf/meeting/admin.py

@@ -9,7 +9,7 @@
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
     SessionPresentation, ImportantDate, SlideSubmission, SchedulingEvent, BusinessConstraint,
     ProceedingsMaterial, MeetingHost, Registration, RegistrationTicket,
-    AttendanceTypeName)
+    AttendanceTypeName, ResolvedMaterial)
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -288,3 +288,13 @@ def display_meeting(self, instance):
     display_meeting.short_description = "Meeting"  # type: ignore # https://github.com/python/mypy/issues/2087
 
 admin.site.register(RegistrationTicket, RegistrationTicketAdmin)
+
+
+class ResolvedMaterialAdmin(admin.ModelAdmin):
+    model = ResolvedMaterial
+    list_display = ["name", "meeting_number", "bucket", "blob"]
+    list_filter = ["meeting_number", "bucket"]
+    search_fields = ["name", "blob"]
+    ordering = ["name"]
+
+admin.site.register(ResolvedMaterial, ResolvedMaterialAdmin)

ietf/meeting/migrations/0017_resolvedmaterial_and_more.py

@@ -0,0 +1,48 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0016_alter_meeting_country_alter_meeting_time_zone"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ResolvedMaterial",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(help_text="Name to resolve", max_length=300)),
+                (
+                    "meeting_number",
+                    models.CharField(
+                        help_text="Meeting material is related to", max_length=64
+                    ),
+                ),
+                (
+                    "bucket",
+                    models.CharField(help_text="Resolved bucket name", max_length=255),
+                ),
+                (
+                    "blob",
+                    models.CharField(help_text="Resolved blob name", max_length=300),
+                ),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name="resolvedmaterial",
+            constraint=models.UniqueConstraint(
+                fields=("name", "meeting_number"), name="unique_name_per_meeting"
+            ),
+        ),
+    ]

ietf/meeting/models.py

@@ -956,6 +956,27 @@ class Meta:
     def __str__(self):
         return u"%s -> %s-%s" % (self.session, self.document.name, self.rev)
 
+
+class ResolvedMaterial(models.Model):
+    # A Document name can be 255 characters; allow this name to be a bit longer
+    name = models.CharField(max_length=300, help_text="Name to resolve")
+    meeting_number = models.CharField(
+        max_length=64, help_text="Meeting material is related to"
+    )
+    bucket = models.CharField(max_length=255, help_text="Resolved bucket name")
+    blob = models.CharField(max_length=300, help_text="Resolved blob name")
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["name", "meeting_number"], name="unique_name_per_meeting"
+            )
+        ]
+
+    def __str__(self):
+        return f"{self.name}@{self.meeting_number} -> {self.bucket}:{self.blob}"
+
+
 constraint_cache_uses = 0
 constraint_cache_initials = 0
 

ietf/meeting/resources.py

@@ -11,11 +11,15 @@
 
 from ietf import api
 
-from ietf.meeting.models import ( Meeting, ResourceAssociation, Constraint, Room, Schedule, Session,
-                                TimeSlot, SchedTimeSessAssignment, SessionPresentation, FloorPlan,
-                                UrlResource, ImportantDate, SlideSubmission, SchedulingEvent,
-                                BusinessConstraint, ProceedingsMaterial, MeetingHost, Attended,
-                                Registration, RegistrationTicket)
+from ietf.meeting.models import (Meeting, ResourceAssociation, Constraint, Room,
+                                 Schedule, Session,
+                                 TimeSlot, SchedTimeSessAssignment, SessionPresentation,
+                                 FloorPlan,
+                                 UrlResource, ImportantDate, SlideSubmission,
+                                 SchedulingEvent,
+                                 BusinessConstraint, ProceedingsMaterial, MeetingHost,
+                                 Attended,
+                                 Registration, RegistrationTicket, ResolvedMaterial)
 
 from ietf.name.resources import MeetingTypeNameResource
 class MeetingResource(ModelResource):
@@ -472,3 +476,20 @@ class Meta:
             "registration": ALL_WITH_RELATIONS,
         }
 api.meeting.register(RegistrationTicketResource())
+
+
+class ResolvedMaterialResource(ModelResource):
+    class Meta:
+        queryset = ResolvedMaterial.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'resolvedmaterial'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "name": ALL,
+            "meeting_number": ALL,
+            "bucket": ALL,
+            "blob": ALL,
+        }
+api.meeting.register(ResolvedMaterialResource())

ietf/meeting/tasks.py

@@ -2,12 +2,14 @@
 #
 # Celery task definitions
 #
+import datetime
+
 from celery import shared_task
 from django.utils import timezone
 
 from ietf.utils import log
 from .models import Meeting
-from .utils import generate_proceedings_content
+from .utils import generate_proceedings_content, resolve_materials_for_one_meeting
 from .views import generate_agenda_data
 from .utils import fetch_attendance_from_meetings
 
@@ -61,3 +63,24 @@ def fetch_meeting_attendance_task():
                     meeting_stats['processed']
                 )
             )
+
+
+@shared_task
+def resolve_meeting_materials_task(*, meetings=None, meetings_since=None):
+    if meetings_since is not None:
+        meetings_since = datetime.datetime.fromisoformat(meetings_since)
+    if meetings is None:
+        if meetings_since is None:
+            log.log("No meetings requested, doing nothing.")
+            return
+        meetings = Meeting.objects.filter(date__gte=meetings_since)
+        log.log(f"Resolving materials for meetings since {meetings_since}")
+    else:
+        if meetings_since is not None:
+            log.log("Ignoring meetings_since because specific meetings were requested.")
+        meetings = Meeting.objects.filter(number__in=meetings)
+    for meeting in meetings:
+        log.log(f"Resolving materials for {meeting.type_id} meeting {meeting.number}...")
+        mark = timezone.now()
+        resolve_materials_for_one_meeting(meeting)
+        log.log(f"Resolved in {(timezone.now() - mark).total_seconds():0.3f} seconds.")