Messaging and notification feature

.vscode/settings.json

@@ -5,6 +5,7 @@
     "botocore",
     "bsky",
     "buildx",
+    "cbor",
     "cbranch",
     "cfgv",
     "cstat",
@@ -48,7 +49,9 @@
     "ormsgpack",
     "PRAW",
     "psycopg",
+    "pyasn",
     "pylint",
+    "pyopenssl",
     "PYTHONDONTWRITEBYTECODE",
     "PYTHONUNBUFFERED",
     "pytokens",
@@ -66,6 +69,8 @@
     "solomonstre",
     "svix",
     "topicv",
+    "txaio",
+    "ujson",
     "Unparseable",
     "unstub",
     "upserted",
@@ -76,6 +81,7 @@
     "vfarcic",
     "Viktor",
     "xrpc",
-    "xxhash"
+    "xxhash",
+    "zope"
   ]
 }

core/api_urls.py

@@ -11,9 +11,13 @@
 from ingestion.api_urls import (
     register_project_routes as register_ingestion_project_routes,
 )
+from messaging.api_urls import register_root_routes as register_messaging_root_routes
 from newsletters.api_urls import (
     register_project_routes as register_newsletters_project_routes,
 )
+from notifications.api_urls import (
+    register_root_routes as register_notifications_root_routes,
+)
 from pipeline.api_urls import (
     register_project_routes as register_pipeline_project_routes,
 )
@@ -30,6 +34,8 @@
 
 router = DefaultRouter()
 register_projects_root_routes(router)
+register_notifications_root_routes(router)
+register_messaging_root_routes(router)
 
 project_router = NestedSimpleRouter(router, r"projects", lookup="project")
 register_projects_project_routes(project_router)

core/tests/test_entrypoints.py

@@ -2,6 +2,8 @@
 import os
 import sys
 
+from channels.routing import ProtocolTypeRouter
+
 from newsletter_maker.celery import app
 
 
@@ -22,7 +24,10 @@ def test_asgi_module_sets_default_settings_and_builds_application(mocker):
         "DJANGO_SETTINGS_MODULE", "newsletter_maker.settings"
     )
     get_app_mock.assert_called_once_with()
-    assert module.application == "asgi-app"
+    assert module.django_asgi_application == "asgi-app"
+    assert isinstance(module.application, ProtocolTypeRouter)
+    assert module.application.application_mapping["http"] == "asgi-app"
+    assert "websocket" in module.application.application_mapping
 
 
 def test_wsgi_module_sets_default_settings_and_builds_application(mocker):

deploy/argocd/newsletter-maker-staging-application.yaml

@@ -20,4 +20,4 @@ spec:
       prune: true
       selfHeal: true
     syncOptions:
-      - CreateNamespace=true
+      - CreateNamespace=true

deploy/helm/newsletter-maker/templates/configmap.yaml

@@ -10,7 +10,9 @@ data:
   CSRF_TRUSTED_ORIGINS: {{ .Values.env.csrfTrustedOrigins | quote }}
   SITE_ID: {{ .Values.env.siteId | quote }}
   REDIS_URL: {{ include "newsletter-maker.redisUrl" . | quote }}
+  CHANNEL_LAYER_URL: {{ default (include "newsletter-maker.redisUrl" .) .Values.env.channelLayerUrl | quote }}
   QDRANT_URL: {{ include "newsletter-maker.qdrantUrl" . | quote }}
+  MESSAGING_ENABLED: {{ .Values.env.messagingEnabled | quote }}
   NEWSLETTER_API_BASE_URL: {{ .Values.env.newsletterApiBaseUrl | quote }}
   EMAIL_BACKEND: {{ .Values.env.emailBackend | quote }}
   DEFAULT_FROM_EMAIL: {{ .Values.env.defaultFromEmail | quote }}

deploy/helm/newsletter-maker/templates/service-monitor.yaml

@@ -20,4 +20,4 @@ spec:
       bearerTokenSecret:
         name: {{ include "newsletter-maker.secretName" . }}
         key: METRICS_TOKEN
-{{- end }}
+{{- end }}

deploy/helm/newsletter-maker/values-staging.yaml

@@ -7,6 +7,7 @@ env:
   debug: "false"
   allowedHosts: "staging.newsletter-maker.example.com"
   csrfTrustedOrigins: "https://staging.newsletter-maker.example.com"
+  messagingEnabled: "true"
   newsletterApiBaseUrl: "https://staging.newsletter-maker.example.com"
   logLevel: INFO
 
@@ -23,4 +24,4 @@ networkPolicy:
 serviceMonitor:
   enabled: true
   labels:
-    release: kube-prometheus-stack
+    release: kube-prometheus-stack

deploy/helm/newsletter-maker/values.yaml

@@ -11,6 +11,8 @@ env:
   allowedHosts: "localhost,127.0.0.1"
   csrfTrustedOrigins: "http://localhost,http://127.0.0.1"
   siteId: "1"
+  channelLayerUrl: ""
+  messagingEnabled: "true"
   newsletterApiBaseUrl: "http://newsletter-maker.local"
   emailBackend: anymail.backends.resend.EmailBackend
   defaultFromEmail: onboarding@resend.dev

frontend/src/app/(home)/_components/ContentFeed/index.stories.tsx

@@ -38,4 +38,4 @@ export const Empty: Story = {
     filteredContents: [],
     contentClusterLookup: new Map(),
   },
-}
+}

frontend/src/app/(home)/_components/ContentFeed/index.test.tsx

@@ -43,4 +43,4 @@ describe("ContentFeed", () => {
     expect(screen.getByText("reference")).toBeInTheDocument()
     expect(screen.getByRole("button", { name: "Upvote" })).toBeInTheDocument()
   })
-})
+})

frontend/src/app/(home)/_components/ContentFeed/index.tsx

@@ -136,4 +136,4 @@ export function ContentFeed({
       })}
     </div>
   )
-}
+}

frontend/src/app/(home)/_components/DashboardFilterToolbar/index.stories.tsx

@@ -35,4 +35,4 @@ export const Filtered: Story = {
     sourceFilter: "rss",
     duplicateStateFilter: "duplicate_related",
   },
-}
+}

frontend/src/app/(home)/_components/DashboardFilterToolbar/index.test.tsx

@@ -25,4 +25,4 @@ describe("DashboardFilterToolbar", () => {
     expect(container.querySelector('input[name="source"]')).toHaveValue("rss")
     expect(container.querySelector('input[name="days"]')).toHaveValue("30")
   })
-})
+})

frontend/src/app/(home)/_components/DashboardFilterToolbar/index.tsx

@@ -156,4 +156,4 @@ export function DashboardFilterToolbar({
       </CardContent>
     </Card>
   )
-}
+}

frontend/src/app/(home)/_components/DashboardOverview/index.stories.tsx

@@ -24,4 +24,4 @@ export default meta
 
 type Story = StoryObj<typeof meta>
 
-export const Default: Story = {}
+export const Default: Story = {}

frontend/src/app/(home)/_components/DashboardOverview/index.test.tsx

@@ -20,4 +20,4 @@ describe("DashboardOverview", () => {
     expect(screen.getByText("Tracked entities")).toBeInTheDocument()
     expect(screen.getByText("5/2")).toBeInTheDocument()
   })
-})
+})

frontend/src/app/(home)/_components/DashboardOverview/index.tsx

@@ -55,4 +55,4 @@ export function DashboardOverview({
       ))}
     </section>
   )
-}
+}

frontend/src/app/(home)/_components/DashboardSidebar/index.stories.tsx

@@ -23,4 +23,4 @@ export default meta
 
 type Story = StoryObj<typeof meta>
 
-export const Default: Story = {}
+export const Default: Story = {}

frontend/src/app/(home)/_components/DashboardSidebar/index.test.tsx

@@ -20,4 +20,4 @@ describe("DashboardSidebar", () => {
     expect(screen.getByText("Active sources")).toBeInTheDocument()
     expect(screen.getByText("Editorial queue")).toBeInTheDocument()
   })
-})
+})

frontend/src/app/(home)/_components/DashboardSidebar/index.tsx

@@ -46,4 +46,4 @@ export function DashboardSidebar({
       </Card>
     </aside>
   )
-}
+}

frontend/src/app/(home)/_components/HomePageContent/index.stories.tsx

@@ -65,4 +65,4 @@ export const ReviewView: Story = {
   args: {
     view: "review",
   },
-}
+}

frontend/src/app/(home)/_components/HomePageContent/index.test.tsx

@@ -95,4 +95,4 @@ describe("HomePageContent", () => {
     expect(screen.getByText("borderline_relevance")).toBeInTheDocument()
     expect(screen.getByRole("button", { name: "Approve" })).toBeInTheDocument()
   })
-})
+})

frontend/src/app/(home)/_components/HomePageContent/index.tsx

@@ -119,4 +119,4 @@ export function HomePageContent({
       )}
     </AppShell>
   )
-}
+}

frontend/src/app/(home)/_components/ReviewQueueTable/index.stories.tsx

@@ -45,4 +45,4 @@ export const Empty: Story = {
     pendingReviewItems: [],
     contentMap: new Map(),
   },
-}
+}

frontend/src/app/(home)/_components/ReviewQueueTable/index.test.tsx

@@ -47,4 +47,4 @@ describe("ReviewQueueTable", () => {
     expect(screen.getByRole("button", { name: "Approve" })).toBeInTheDocument()
     expect(screen.getByRole("button", { name: "Reject" })).toBeInTheDocument()
   })
-})
+})

frontend/src/app/(home)/_components/ReviewQueueTable/index.tsx

@@ -106,4 +106,4 @@ export function ReviewQueueTable({
       </Table>
     </section>
   )
-}
+}

frontend/src/app/(home)/_components/shared.test.ts

@@ -26,4 +26,4 @@ describe("buildContentClusterLookup", () => {
       velocityScore: 0.8,
     })
   })
-})
+})

frontend/src/app/(home)/_components/shared.ts

@@ -44,4 +44,4 @@ export function buildContentClusterLookup(clusterDetails: TopicClusterDetail[])
   }
 
   return lookup
-}
+}

frontend/src/app/(home)/page.stories.tsx

@@ -71,4 +71,4 @@ export const WithFlashMessages: Story = {
     errorMessage: "Filter failed",
     successMessage: "Filters applied",
   },
-}
+}

frontend/src/app/admin/health/_components/SourceDiversityPanel/index.test.tsx

@@ -95,4 +95,4 @@ describe("SourceDiversityPanel", () => {
       screen.getByText("No source-diversity snapshots exist for this project yet."),
     ).toBeInTheDocument()
   })
-})
+})

frontend/src/app/admin/health/_components/SourceHealthPanel/index.stories.tsx

@@ -54,4 +54,4 @@ export const Empty: Story = {
     statusLabel: "idle",
     statusTone: "neutral",
   },
-}
+}

frontend/src/app/admin/health/_components/SourceHealthPanel/index.test.tsx

@@ -60,4 +60,4 @@ describe("SourceHealthPanel", () => {
       screen.getByText("No source configurations exist for this project yet."),
     ).toBeInTheDocument()
   })
-})
+})

frontend/src/app/admin/health/_components/SourceHealthPanel/index.tsx

@@ -116,4 +116,4 @@ export function SourceHealthPanel({
       </CardContent>
     </Card>
   )
-}
+}

frontend/src/app/admin/health/_components/TopicCentroidPanel/index.stories.tsx

@@ -57,4 +57,4 @@ export const NoSnapshots: Story = {
     statusTone: "neutral",
     statusLabel: "idle",
   },
-}
+}

frontend/src/app/admin/health/_components/TopicCentroidPanel/index.test.tsx

@@ -93,4 +93,4 @@ describe("TopicCentroidPanel", () => {
       screen.getByText("No centroid snapshot history exists for this project yet."),
     ).toBeInTheDocument()
   })
-})
+})

frontend/src/app/admin/health/_components/TopicCentroidPanel/index.tsx

@@ -228,4 +228,4 @@ export function TopicCentroidPanel({
       </Card>
     </>
   )
-}
+}

frontend/src/app/admin/health/_components/TrendTaskRunsPanel/index.stories.tsx

@@ -89,4 +89,4 @@ export const Empty: Story = {
     summary: createSummary({ run_count: 0, failed_run_count: 0, latest_runs: [] }),
     visibleRuns: [],
   },
-}
+}

frontend/src/app/admin/health/_components/TrendTaskRunsPanel/index.test.tsx

@@ -87,4 +87,4 @@ describe("TrendTaskRunsPanel", () => {
       screen.getByText("No trend task run history exists for this project yet."),
     ).toBeInTheDocument()
   })
-})
+})

frontend/src/app/admin/health/_components/TrendTaskRunsPanel/index.tsx

@@ -293,4 +293,4 @@ export function TrendTaskRunsPanel({
       </Card>
     </>
   )
-}
+}

frontend/src/app/admin/projects/new/_components/NewProjectFormCard/index.stories.tsx

@@ -17,4 +17,4 @@ export default meta
 
 type Story = StoryObj<typeof meta>
 
-export const Default: Story = {}
+export const Default: Story = {}

frontend/src/app/admin/projects/new/_components/NewProjectFormCard/index.test.tsx

@@ -25,4 +25,4 @@ describe("NewProjectFormCard", () => {
     expect(redirectInput).toHaveAttribute("name", "redirectTo")
     expect(redirectInput).toHaveAttribute("type", "hidden")
   })
-})
+})

frontend/src/app/admin/projects/new/_components/NewProjectFormCard/index.tsx

@@ -68,4 +68,4 @@ export function NewProjectFormCard() {
       </CardContent>
     </Card>
   )
-}
+}

frontend/src/app/admin/projects/new/_components/ProjectFlashNotice/index.stories.tsx

@@ -28,4 +28,4 @@ export const Error: Story = {
     tone: "error",
     children: "A project with that name already exists.",
   },
-}
+}

frontend/src/app/admin/projects/new/_components/ProjectFlashNotice/index.test.tsx

@@ -30,4 +30,4 @@ describe("ProjectFlashNotice", () => {
       screen.getByText("Project created. You are now the first project admin."),
     ).toBeInTheDocument()
   })
-})
+})

frontend/src/app/admin/projects/new/_components/ProjectFlashNotice/index.tsx

@@ -24,4 +24,4 @@ export function ProjectFlashNotice({ tone, children }: ProjectFlashNoticeProps)
       <AlertDescription>{children}</AlertDescription>
     </Alert>
   )
-}
+}

frontend/src/app/admin/projects/new/page.stories.tsx

@@ -65,4 +65,4 @@ function NewProjectPagePreview({
       <NewProjectFormCard />
     </AppShell>
   )
-}
+}