chore: incrementally move Core not to use barrel files

apps/nextjs/src/app/api/chat/config.ts

@@ -4,7 +4,7 @@ import {
   prisma as globalPrisma,
   type PrismaClientWithAccelerate,
 } from "@oakai/db";
-import { nanoid } from "ai";
+import { nanoid } from "nanoid";
 
 import { createWebActionsPlugin } from "./webActionsPlugin";
 

apps/nextjs/src/app/api/chat/errorHandling.test.ts

@@ -1,6 +1,7 @@
-import { AilaAuthenticationError, AilaThreatDetectionError } from "@oakai/aila";
+import { AilaAuthenticationError } from "@oakai/aila/src/core/AilaError";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection/types";
 import * as moderationErrorHandling from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
@@ -37,7 +38,7 @@ describe("handleChatException", () => {
 
       expect(response.status).toBe(200);
 
-      invariant(response.body instanceof ReadableStream);
+      invariant(response.body);
       const message = extractStreamMessage(await consumeStream(response.body));
 
       expect(message).toEqual({
@@ -123,4 +124,4 @@ describe("handleChatException", () => {
       });
     });
   });
-});
+});

apps/nextjs/src/app/api/chat/errorHandling.ts

@@ -4,7 +4,7 @@ import type {
   ErrorDocument,
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { handleHeliconeError } from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 import type { PrismaClientWithAccelerate } from "@oakai/db";

apps/nextjs/src/app/api/chat/user.test.ts

@@ -1,10 +1,9 @@
-import { inngest } from "@oakai/core";
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 
 import { reportRateLimitError } from "./user";
 
-jest.mock("@oakai/core/src/client", () => ({
+jest.mock("@oakai/core/src/inngest", () => ({
   inngest: {
     createFunction: jest.fn(),
     send: jest.fn(),
@@ -63,6 +62,8 @@ describe("chat route user functions", () => {
 
       await reportRateLimitError(error, userId, chatId);
 
+      const { inngest } = await import("@oakai/core/src/inngest");
+
       expect(inngest.send).toHaveBeenCalledTimes(1);
       expect(inngest.send).toHaveBeenCalledWith({
         name: "app/slack.notifyRateLimit",

apps/nextjs/src/app/api/chat/user.ts

@@ -2,7 +2,7 @@ import { auth, clerkClient } from "@clerk/nextjs/server";
 import { AilaAuthenticationError } from "@oakai/aila";
 import { demoUsers, inngest } from "@oakai/core";
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import { withTelemetry } from "@oakai/core/src/tracing/serverTracing";
 import { rateLimits } from "@oakai/core/src/utils/rateLimiting/rateLimit";
 import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";

apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts

@@ -1,13 +1,14 @@
-import { AilaThreatDetectionError } from "@oakai/aila";
 import type { AilaPluginContext } from "@oakai/aila/src/core/plugins";
-import { inngest } from "@oakai/core";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection/types";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import type { Moderation } from "@prisma/client";
 
 import { createWebActionsPlugin } from "./webActionsPlugin";
 
-jest.mock("@oakai/core", () => ({
+jest.mock("@oakai/core/src/inngest", () => ({
+  __esModule: true,
+
   inngest: {
     send: jest.fn(),
   },
@@ -66,6 +67,8 @@ describe("webActionsPlugin", () => {
         enqueue: mockEnqueue,
       };
 
+      const { inngest } = await import("@oakai/core/src/inngest");
+
       const plugin = createWebActionsPlugin(prisma, safetyViolations);
       await plugin.onToxicModeration(moderation, pluginContext);
 

apps/nextjs/src/app/api/chat/webActionsPlugin.ts

@@ -1,11 +1,9 @@
-import { AilaThreatDetectionError } from "@oakai/aila";
 import type { AilaPlugin } from "@oakai/aila/src/core/plugins";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection/types";
 import { handleHeliconeError } from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import {
-  SafetyViolations as defaultSafetyViolations,
-  inngest,
-} from "@oakai/core";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { inngest } from "@oakai/core/src/inngest";
+import { SafetyViolations as defaultSafetyViolations } from "@oakai/core/src/models/safetyViolations";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import { waitUntil } from "@vercel/functions";

apps/nextjs/src/app/api/sanitizeFilename.test.ts

@@ -3,9 +3,9 @@ import { sanitizeFilename } from "./sanitizeFilename";
 describe("sanitizeFilename", () => {
   test("should remove special characters", () => {
     const lessonTitle =
-      "The econonomy: Boom or Bust? You decide! Let's start, shall we?";
+      "The economy: Boom or Bust? You decide! Let's start, shall we?";
     expect(sanitizeFilename(lessonTitle)).toBe(
-      "The econonomy Boom or Bust You decide Lets start shall we",
+      "The economy Boom or Bust You decide Lets start shall we",
     );
   });
 });

packages/aila/src/utils/moderation/moderationErrorHandling.ts

@@ -1,5 +1,5 @@
 import { SafetyViolations as defaultSafetyViolations } from "@oakai/core/src/models/safetyViolations";
-import { UserBannedError } from "@oakai/core/src/models/safetyViolations";
+import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import type { AilaThreatDetectionError } from "../../features/threatDetection/types";

packages/api/src/context.ts

@@ -4,7 +4,7 @@ import type {
 } from "@clerk/backend/internal";
 import { getAuth } from "@clerk/nextjs/server";
 import { prisma } from "@oakai/db";
-import { type inferAsyncReturnType } from "@trpc/server";
+import type { inferAsyncReturnType } from "@trpc/server";
 import type { NodeHTTPCreateContextFnOptions } from "@trpc/server/adapters/node-http";
 import type { NextRequest, NextResponse } from "next/server";
 

packages/api/src/trpc.ts

@@ -3,7 +3,7 @@ import { initTRPC } from "@trpc/server";
 import { ZodError } from "zod";
 
 import { transformer } from "../transformer";
-import { type Context } from "./context";
+import type { Context } from "./context";
 
 const log = aiLogger("trpc");
 

packages/core/index.ts

@@ -31,7 +31,7 @@ import { generatePlansForSubjectLessons } from "./src/functions/subject/generate
 import { summariseSubjectLessons } from "./src/functions/subject/summariseSubjectLessons";
 import { generateTranscriptEmbeddings } from "./src/functions/transcript/generateTranscriptEmbeddings";
 
-export { inngest } from "./src/client";
+export { inngest } from "./src/inngest";
 export * from "./src/data/subjectsAndKeyStages";
 export * from "./src/models";
 //export * from "./src/models/promptVariants";

packages/core/src/functions/demo/populateDemoStatuses.ts

@@ -1,7 +1,7 @@
 import { clerkClient } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { populateDemoStatusesSchema } from "./populateDemoStatuses.schema";
 
 const log = aiLogger("demo");

packages/core/src/functions/lesson/generateLessonQuizEmbeddings.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Lessons } from "../../models";
 
 export const generateLessonQuizEmbeddings = inngest.createFunction(

packages/core/src/functions/lesson/generatePlan.ts

@@ -1,7 +1,7 @@
 import { prisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 const log = aiLogger("lessons");

packages/core/src/functions/lesson/summarise.ts

@@ -1,7 +1,7 @@
 import { LessonSummaryStatus, prisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Lessons } from "../../models";
 
 const log = aiLogger("lessons");

packages/core/src/functions/lesson/summariseAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Lessons } from "../../models";
 
 export const summariseAllLessons = inngest.createFunction(

packages/core/src/functions/lessonPlan/embed.ts

@@ -1,6 +1,6 @@
 import { LessonPlanStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const embedLessonPlan = inngest.createFunction(

packages/core/src/functions/lessonPlan/embedAll.ts

@@ -1,7 +1,7 @@
 import { LessonPlanStatus, prisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 const log = aiLogger("lessons");

packages/core/src/functions/lessonPlan/embedAllParts.ts

@@ -1,6 +1,6 @@
 import { LessonPlanPartStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const embedAllLessonPlanParts = inngest.createFunction(

packages/core/src/functions/lessonPlan/embedPart.ts

@@ -1,6 +1,6 @@
 import { LessonPlanPartStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const embedLessonPlanPart = inngest.createFunction(

packages/core/src/functions/lessonPlan/generateAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 export const generateAllLessonPlans = inngest.createFunction(
   {

packages/core/src/functions/lessonPlan/process.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonPlans } from "../../models";
 
 export const processLessonPlan = inngest.createFunction(

packages/core/src/functions/lessonSummary/embed.ts

@@ -1,6 +1,6 @@
 import { LessonSummaryStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonSummaries } from "../../models";
 
 export const embedLessonSummary = inngest.createFunction(

packages/core/src/functions/lessonSummary/embedAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { LessonSummaries } from "../../models";
 
 export const embedAllLessonSummaries = inngest.createFunction(

packages/core/src/functions/migrations/addIdsToMessages.ts

@@ -2,7 +2,7 @@ import { Prisma, prisma } from "@oakai/db";
 import crypto from "crypto";
 import { z } from "zod";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { addIdsToMessagesSchema } from "./addIdsToMessages.schema";
 
 const chatSchema = z

packages/core/src/functions/migrations/kvChatsToPrisma.ts

@@ -4,7 +4,7 @@ import { kv } from "@vercel/kv";
 import { z } from "zod";
 
 import { LessonPlanSchemaWhilstStreaming } from "../../../../aila/src/protocol/schema";
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { kvChatsToPrismaSchema } from "./kvChatsToPrisma.schema";
 
 const chatSchema = z

packages/core/src/functions/quizAnswer/embedAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizAnswers } from "../../models";
 
 export const embedAllQuizAnswers = inngest.createFunction(

packages/core/src/functions/quizAnswer/generateQuizAnswerEmbeddings.ts

@@ -1,6 +1,6 @@
 import { prisma, QuizAnswerStatus } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizAnswers } from "../../models";
 
 export const generateQuizAnswerEmbeddings = inngest.createFunction(

packages/core/src/functions/quizQuestion/embedAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizQuestions } from "../../models";
 
 export const embedAllQuizQuestions = inngest.createFunction(

packages/core/src/functions/quizQuestion/generateAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizQuestions } from "../../models";
 
 export const generateAllQuizQuestions = inngest.createFunction(

packages/core/src/functions/quizQuestion/generateQuizQuestionEmbeddings.ts

@@ -1,6 +1,6 @@
 import { QuizQuestionStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { QuizQuestions } from "../../models";
 
 export const generateQuizQuestionEmbeddings = inngest.createFunction(

packages/core/src/functions/slack/notifyModeration.ts

@@ -1,4 +1,4 @@
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import {
   slackNotificationChannelId,
   slackWebClient,

packages/core/src/functions/slack/notifyRateLimit.ts

@@ -1,4 +1,4 @@
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import {
   slackNotificationChannelId,
   slackWebClient,

packages/core/src/functions/slack/notifyUserBan.ts

@@ -1,4 +1,4 @@
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import {
   slackNotificationChannelId,
   slackWebClient,

packages/core/src/functions/snippet/embedAll.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Snippets } from "../../models";
 
 export const embedAllSnippets = inngest.createFunction(

packages/core/src/functions/snippet/generateForAllQuestions.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Snippets } from "../../models";
 
 export const generateSnippetsForAllQuestions = inngest.createFunction(

packages/core/src/functions/snippet/generateSnippetEmbeddings.ts

@@ -1,6 +1,6 @@
 import { SnippetStatus, prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Snippets } from "../../models";
 
 export const generateSnippetEmbeddings = inngest.createFunction(

packages/core/src/functions/statistics/recalculateStatistics.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 import { Statistics } from "../../models/statistics";
 
 export const recalculateStatistics = inngest.createFunction(

packages/core/src/functions/subject/embedSubjectLessonQuizzes.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 interface SimplifiedLesson {
   id: string;

packages/core/src/functions/subject/embedSubjectLessonTranscripts.ts

@@ -1,6 +1,6 @@
 import { prisma } from "@oakai/db";
 
-import { inngest } from "../../client";
+import { inngest } from "../../inngest";
 
 interface SimplifiedLesson {
   id: string;