fix: don't use DocHistory to find materials (ietf-tools#9771)

* fix: don't use DocHistory to validate revs

The DocHistory records are incomplete and, in particular, -00 revs are
often missing.

* Revert "refactor: get actual rev in _get_materials_doc (ietf-tools#9741)"

This reverts commit 7fd1580

* chore: remove the on-demand resolver api

* chore: fix lint

Author: jennifer-richards

ietf/api/urls.py

@@ -50,7 +50,6 @@
     # Let IESG members set positions programmatically
     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

ietf/meeting/utils.py

@@ -48,7 +48,6 @@
     State,
     NewRevisionDocEvent,
     StateDocEvent,
-    DocHistory,
     StoredObject,
 )
 from ietf.doc.models import DocEvent
@@ -861,7 +860,7 @@ class BlobSpec:
 
 
 def resolve_one_material(
-    doc: Document | DocHistory, rev: str | None, ext: str | None
+    doc: Document, rev: str | None, ext: str | None
 ) -> BlobSpec | None:
     if doc.type_id is None:
         log(f"Cannot resolve a doc with no type: {doc.name}")
@@ -995,12 +994,7 @@ def resolve_materials_for_one_meeting(meeting: Meeting):
         other_revisions = doc.revisions_by_newrevisionevent()
         other_revisions.remove(doc.rev)
         for rev in other_revisions:
-            old_doc = DocHistory.objects.filter(
-                doc=doc, rev=rev
-            ).order_by("-time").first()
-            if old_doc is None:
-                continue
-            blob = resolve_one_material(old_doc, rev=rev, ext=None)
+            blob = resolve_one_material(doc, rev=rev, ext=None)
             if blob is not None:
                 resolved.append(
                     ResolvedMaterial(

ietf/meeting/views.py

@@ -57,7 +57,7 @@
 import debug                            # pyflakes:ignore
 
 from ietf.doc.fields import SearchableDocumentsField
-from ietf.doc.models import Document, State, DocEvent, NewRevisionDocEvent, DocHistory
+from ietf.doc.models import Document, State, DocEvent, NewRevisionDocEvent
 from ietf.doc.storage_utils import (
     remove_from_storage,
     retrieve_bytes,
@@ -98,7 +98,6 @@
     organize_proceedings_sessions,
     resolve_uploaded_material,
     sort_accept_tuple,
-    resolve_one_material,
 )
 from ietf.meeting.utils import add_event_info_to_session_qs
 from ietf.meeting.utils import session_time_for_sorting
@@ -262,7 +261,7 @@ def current_materials(request):
         raise Http404('No such meeting')
 
 
-def _get_materials_doc(name, meeting=None) -> tuple[Document | DocHistory, str | None]:
+def _get_materials_doc(name, meeting=None):
     """Get meeting materials document named by name
 
     Raises Document.DoesNotExist if a match cannot be found. If meeting is None,
@@ -275,23 +274,15 @@ def _matches_meeting(doc, meeting=None):
         return doc.get_related_meeting() == meeting
 
     # try an exact match first
-    doc: Document | DocHistory | None = Document.objects.filter(name=name).first()
+    doc = Document.objects.filter(name=name).first()
     if doc is not None and _matches_meeting(doc, meeting):
         return doc, None
 
     # try parsing a rev number
     if "-" in name:
         docname, rev = name.rsplit("-", 1)
         if len(rev) == 2 and rev.isdigit():
-            try:
-                # may raise Document.DoesNotExist
-                doc = Document.objects.get(name=docname, rev=rev)
-            except Document.DoesNotExist:
-                doc = DocHistory.objects.filter(
-                    name=docname, rev=rev,
-                ).order_by("-time").first()
-                if doc is None:
-                    raise
+            doc = Document.objects.get(name=docname)  # may raise Document.DoesNotExist
             if (
                 _matches_meeting(doc, meeting)
                 and rev in doc.revisions_by_newrevisionevent()
@@ -371,62 +362,6 @@ def materials_document(request, document, num=None, ext=None):
         return HttpResponseRedirect(redirect_to=doc.get_href(meeting=meeting))
 
 
-@requires_api_token
-def api_resolve_materials_name(request, document, num=None, ext=None):
-    """Resolve materials name into document to a blob spec
-
-    Returns the bucket/name of a blob in the blob store that corresponds to the named
-    document. Handles resolution of revision if it is not specified and determines the
-    best extension if one is not provided. Response is JSON.
-
-    As of 2025-10-10 we do not have blobs for all materials documents or for every
-    format of every document. This API still returns the bucket/name as if the blob
-    exists. Another API will allow the caller to obtain the file contents using that
-    name if it cannot be retrieved from the blob store.
-    """
-
-    def _error_response(status: int, detail: str):
-        return JsonResponse(
-            {
-                "status": status,
-                "title": "Error",
-                "detail": detail,
-            },
-            status=status,
-        )
-
-    def _response(bucket: str, name: str):
-        return JsonResponse(
-            {
-                "bucket": bucket,
-                "name": name,
-            }
-        )
-
-    try:
-        meeting = get_meeting(num, type_in=["ietf", "interim"])
-    except Http404 as err404:
-        return _error_response(
-            HTTP_404_NOT_FOUND, str(err404)
-        )
-
-    num = meeting.number
-    try:
-        doc, rev = _get_materials_doc(name=document, meeting=meeting)
-    except Document.DoesNotExist:
-        return _error_response(
-            HTTP_404_NOT_FOUND, f"No such document for meeting {num}"
-        )
-
-    resolved = resolve_one_material(doc, rev, ext)
-    if resolved is not None:
-        return _response(bucket=resolved.bucket, name=resolved.name)
-
-    return _error_response(
-        HTTP_404_NOT_FOUND, f"No suitable file for {document} for meeting {num}"
-    )
-
-
 @requires_api_token("ietf.meeting.views.api_resolve_materials_name")
 def api_resolve_materials_name_cached(request, document, num=None, ext=None):
     """Resolve materials name into document to a blob spec