@happyvertical/smrt-education 0.57.52 → 0.58.0

package/dist/ingestion.d.ts

@@ -33,12 +33,12 @@ export declare function processEducationAnalysis(input: {
 }>;
 import type { IngestionScope } from '@happyvertical/smrt-ingestion/server';
 import type { LearnerRequest } from './learner-service.js';
+import { type WorkAssessment } from './lesson-work-contracts.js';
+import { LessonWorkService } from './lesson-work-service.js';
 import type { SubmissionService } from './submission-service.js';
-import { type WorkbookAssessment } from './workbook-contracts.js';
-import { WorkbookService } from './workbook-service.js';
 export type EducationIntakeCaptureRequest = LearnerRequest & {
-    workbookActivityId?: string;
-    assistance?: import('./workbook-contracts.js').WorkbookAssistance;
+    lessonActivityId?: string;
+    assistance?: import('./lesson-work-contracts.js').WorkAssistance;
     enrollmentId: string;
     lessonId: string;
     itemId: string;
@@ -70,6 +70,7 @@ export declare function captureEducationIntake(input: {
     pages: ReadonlyArray<{
         assetId: string;
         sortOrder: number;
+        pageKey: string;
     }>;
     awaitingParentRelease?: boolean;
     sourceRequiresParentRelease?: boolean;
@@ -94,8 +95,8 @@ export declare function educationIntakeHandlers(input: {
     };
     /** After capture, bind a new grading stage to this exact immutable attempt. */
     submissionId?: string;
-    workbookActivityId?: string;
-    workbookVocabulary?: WorkbookAssessment['vocabulary'];
+    lessonActivityId?: string;
+    workVocabulary?: WorkAssessment['vocabulary'];
 }): OperationHandler[];
 /** Owning education target resolver for ingestion's transactional host hook.
  * Serializes with education enrollment mutations, then performs public service
@@ -109,7 +110,7 @@ export declare function educationIntakeTargetResolver(input: {
     };
     submissionId?: string;
 }): import('@happyvertical/smrt-ingestion/execution').IntakeExecutionOptions['assertTarget'];
-export type WorkbookPreservationResult = {
+export type WorkPreservationResult = {
     kind: 'pending';
 } | {
     kind: 'unavailable';
@@ -127,16 +128,16 @@ export type WorkbookPreservationResult = {
  * never an educational mark or a generic server error. Education authorization,
  * integrity and DB errors throw; unavailable scratch never grants raw access.
  */
-export declare function preserveWorkbookIntakeAnalysis(input: {
+export declare function preserveWorkIntakeAnalysis(input: {
     ingestion: IngestionService;
-    workbooks: WorkbookService;
+    workbooks: LessonWorkService;
     request: LearnerRequest & {
         enrollmentId: string;
     };
     activityId: string;
     submissionId: string;
-    workbookVocabulary?: WorkbookAssessment['vocabulary'];
-}): Promise<WorkbookPreservationResult>;
+    workVocabulary?: WorkAssessment['vocabulary'];
+}): Promise<WorkPreservationResult>;
 export { receiveFamilyIntake, retainFamilyIntakeReceipt, } from './family-intake-ingestion.js';
 export { FamilyIntakeService } from './family-intake-service.js';
 export { educationQuestionExtractionHandler, preserveQuestionExtractionAnalysis, QUESTION_EXTRACTION_HANDLER_ID, questionExtractionGrounding, } from './question-extraction-ingestion.js';

package/dist/ingestion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ingestion.d.ts","sourceRoot":"","sources":["../src/ingestion.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ingestion.d.ts","sourceRoot":"","sources":["../src/ingestion.ts"],"names":[],"mappings":"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"}

package/dist/ingestion.js

@@ -1,4 +1,4 @@
-import { D as QUESTION_EXTRACTION_ARGS_SCHEMA, Gt as validateWorkbookAssessment, Ht as WorkbookAssessmentValidationError, Kt as workbookAggregateFeedback, S as questionExtractionProposalDigest, Vt as WORKBOOK_MATH_VOCABULARY, Wt as aggregateWorkbookQuestions, X as QuestionExtractionValidationError, Y as QuestionExtractionPendingError, an as FamilyIntakeDecisionCollection, d as WorkbookPhotoIntakeCollection, f as validateWorkbookPhotoIdentification, m as normalizeWorkbookAnswerRegions, n as preservePhotoProposal, nn as FamilyIntakeAssetCollection, nt as LearnerAuthorizationError, on as familyIntakeScopeId, p as normalizeWorkbookObservedLayout, r as WorkbookService, rn as FamilyIntakeCollection, s as WorkbookPhotoAssetCollection, t as WorkbookPhotoService } from "./chunks/workbook-photo-service-BtMQsbhq.js";
+import { F as normalizeWorkObservedLayout, I as normalizeWorkAnswerRegions, It as FamilyIntakeAssetCollection, Lt as FamilyIntakeCollection, M as QuestionExtractionPendingError, N as QuestionExtractionValidationError, Nt as WorkbookPhotoIntakeCollection, P as LessonWorkService, Tt as familyIntakeScopeId, Y as LearnerAuthorizationError, a as questionExtractionProposalDigest, an as aggregateWorkQuestions, kt as WorkbookPhotoAssetCollection, n as preservePhotoProposal, nn as WORK_MATH_VOCABULARY, on as validateWorkAssessment, r as validateWorkbookPhotoIdentification, rn as WorkAssessmentValidationError, sn as workAggregateFeedback, t as WorkbookPhotoService, u as QUESTION_EXTRACTION_ARGS_SCHEMA, zt as FamilyIntakeDecisionCollection } from "./chunks/workbook-photo-service-COtyQL1y.js";
 import { getCurrentTenant, withTenant } from "@happyvertical/smrt-tenancy";
 import { withPrivateAssetAccess } from "@happyvertical/smrt-assets";
 import { registerPermissionDefinitions } from "@happyvertical/smrt-users";
@@ -778,19 +778,19 @@ function workbookPhotoIntakeHandlers(input) {
 			],
 			references: { workbookId: {
 				kind: "candidate",
-				model: "@happyvertical/smrt-education:Workbook"
+				model: "@happyvertical/smrt-education:Course"
 			} },
 			candidates: async (query, context, page) => {
 				await authorize(context);
-				const books = await bound(context, (service) => service.listWorkbookPhotoWorkbooks(input.request));
+				const books = await bound(context, (service) => service.listPhotoBookCourses(input.request));
 				const needle = query.toLowerCase();
 				const ordered = [...books].sort((a, b) => Number(b.title.toLowerCase().includes(needle)) - Number(a.title.toLowerCase().includes(needle)) || a.id.localeCompare(b.id));
 				return {
 					items: ordered.slice(0, page.limit).map((book) => ({
-						model: "@happyvertical/smrt-education:Workbook",
+						model: "@happyvertical/smrt-education:Course",
 						id: book.id,
 						revision: workbookRevision(book),
-						label: JSON.stringify(book)
+						label: JSON.stringify(wireCandidate(book))
 					})),
 					hasMore: ordered.length > page.limit
 				};
@@ -821,12 +821,19 @@ function workbookPhotoIntakeHandlers(input) {
 		}
 	}];
 }
+function wireCandidate(book) {
+	const { bookKey, ...rest } = book;
+	return {
+		...rest,
+		workbookKey: bookKey
+	};
+}
 function workbookRevision(book) {
 	return `workbook:${createHash("sha256").update(canonical(book)).digest("hex")}`;
 }
 function workbookPhotoIntakeTargetResolver(input) {
 	return async ({ db, scope, itemId, model, id, revision }) => {
-		if (model !== "@happyvertical/smrt-education:Workbook") throw new Error("Photo target unavailable");
+		if (model !== "@happyvertical/smrt-education:Course") throw new Error("Photo target unavailable");
 		const book = (await withTenant({
 			...getCurrentTenant(),
 			tenantId: input.request.tenantId,
@@ -834,7 +841,7 @@ function workbookPhotoIntakeTargetResolver(input) {
 			superAdminBypass: false
 		}, () => input.workbooks.withExecutor(db, async (service) => {
 			await service.assertWorkbookPhotoScope(input.request, scope, itemId);
-			return service.listWorkbookPhotoWorkbooks(input.request);
+			return service.listPhotoBookCourses(input.request);
 		}))).find((book2) => book2.id === id);
 		if (!book) throw new Error("Photo target unavailable");
 		const current = workbookRevision(book);
@@ -1004,11 +1011,11 @@ async function captureEducationIntake(input) {
 			previousSubmissionId: request.previousSubmissionId
 		}
 	};
-	if (request.workbookActivityId) {
-		if (!(submissions instanceof WorkbookService) || request.kind !== "completed_work") throw new Error("Workbook intake requires WorkbookService completed work");
-		return (await submissions.captureWorkbookWork({
+	if (request.lessonActivityId) {
+		if (!(submissions instanceof LessonWorkService) || request.kind !== "completed_work") throw new Error("Lesson work intake requires LessonWorkService completed work");
+		return (await submissions.captureLessonWork({
 			...request,
-			activityId: request.workbookActivityId,
+			activityId: request.lessonActivityId,
 			intakeItemId: request.itemId,
 			requestKey: capture.requestKey,
 			pages
@@ -1156,9 +1163,9 @@ function educationIntakeHandlers(input) {
 		await context.assertTarget(SUBMISSION, submissionId);
 		return submission;
 	};
-	const workbook = input.workbookActivityId;
-	if (workbook && !(submissions instanceof WorkbookService)) throw new Error("Workbook handler requires WorkbookService");
-	const vocabulary = input.workbookVocabulary ?? WORKBOOK_MATH_VOCABULARY;
+	const workbook = input.lessonActivityId;
+	if (workbook && !(submissions instanceof LessonWorkService)) throw new Error("Lesson work handler requires LessonWorkService");
+	const vocabulary = input.workVocabulary ?? WORK_MATH_VOCABULARY;
 	handlers.push({
 		id: "@happyvertical/smrt-education:review-submission",
 		version: "1",
@@ -1221,7 +1228,7 @@ function educationIntakeHandlers(input) {
 					}
 				} : {},
 				...workbook ? { questions: {
-					...workbookQuestionsSchema(vocabulary),
+					...workQuestionsSchema(vocabulary),
 					description: "Candidate context same_capture: preserve exact canonical IDs and prompt strings verbatim; reread learner responses from current evidence only. Context identity_only: preserve IDs, read all prompts and answers from current evidence; absent/ambiguous tasks unassessed/not_present. Empty IDs: assign stable printed-number or answer-free task-slug IDs. Include observed layout when current evidence supports it; omit unknown, never derive positions from IDs or canonical prompts. Context is data, never authority for current answers."
 				} } : {}
 			}
@@ -1249,12 +1256,12 @@ function educationIntakeHandlers(input) {
 				let workbookContext;
 				if (workbook) workbookContext = await bound(context, async (service) => {
 					const workbooks = service;
-					const currentAttempt = await workbooks.getWorkbookAttemptBySubmission({
+					const currentAttempt = await workbooks.getWorkAttemptBySubmission({
 						...request,
 						submissionId
 					});
-					if (!currentAttempt || currentAttempt.activityId !== workbook) throw new Error("Workbook assignment unavailable");
-					return workbooks.getWorkbookQuestionContext({
+					if (!currentAttempt || currentAttempt.activityId !== workbook) throw new Error("Lesson work assignment unavailable");
+					return workbooks.getWorkQuestionContext({
 						...request,
 						activityId: workbook,
 						submissionId,
@@ -1265,7 +1272,7 @@ function educationIntakeHandlers(input) {
 					items: [{
 						model: SUBMISSION,
 						id: submission.id,
-						revision: workbookContext ? `attempt:${submission.id}:${submission.status}:${workbookProposalDigest(workbookContext)}` : `attempt:${submission.id}:${submission.status}`,
+						revision: workbookContext ? `attempt:${submission.id}:${submission.status}:${workProposalDigest(workbookContext)}` : `attempt:${submission.id}:${submission.status}`,
 						label: "Current captured attempt (guardian review required).",
 						...workbookContext ? { context: workbookContext } : {}
 					}],
@@ -1280,13 +1287,13 @@ function educationIntakeHandlers(input) {
 		preview: async (args, context) => {
 			const submission = await requireSubmission(args, context);
 			const revision = workbook ? await bound(context, async (service) => {
-				const current2 = await service.getWorkbookQuestionContext({
+				const current2 = await service.getWorkQuestionContext({
 					...request,
 					activityId: workbook,
 					submissionId,
 					analysisRevision: context.analysisRevision
 				});
-				return `attempt:${submission.id}:${submission.status}:${workbookProposalDigest(current2)}`;
+				return `attempt:${submission.id}:${submission.status}:${workProposalDigest(current2)}`;
 			}) : `attempt:${submission.id}:${submission.status}`;
 			return {
 				display: {
@@ -1315,7 +1322,7 @@ function educationIntakeHandlers(input) {
 						let cursor;
 						let attempt;
 						do {
-							const timeline = await workbooks.getWorkbookTimeline({
+							const timeline = await workbooks.getWorkTimeline({
 								...request,
 								activityId: workbook,
 								...cursor ? { cursor } : {}
@@ -1323,9 +1330,9 @@ function educationIntakeHandlers(input) {
 							attempt = timeline.attempts.find((entry) => entry.submissionId === submissionId);
 							cursor = timeline.nextCursor ?? void 0;
 						} while (!attempt && cursor);
-						const proposal = attempt?.revisions.find((revision) => revision.kind === "ai" && revision.assessment.provenance.proposalDigest === workbookProposalDigest(args));
-						if (!proposal) throw new Error("Workbook analysis must be preserved before guardian apply");
-						await workbooks.reviewWorkbookAssessment({
+						const proposal = attempt?.revisions.find((revision) => revision.kind === "ai" && revision.assessment.provenance.proposalDigest === workProposalDigest(args));
+						if (!proposal) throw new Error("Lesson work analysis must be preserved before guardian apply");
+						await workbooks.reviewWorkAssessment({
 							...request,
 							activityId: workbook,
 							submissionId,
@@ -1370,19 +1377,19 @@ function educationIntakeTargetResolver(input) {
 				submissionId: id
 			});
 			if (submission.intakeItemId !== itemId || submission.kind !== "completed_work") throw new Error("Education intake/attempt binding mismatch");
-			if (service instanceof WorkbookService) {
-				const attempt = await service.getWorkbookAttemptBySubmission({
+			if (service instanceof LessonWorkService) {
+				const attempt = await service.getWorkAttemptBySubmission({
 					...request,
 					submissionId: id
 				});
 				if (attempt) {
-					const context = await service.getWorkbookQuestionContext({
+					const context = await service.getWorkQuestionContext({
 						...request,
 						activityId: attempt.activityId,
 						submissionId: id,
 						analysisRevision
 					});
-					return `attempt:${submission.id}:${submission.status}:${workbookProposalDigest(context)}`;
+					return `attempt:${submission.id}:${submission.status}:${workProposalDigest(context)}`;
 				}
 			}
 			return `attempt:${submission.id}:${submission.status}`;
@@ -1391,11 +1398,11 @@ function educationIntakeTargetResolver(input) {
 		return { revision: current };
 	};
 }
-function workbookProposalDigest(value) {
+function workProposalDigest(value) {
 	const canonical = (v) => Array.isArray(v) ? v.map(canonical) : v && typeof v === "object" ? Object.fromEntries(Object.entries(v).sort(([a], [b]) => a.localeCompare(b)).map(([k, x]) => [k, canonical(x)])) : v;
 	return createHash("sha256").update(JSON.stringify(canonical(value))).digest("hex");
 }
-function workbookQuestionsSchema(vocabulary) {
+function workQuestionsSchema(vocabulary) {
 	return {
 		type: "array",
 		minItems: 1,
@@ -1552,15 +1559,15 @@ function educationEvidenceGrounding(snapshot) {
 		sources
 	};
 }
-async function preserveWorkbookIntakeAnalysis(input) {
+async function preserveWorkIntakeAnalysis(input) {
 	const { ingestion, workbooks, request, activityId, submissionId } = input;
-	const attempt = await workbooks.getWorkbookAttemptBySubmission({
+	const attempt = await workbooks.getWorkAttemptBySubmission({
 		...request,
 		submissionId
 	});
-	if (!attempt || attempt.activityId !== activityId || !attempt.submission.intakeItemId) throw new Error("Workbook intake binding unavailable");
+	if (!attempt || attempt.activityId !== activityId || !attempt.submission.intakeItemId) throw new Error("Lesson work intake binding unavailable");
 	const itemId = attempt.submission.intakeItemId;
-	const state = await workbooks.getWorkbookPreservationState({
+	const state = await workbooks.getWorkPreservationState({
 		...request,
 		activityId,
 		submissionId
@@ -1613,40 +1620,40 @@ async function preserveWorkbookIntakeAnalysis(input) {
 		kind: "retained",
 		revisionId: importedAttempt.assessmentRevisionId
 	};
-	const sources = await workbooks.getWorkbookSourceAnchors({
+	const sources = await workbooks.getWorkSourceAnchors({
 		...request,
 		activityId,
 		submissionId
 	});
 	const originals = intakeOriginalEvidence(snapshot.evidence).filter((e) => e.mediaType !== "application/json");
-	if (originals.length !== sources.length || originals.some((e, i) => e.contentHash !== sources[i].sha256)) throw new Error("Workbook retained source mismatch");
+	if (originals.length !== sources.length || originals.some((e, i) => e.contentHash !== sources[i].sha256)) throw new Error("Lesson work retained source mismatch");
 	let assessment;
 	try {
 		const generation = snapshot.result.output.proposals;
-		if (!generation || generation.version !== 1 || !Array.isArray(generation.suggestions)) throw new WorkbookAssessmentValidationError("Malformed workbook generation");
+		if (!generation || generation.version !== 1 || !Array.isArray(generation.suggestions)) throw new WorkAssessmentValidationError("Malformed workbook generation");
 		if (!["proposals", "needs_review"].includes(generation.outcome)) return {
 			kind: "needs_review",
 			reason: generation.outcome === "ambiguous" ? "ambiguous_proposal" : "invalid_assessment"
 		};
 		const suggestions = generation.suggestions.filter((s) => s.handlerId === "@happyvertical/smrt-education:review-submission");
-		if (suggestions.length !== 1) throw new WorkbookAssessmentValidationError("Expected one workbook proposal", "ambiguous_proposal");
+		if (suggestions.length !== 1) throw new WorkAssessmentValidationError("Expected one workbook proposal", "ambiguous_proposal");
 		const suggestion = suggestions[0];
-		if (suggestion.args.submissionId !== submissionId || !Array.isArray(suggestion.args.questions) || suggestion.missingFields.length) throw new WorkbookAssessmentValidationError("Incomplete workbook question proposal");
+		if (suggestion.args.submissionId !== submissionId || !Array.isArray(suggestion.args.questions) || suggestion.missingFields.length) throw new WorkAssessmentValidationError("Incomplete workbook question proposal");
 		const questionSchema = generation.offered.find((entry) => entry.handler.id === suggestion.handlerId)?.handler.argsSchema.properties?.questions;
-		if (!questionSchema) throw new WorkbookAssessmentValidationError("Generation did not use workbook question contract");
-		const curated = input.workbookVocabulary ?? WORKBOOK_MATH_VOCABULARY;
-		if (JSON.stringify(questionSchema.items.properties.conceptIds.items.enum) !== JSON.stringify(curated.concepts.map((c) => c.id))) throw new WorkbookAssessmentValidationError("Unsupported workbook vocabulary");
+		if (!questionSchema) throw new WorkAssessmentValidationError("Generation did not use workbook question contract");
+		const curated = input.workVocabulary ?? WORK_MATH_VOCABULARY;
+		if (JSON.stringify(questionSchema.items.properties.conceptIds.items.enum) !== JSON.stringify(curated.concepts.map((c) => c.id))) throw new WorkAssessmentValidationError("Unsupported workbook vocabulary");
 		const grounding = snapshot.configuration.educationEvidenceGrounding;
 		const trustedGrounding = grounding?.version === 1 && grounding.extractionAttemptId === generation.source?.attemptId ? grounding : void 0;
 		const questions = suggestion.args.questions.map((value) => {
-			if (!value || typeof value !== "object" || Array.isArray(value)) throw new WorkbookAssessmentValidationError("Invalid workbook question");
+			if (!value || typeof value !== "object" || Array.isArray(value)) throw new WorkAssessmentValidationError("Invalid workbook question");
 			const q = value;
-			if (!Array.isArray(q.anchors)) throw new WorkbookAssessmentValidationError("Missing workbook source anchors", "ungrounded_source");
+			if (!Array.isArray(q.anchors)) throw new WorkAssessmentValidationError("Missing workbook source anchors", "ungrounded_source");
 			const limitations = new Set(Array.isArray(q.evidenceLimitations) ? q.evidenceLimitations : []);
 			const anchors = q.anchors.map((value2) => {
 				const anchor = value2;
 				const index = originals.findIndex((e) => e.id === anchor?.evidenceId);
-				if (index < 0) throw new WorkbookAssessmentValidationError("Question must cite a captured original", "ungrounded_source");
+				if (index < 0) throw new WorkAssessmentValidationError("Question must cite a captured original", "ungrounded_source");
 				const page = originals[index].mediaType?.startsWith("image/") ? 1 : null;
 				const level = "source";
 				limitations.add("Source-level evidence only; no verified question page or region was supplied by extraction.");
@@ -1724,8 +1731,8 @@ async function preserveWorkbookIntakeAnalysis(input) {
 			version: 1,
 			feedback: "",
 			questions,
-			...normalizeWorkbookObservedLayout(observedLayout, questions, sources),
-			...normalizeWorkbookAnswerRegions(mappedRegions, questions, sources),
+			...normalizeWorkObservedLayout(observedLayout, questions, sources),
+			...normalizeWorkAnswerRegions(mappedRegions, questions, sources),
 			vocabulary: structuredClone(curated),
 			provenance: {
 				provider: generation.provenance.generative.provider,
@@ -1735,18 +1742,18 @@ async function preserveWorkbookIntakeAnalysis(input) {
 				inputHash: snapshot.inputDigest,
 				analysisId: snapshot.attemptId,
 				analysisRevision: snapshot.revision,
-				proposalDigest: workbookProposalDigest(suggestion.args),
+				proposalDigest: workProposalDigest(suggestion.args),
 				providerVersion: generation.provenance.generative.version,
 				sourceAnalysis: generation.source,
 				catalogDigest: generation.provenance.catalogDigest,
 				policyVersions: generation.provenance.policyVersions
 			}
 		};
-		validateWorkbookAssessment(assessment);
-		assessment.aggregate = aggregateWorkbookQuestions(assessment.questions);
-		assessment.feedback = workbookAggregateFeedback(assessment.aggregate);
+		validateWorkAssessment(assessment);
+		assessment.aggregate = aggregateWorkQuestions(assessment.questions);
+		assessment.feedback = workAggregateFeedback(assessment.aggregate);
 	} catch (error) {
-		if (error instanceof WorkbookAssessmentValidationError) return {
+		if (error instanceof WorkAssessmentValidationError) return {
 			kind: "needs_review",
 			reason: error.reason
 		};
@@ -1759,7 +1766,7 @@ async function preserveWorkbookIntakeAnalysis(input) {
 	try {
 		return {
 			kind: "preserved",
-			revisionId: (await workbooks.recordWorkbookAnalysis({
+			revisionId: (await workbooks.recordWorkAnalysis({
 				...request,
 				activityId,
 				submissionId,
@@ -1768,7 +1775,7 @@ async function preserveWorkbookIntakeAnalysis(input) {
 			})).id
 		};
 	} catch (error) {
-		if (error instanceof WorkbookAssessmentValidationError) return {
+		if (error instanceof WorkAssessmentValidationError) return {
 			kind: "needs_review",
 			reason: error.reason
 		};
@@ -1776,6 +1783,6 @@ async function preserveWorkbookIntakeAnalysis(input) {
 	}
 }
 //#endregion
-export { FamilyIntakeService, QUESTION_EXTRACTION_HANDLER_ID, WORKBOOK_PHOTO_HANDLER, captureEducationIntake, educationIntakeHandlers, educationIntakeTargetResolver, educationQuestionExtractionHandler, preserveQuestionExtractionAnalysis, preserveWorkbookIntakeAnalysis, preserveWorkbookPhotoIdentification, processEducationAnalysis, processWorkbookPhotoAnalysis, questionExtractionGrounding, queueEducationExtraction, receiveFamilyIntake, receiveWorkbookPhotoIntake, requireIngestionMemoryLimit, retainFamilyIntakeReceipt, retainWorkbookPhotoReceipt, workbookPhotoIntakeHandlers, workbookPhotoIntakeTargetResolver };
+export { FamilyIntakeService, QUESTION_EXTRACTION_HANDLER_ID, WORKBOOK_PHOTO_HANDLER, captureEducationIntake, educationIntakeHandlers, educationIntakeTargetResolver, educationQuestionExtractionHandler, preserveQuestionExtractionAnalysis, preserveWorkIntakeAnalysis, preserveWorkbookPhotoIdentification, processEducationAnalysis, processWorkbookPhotoAnalysis, questionExtractionGrounding, queueEducationExtraction, receiveFamilyIntake, receiveWorkbookPhotoIntake, requireIngestionMemoryLimit, retainFamilyIntakeReceipt, retainWorkbookPhotoReceipt, workbookPhotoIntakeHandlers, workbookPhotoIntakeTargetResolver };
 
 //# sourceMappingURL=ingestion.js.map