@anthusai/papyrus 1.0.0-next.45 → 1.0.0-next.47

package/amplify/functions/content-actions/handler.py

@@ -6,7 +6,7 @@ from typing import Any
 
 from papyrus_content.graphql_authoring import create_authoring_client
 from papyrus_content.markus_renderer.derive import derive_body
-from papyrus_content.projection.engine import project
+from papyrus_content.projection.engine import project, project_item_pages
 from papyrus_content.projection.runtime import (
     DEAD_LETTER_QUEUE_ENV,
     context_from_environment,
@@ -63,7 +63,14 @@ def derive_markus_action(arguments: dict) -> dict:
     return response
 
 
-def send_to_projection_dead_letter_queue(item_id: str, unpublished: bool, error: str) -> None:
+PROJECTION_TASK_KEY = "projectionTask"
+
+
+class ProjectionTaskFailed(Exception):
+    """Raised by an asynchronous projection task so Lambda retries it and, finally, sends it to the dead letter queue."""
+
+
+def send_to_projection_dead_letter_queue(task: dict, error: str) -> None:
     queue_url = (os.environ.get(DEAD_LETTER_QUEUE_ENV) or "").strip()
     if not queue_url:
         return
@@ -71,23 +78,50 @@ def send_to_projection_dead_letter_queue(item_id: str, unpublished: bool, error:
         import boto3
 
         boto3.client("sqs").send_message(
-            QueueUrl=queue_url,
-            MessageBody=json.dumps({"itemId": item_id, "unpublished": unpublished, "error": error}),
+            QueueUrl=queue_url, MessageBody=json.dumps({PROJECTION_TASK_KEY: task, "error": error})
         )
     except Exception:  # noqa: BLE001 - the dead letter is best effort; the response already reports the failure
         pass
 
 
+def schedule_projection_task(task: dict, error: str) -> bool:
+    """Run a projection task later, in this same function, as an asynchronous invocation.
+
+    The function has an on-failure destination (the dead letter queue), so a task
+    that keeps failing ends up there for ``papyrus ops content project --reconcile``.
+    """
+    function_name = (os.environ.get("AWS_LAMBDA_FUNCTION_NAME") or "").strip()
+    if not function_name:
+        send_to_projection_dead_letter_queue(task, error)
+        return False
+    try:
+        import boto3
+
+        boto3.client("lambda").invoke(
+            FunctionName=function_name, InvocationType="Event", Payload=json.dumps({PROJECTION_TASK_KEY: task}).encode("utf-8")
+        )
+        return True
+    except Exception as scheduling_error:  # noqa: BLE001 - fall back to the dead letter queue
+        send_to_projection_dead_letter_queue(task, f"{error}; scheduling failed: {scheduling_error}")
+        return False
+
+
+def projection_context(client):
+    context = context_from_environment(client)
+    context.defer_follow_up = True
+    return context
+
+
 def project_item_action(client, item_id: str, *, unpublished: bool) -> dict:
     if not projection_configured():
         return {}
     liveness = {} if unpublished else {"live": False}
+    task = {"task": "item", "itemId": item_id, "unpublished": unpublished}
     try:
-        context = context_from_environment(client)
-        report = project(context, item_id, unpublished=unpublished)
+        report = project(projection_context(client), item_id, unpublished=unpublished)
     except Exception as error:  # noqa: BLE001 - a projection failure never fails the save
         message = f"{type(error).__name__}: {error}"
-        send_to_projection_dead_letter_queue(item_id, unpublished, message)
+        schedule_projection_task(task, message)
         return {**liveness, "projected": False, "paths": [], "error": message}
     response = {"projected": report.ok, "paths": [*report.written, *report.deleted]}
     if not unpublished:
@@ -97,11 +131,29 @@ def project_item_action(client, item_id: str, *, unpublished: bool) -> dict:
             response["url"] = url
     if not report.ok:
         message = "; ".join(report.errors)
-        send_to_projection_dead_letter_queue(item_id, unpublished, message)
+        schedule_projection_task(task, message)
         response["error"] = message
+    if report.follow_up_item_pages:
+        schedule_projection_task({"task": "item-pages", "exceptItemId": item_id}, "follow-up")
     return response
 
 
+def run_projection_task(task: dict) -> dict:
+    """An asynchronous projection task. Raising makes Lambda retry it, then send the event to the dead letter queue."""
+    client, _claims = create_authoring_client()
+    if task.get("task") == "item-pages":
+        report = project_item_pages(projection_context(client), except_item_id=task.get("exceptItemId"))
+    elif task.get("task") == "item":
+        report = project(projection_context(client), task["itemId"], unpublished=bool(task.get("unpublished")))
+        if report.follow_up_item_pages:
+            schedule_projection_task({"task": "item-pages", "exceptItemId": task["itemId"]}, "follow-up")
+    else:
+        raise ProjectionTaskFailed(f"Unknown projection task {task.get('task')!r}")
+    if not report.ok:
+        raise ProjectionTaskFailed("; ".join(report.errors))
+    return {"ok": True, "paths": [*report.written, *report.deleted]}
+
+
 def save_item_draft_action(arguments: dict, actor: str) -> dict:
     client, _claims = create_authoring_client()
     fields = ItemFields(
@@ -183,6 +235,8 @@ def request_staging_build_action() -> dict:
 
 
 def handler(event, context):
+    if PROJECTION_TASK_KEY in event:
+        return run_projection_task(event[PROJECTION_TASK_KEY])
     field = event["fieldName"]
     arguments = parse_input(event["arguments"]["input"])
     actor = actor_from_event(event)

package/amplify/publication/s3-projection.js

@@ -1,8 +1,9 @@
-import { Duration, RemovalPolicy } from "aws-cdk-lib";
+import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
-import { Effect, PolicyStatement, ServicePrincipal } from "aws-cdk-lib/aws-iam";
+import { Effect, Policy, PolicyStatement, ServicePrincipal } from "aws-cdk-lib/aws-iam";
+import { SqsDestination } from "aws-cdk-lib/aws-lambda-destinations";
 import * as route53 from "aws-cdk-lib/aws-route53";
 import * as s3 from "aws-cdk-lib/aws-s3";
 import * as sqs from "aws-cdk-lib/aws-sqs";
@@ -124,3 +125,20 @@ export function addS3ProjectionPublication(scope, props, media) {
         policyStatements: s3ProjectionPolicyStatements(settingsInput).map((statement) => new PolicyStatement({ effect: Effect.ALLOW, actions: statement.actions, resources: statement.resources })),
     };
 }
+/**
+ * The content-actions function runs a failed or follow-up projection again as an asynchronous
+ * invocation of itself: one retry, and an on-failure destination (the dead letter queue) for
+ * what still fails. The self-invoke permission is a separate policy on the role so that the
+ * function does not depend on a policy that refers to the function.
+ */
+export function addProjectionRetries(lambda, deadLetterQueue) {
+    lambda.configureAsyncInvoke({
+        retryAttempts: 1,
+        maxEventAge: Duration.hours(1),
+        onFailure: new SqsDestination(deadLetterQueue),
+    });
+    new Policy(Stack.of(lambda), "ContentActionsProjectionSelfInvoke", {
+        statements: [new PolicyStatement({ actions: ["lambda:InvokeFunction"], resources: [lambda.functionArn] })],
+        roles: [lambda.role],
+    });
+}

package/amplify/publication/s3-projection.ts

@@ -1,9 +1,11 @@
-import { Duration, RemovalPolicy } from "aws-cdk-lib";
+import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import type { Code } from "aws-cdk-lib/aws-lambda";
 import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
-import { Effect, PolicyStatement, ServicePrincipal } from "aws-cdk-lib/aws-iam";
+import { Effect, Policy, PolicyStatement, ServicePrincipal } from "aws-cdk-lib/aws-iam";
+import type { Function as LambdaFunction } from "aws-cdk-lib/aws-lambda";
+import { SqsDestination } from "aws-cdk-lib/aws-lambda-destinations";
 import * as route53 from "aws-cdk-lib/aws-route53";
 import * as s3 from "aws-cdk-lib/aws-s3";
 import * as sqs from "aws-cdk-lib/aws-sqs";
@@ -172,3 +174,21 @@ export function addS3ProjectionPublication(
     ),
   };
 }
+
+/**
+ * The content-actions function runs a failed or follow-up projection again as an asynchronous
+ * invocation of itself: one retry, and an on-failure destination (the dead letter queue) for
+ * what still fails. The self-invoke permission is a separate policy on the role so that the
+ * function does not depend on a policy that refers to the function.
+ */
+export function addProjectionRetries(lambda: LambdaFunction, deadLetterQueue: sqs.IQueue): void {
+  lambda.configureAsyncInvoke({
+    retryAttempts: 1,
+    maxEventAge: Duration.hours(1),
+    onFailure: new SqsDestination(deadLetterQueue),
+  });
+  new Policy(Stack.of(lambda), "ContentActionsProjectionSelfInvoke", {
+    statements: [new PolicyStatement({ actions: ["lambda:InvokeFunction"], resources: [lambda.functionArn] })],
+    roles: [lambda.role!],
+  });
+}

package/amplify/site-backend.js

@@ -7,7 +7,7 @@ import { CfnIndex, CfnVectorBucket, CfnVectorBucketPolicy } from "aws-cdk-lib/aw
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { DEFAULT_RESOLVER_WAVE_SIZE, orderModelStacksInWaves } from "./resolver-waves.js";
-import { addS3ProjectionPublication } from "./publication/s3-projection.js";
+import { addProjectionRetries, addS3ProjectionPublication } from "./publication/s3-projection.js";
 import { planRenditions } from "./publication/renditions-settings.js";
 import { contentActionsPublicationWiring, planS3ProjectionBackend } from "./publication/s3-projection-settings.js";
 import { rebuildTriggerSettings } from "./rebuild-trigger-settings.js";
@@ -319,6 +319,9 @@ export function defineSiteBackend(papyrusSite) {
         });
         contentActionsLambda.node.defaultChild.memorySize = publicationPlan.contentActionsMemorySize;
     }
+    if (s3ProjectionPublication !== undefined) {
+        addProjectionRetries(contentActionsLambda, s3ProjectionPublication.deadLetterQueue);
+    }
     const publicationWiring = contentActionsPublicationWiring(s3ProjectionPublication);
     for (const [name, value] of Object.entries(publicationWiring.environment)) {
         contentActionsLambda.addEnvironment(name, value);

package/amplify/site-backend.ts

@@ -10,7 +10,7 @@ import type { Construct } from "constructs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { DEFAULT_RESOLVER_WAVE_SIZE, orderModelStacksInWaves } from "./resolver-waves";
-import { addS3ProjectionPublication, type S3ProjectionPublication } from "./publication/s3-projection";
+import { addProjectionRetries, addS3ProjectionPublication, type S3ProjectionPublication } from "./publication/s3-projection";
 import { planRenditions } from "./publication/renditions-settings";
 import { contentActionsPublicationWiring, planS3ProjectionBackend } from "./publication/s3-projection-settings";
 import { rebuildTriggerSettings } from "./rebuild-trigger-settings";
@@ -404,6 +404,9 @@ export function defineSiteBackend(papyrusSite: PapyrusSite) {
     });
     (contentActionsLambda.node.defaultChild as CfnFunction).memorySize = publicationPlan.contentActionsMemorySize;
   }
+  if (s3ProjectionPublication !== undefined) {
+    addProjectionRetries(contentActionsLambda, s3ProjectionPublication.deadLetterQueue);
+  }
   const publicationWiring = contentActionsPublicationWiring(s3ProjectionPublication);
   for (const [name, value] of Object.entries(publicationWiring.environment)) {
     contentActionsLambda.addEnvironment(name, value);

package/package.json

@@ -302,7 +302,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.45",
+  "version": "1.0.0-next.47",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-sdk/client-cognito-identity-provider": "3.1045.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.45",
+  "version": "1.0.0-next.47",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",