@anthusai/papyrus 2.0.0-next.43 → 2.0.0-next.44

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

@@ -27,6 +27,7 @@ from papyrus_content.story_reporting import save_story_version
 from papyrus_content.publication import ensure_publication_from_environment
 from papyrus_content.editorial_checks import GraphQLEditorialStore, ensure_default_policies
 from papyrus_content.reference_intake import IntakeError, intake_references
+from papyrus_content.publish_alerts import PUBLISHED_TASK_KEY, announce_published
 from papyrus_content.publishing import (
     ItemFields,
     PublishError,
@@ -119,11 +120,17 @@ def projection_context(client):
     return context
 
 
-def project_item_action(client, item_id: str, *, unpublished: bool) -> dict:
+def project_item_action(client, item_id: str, *, unpublished: bool, published_item_id: str | None = None) -> dict:
+    """Project one item. ``published_item_id`` is passed only for a real publish: the alert is announced once the page
+    is live, here when the projection succeeds, or by the scheduled retry (which carries the same marker) when it did not."""
     if not projection_configured():
+        if published_item_id:
+            announce_published(item_id, published_item_id)
         return {}
     liveness = {} if unpublished else {"live": False}
     task = {"task": "item", "itemId": item_id, "unpublished": unpublished}
+    if published_item_id:
+        task[PUBLISHED_TASK_KEY] = {"publishedItemId": published_item_id}
     try:
         report = project(projection_context(client), item_id, unpublished=unpublished)
     except Exception as error:  # noqa: BLE001 - a projection failure never fails the save
@@ -145,6 +152,8 @@ def project_item_action(client, item_id: str, *, unpublished: bool) -> dict:
         schedule_unpurged_invalidation(report.unpurged)
     if report.follow_up_item_pages:
         schedule_projection_task({"task": "item-pages", "exceptItemId": item_id}, "follow-up")
+    if report.ok and published_item_id:
+        announce_published(item_id, published_item_id)
     return response
 
 
@@ -201,6 +210,10 @@ def run_projection_task(task: dict) -> dict:
         schedule_unpurged_invalidation(report.unpurged)
     if not report.ok:
         raise ProjectionTaskFailed("; ".join(report.errors))
+    published = task.get(PUBLISHED_TASK_KEY)
+    if task.get("task") == "item" and not task.get("unpublished") and isinstance(published, dict):
+        # A real publish (the CLI marks it, as does the newsroom's retry): the page is live, so tell the newsletter.
+        announce_published(task["itemId"], published.get("publishedItemId"))
     return {"ok": True, "paths": [*report.written, *report.deleted]}
 
 
@@ -286,7 +299,9 @@ def publish_item_action(arguments: dict, actor: str) -> dict:
     }
     if result.changed:
         response.update(site_triggers_for(client, arguments["id"]))
-    response.update(project_item_action(client, arguments["id"], unpublished=False))
+    response.update(
+        project_item_action(client, arguments["id"], unpublished=False, published_item_id=result.published_item_id if result.changed else None)
+    )
     return response
 
 

package/amplify/plugins/newsletter/papyrus.plugin.js

@@ -15,9 +15,11 @@ import { pythonLambdaCode } from "../../functions/shared/python-bundle.js";
 import { resolveNewsletterConfig } from "./config.js";
 import { newsletterOps } from "./ops/resource.js";
 import { NEWSLETTER_MUTATIONS, NEWSLETTER_QUERIES, newsletterSchemaDefinitions } from "./schema.js";
-import { newsletterFunctionName, wireSending } from "./sending.js";
+import { functionArn, newsletterFunctionName, wireSending } from "./sending.js";
 export { resolveNewsletterConfig };
 export const NEWSLETTER_OUTPUT_KEY = "newsletter";
+/** Set on the site's content-actions function: it invokes this function (`item-published`) after a real publish. Unset: no alerts. */
+export const NEWSLETTER_FUNCTION_ENV = "PAPYRUS_NEWSLETTER_FUNCTION";
 export const NEWSLETTER_HANDLER = "papyrus_content.newsletter.handler.handler";
 /** `boto3` is bundled because the runtime's copy may predate SESv2 `Simple.Headers` (List-Unsubscribe). */
 export const NEWSLETTER_REQUIREMENTS = ["PyYAML>=6.0.2,<7", "citeproc-py>=0.8.2,<1", "anthus-markus==0.7.0", "Pillow>=11.3,<12", "boto3>=1.35.8,<2"];
@@ -70,13 +72,16 @@ export function newsletterEnvironment(config, tableName, keyParameter) {
         FROM_NAME: config.fromName,
         CONFIGURATION_SET: config.configurationSet,
         ITEM_URL_STYLE: config.itemUrlStyle,
+        INSTANT_ALERTS: config.instantAlerts ? "true" : "false",
         LISTS_JSON: JSON.stringify(config.lists.map((list) => ({
             id: list.id,
             name: list.name,
             description: list.description,
             kind: list.kind,
-            // A roundup's issue type, archive section and time zone are what drafting needs; schedules and rules stay in the stack.
+            // A roundup's issue type, archive section and time zone are what drafting needs; its schedule stays in the stack.
             ...(list.kind === "roundup" ? { issueType: list.issueType, archivePath: list.archivePath, timezone: list.schedule.timezone } : {}),
+            // An alert's rule and approval decide which published items raise an alert and whether an admin approves it.
+            ...(list.kind === "alert" ? { rule: list.rule, approval: list.approval } : {}),
         }))),
         THEME_JSON: JSON.stringify(config.theme),
         ALARM_NAMES: Object.values(newsletterAlarmNames(config.siteId)).join(","),
@@ -229,6 +234,15 @@ export const newsletterPlugin = {
             });
             alarm.addAlarmAction(new SnsAction(alarmTopic));
         }
+        // The publish path tells this function about a real publish. The ARN is spelled out (not referenced) so the content-actions
+        // stack does not depend on this one, and the grant is for this one function only.
+        const contentActions = context.contentActionsLambda;
+        contentActions.addEnvironment(NEWSLETTER_FUNCTION_ENV, newsletterFunctionName(config.siteId));
+        contentActions.addToRolePolicy(new PolicyStatement({
+            effect: Effect.ALLOW,
+            actions: ["lambda:InvokeFunction"],
+            resources: [functionArn(Stack.of(contentActions), newsletterFunctionName(config.siteId))],
+        }));
         lambda.addPermission("InvokeFromCmsCompute", {
             principal: new ArnPrincipal(config.computeRoleArn),
             action: "lambda:InvokeFunction",

package/amplify/plugins/newsletter/papyrus.plugin.ts

@@ -16,12 +16,14 @@ import type { PapyrusPlugin, PluginManifest, PluginWiringContext } from "../type
 import { resolveNewsletterConfig, type NewsletterConfig } from "./config";
 import { newsletterOps } from "./ops/resource";
 import { NEWSLETTER_MUTATIONS, NEWSLETTER_QUERIES, newsletterSchemaDefinitions } from "./schema";
-import { newsletterFunctionName, wireSending } from "./sending";
+import { functionArn, newsletterFunctionName, wireSending } from "./sending";
 
 export { resolveNewsletterConfig };
 export type { NewsletterConfig };
 
 export const NEWSLETTER_OUTPUT_KEY = "newsletter";
+/** Set on the site's content-actions function: it invokes this function (`item-published`) after a real publish. Unset: no alerts. */
+export const NEWSLETTER_FUNCTION_ENV = "PAPYRUS_NEWSLETTER_FUNCTION";
 export const NEWSLETTER_HANDLER = "papyrus_content.newsletter.handler.handler";
 /** `boto3` is bundled because the runtime's copy may predate SESv2 `Simple.Headers` (List-Unsubscribe). */
 export const NEWSLETTER_REQUIREMENTS = ["PyYAML>=6.0.2,<7", "citeproc-py>=0.8.2,<1", "anthus-markus==0.7.0", "Pillow>=11.3,<12", "boto3>=1.35.8,<2"];
@@ -83,14 +85,17 @@ export function newsletterEnvironment(config: NewsletterConfig, tableName: strin
     FROM_NAME: config.fromName,
     CONFIGURATION_SET: config.configurationSet,
     ITEM_URL_STYLE: config.itemUrlStyle,
+    INSTANT_ALERTS: config.instantAlerts ? "true" : "false",
     LISTS_JSON: JSON.stringify(
       config.lists.map((list) => ({
         id: list.id,
         name: list.name,
         description: list.description,
         kind: list.kind,
-        // A roundup's issue type, archive section and time zone are what drafting needs; schedules and rules stay in the stack.
+        // A roundup's issue type, archive section and time zone are what drafting needs; its schedule stays in the stack.
         ...(list.kind === "roundup" ? { issueType: list.issueType, archivePath: list.archivePath, timezone: list.schedule.timezone } : {}),
+        // An alert's rule and approval decide which published items raise an alert and whether an admin approves it.
+        ...(list.kind === "alert" ? { rule: list.rule, approval: list.approval } : {}),
       })),
     ),
     THEME_JSON: JSON.stringify(config.theme),
@@ -268,6 +273,18 @@ export const newsletterPlugin: PapyrusPlugin<NewsletterConfig, { newsletterOps:
       alarm.addAlarmAction(new SnsAction(alarmTopic));
     }
 
+    // The publish path tells this function about a real publish. The ARN is spelled out (not referenced) so the content-actions
+    // stack does not depend on this one, and the grant is for this one function only.
+    const contentActions = context.contentActionsLambda;
+    contentActions.addEnvironment(NEWSLETTER_FUNCTION_ENV, newsletterFunctionName(config.siteId));
+    contentActions.addToRolePolicy(
+      new PolicyStatement({
+        effect: Effect.ALLOW,
+        actions: ["lambda:InvokeFunction"],
+        resources: [functionArn(Stack.of(contentActions), newsletterFunctionName(config.siteId))],
+      }),
+    );
+
     lambda.addPermission("InvokeFromCmsCompute", {
       principal: new ArnPrincipal(config.computeRoleArn),
       action: "lambda:InvokeFunction",

package/amplify/plugins/newsletter/sending.js

@@ -13,9 +13,10 @@ export const SCHEDULE_NAME_PREFIX = "papyrus-nl-";
 export const newsletterFunctionName = (siteId) => `papyrus-newsletter-${siteId}`;
 export const newsletterWorkerName = (siteId) => `papyrus-newsletter-send-${siteId}`;
 export const newsletterSendQueueName = (siteId) => `papyrus-newsletter-send-${siteId}`;
-/** The AppSync fields the `newsletter` function reads and writes through the content API (the roundup draft and the issue's Item). */
+/** The AppSync fields the `newsletter` function reads and writes through the content API (the roundup draft, the issue's Item, and the published item an alert is about). */
 export const NEWSLETTER_APPSYNC_FIELDS = [
     "Query/fields/getItem",
+    "Query/fields/getPublishedItem",
     "Query/fields/listPublishedItems",
     "Mutation/fields/createItem",
     "Mutation/fields/updateItem",
@@ -33,7 +34,7 @@ export function functionArn(stack, name) {
 /**
  * Everything that sends: the queue and its dead letter queue, the send worker, the scheduler role and the per-list
  * draft schedules, and the IAM they need. Nothing here lets the function reach anything but its own queue, its own
- * schedules (`papyrus-nl-<siteId>-*`), two postal address parameters and four content API fields.
+ * schedules (`papyrus-nl-<siteId>-*`), two postal address parameters and five content API fields.
  */
 export function wireSending(inputs) {
     const { stack, config, context, backend, table, lambda, environment, keyParameterArn, sesResources, code } = inputs;

package/amplify/plugins/newsletter/sending.ts

@@ -19,9 +19,10 @@ export const newsletterFunctionName = (siteId: string) => `papyrus-newsletter-${
 export const newsletterWorkerName = (siteId: string) => `papyrus-newsletter-send-${siteId}`;
 export const newsletterSendQueueName = (siteId: string) => `papyrus-newsletter-send-${siteId}`;
 
-/** The AppSync fields the `newsletter` function reads and writes through the content API (the roundup draft and the issue's Item). */
+/** The AppSync fields the `newsletter` function reads and writes through the content API (the roundup draft, the issue's Item, and the published item an alert is about). */
 export const NEWSLETTER_APPSYNC_FIELDS = [
   "Query/fields/getItem",
+  "Query/fields/getPublishedItem",
   "Query/fields/listPublishedItems",
   "Mutation/fields/createItem",
   "Mutation/fields/updateItem",
@@ -58,7 +59,7 @@ type SendingInputs = {
 /**
  * Everything that sends: the queue and its dead letter queue, the send worker, the scheduler role and the per-list
  * draft schedules, and the IAM they need. Nothing here lets the function reach anything but its own queue, its own
- * schedules (`papyrus-nl-<siteId>-*`), two postal address parameters and four content API fields.
+ * schedules (`papyrus-nl-<siteId>-*`), two postal address parameters and five content API fields.
  */
 export function wireSending(inputs: SendingInputs): { queue: Queue; deadLetterQueue: Queue; worker: LambdaFunction; schedulerRole: Role } {
   const { stack, config, context, backend, table, lambda, environment, keyParameterArn, sesResources, code } = inputs;

package/package.json

@@ -428,7 +428,7 @@
       "optional": true
     }
   },
-  "version": "2.0.0-next.43",
+  "version": "2.0.0-next.44",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-crypto/sha256-js": "5.2.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-next.43",
+  "version": "2.0.0-next.44",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",