after audit

app/services/publications/pdf_queue_common.py

@@ -4,6 +4,7 @@ from datetime import UTC, datetime
 
 from app.db.models import PublicationPdfJob, PublicationPdfJobEvent
 
+PDF_STATUS_UNTRACKED = "untracked"
 PDF_STATUS_QUEUED = "queued"
 PDF_STATUS_RUNNING = "running"
 PDF_STATUS_RESOLVED = "resolved"

app/services/publications/pdf_queue_queries.py

@@ -16,14 +16,13 @@ from app.db.models import (
 )
 from app.services.publication_identifiers import application as identifier_service
 from app.services.publication_identifiers.types import DisplayIdentifier
+from app.services.publications.pdf_queue_common import (
+    PDF_STATUS_QUEUED,
+    PDF_STATUS_RUNNING,
+    PDF_STATUS_UNTRACKED,
+)
 from app.services.publications.types import PublicationListItem
 
-PDF_STATUS_UNTRACKED = "untracked"
-PDF_STATUS_QUEUED = "queued"
-PDF_STATUS_RUNNING = "running"
-PDF_STATUS_RESOLVED = "resolved"
-PDF_STATUS_FAILED = "failed"
-
 
 def _bounded_limit(limit: int, *, max_value: int = 500) -> int:
     return max(1, min(int(limit), max_value))

app/services/publications/pdf_queue_resolution.py

@@ -251,7 +251,7 @@ def _drop_finished_task(task: asyncio.Task[None]) -> None:
     try:
         task.result()
     except Exception:
-        logger.exception("publications.pdf_queue.task_failed")
+        structured_log(logger, "exception", "publications.pdf_queue.task_failed")
 
 
 def schedule_rows(

app/services/publications/queries.py

@@ -16,6 +16,12 @@ from app.db.models import (
     ScholarPublication,
 )
 from app.services.publications.modes import MODE_LATEST, MODE_UNREAD
+from app.services.publications.pdf_queue_common import (
+    PDF_STATUS_FAILED,
+    PDF_STATUS_QUEUED,
+    PDF_STATUS_RESOLVED,
+    PDF_STATUS_RUNNING,
+)
 from app.services.publications.types import PublicationListItem, UnreadPublicationItem
 
 
@@ -29,10 +35,10 @@ def _normalized_citation_count(value: object) -> int:
 def _pdf_status_sort_rank():
     return case(
         (Publication.pdf_url.is_not(None), 4),
-        (PublicationPdfJob.status == "resolved", 4),
-        (PublicationPdfJob.status == "running", 3),
-        (PublicationPdfJob.status == "queued", 2),
-        (PublicationPdfJob.status == "failed", 0),
+        (PublicationPdfJob.status == PDF_STATUS_RESOLVED, 4),
+        (PublicationPdfJob.status == PDF_STATUS_RUNNING, 3),
+        (PublicationPdfJob.status == PDF_STATUS_QUEUED, 2),
+        (PublicationPdfJob.status == PDF_STATUS_FAILED, 0),
         else_=1,
     )