fix: update imports (type prefixes, paths) (#298)

apps/nextjs/.storybook/preview.tsx

@@ -8,7 +8,6 @@ import "@fontsource/lexend/800.css";
 import "@fontsource/lexend/900.css";
 import { OakThemeProvider, oakDefaultTheme } from "@oaknational/oak-components";
 import type { Preview, Decorator } from "@storybook/react";
-import { GeistMono } from "geist/font/mono";
 
 // ModerationProvider is coming in the main Chat.tsx refactor
 //import { ModerationProvider } from "../src/components/AppComponents/Chat/Chat/ModerationProvider";

apps/nextjs/scripts/aila-cli.ts

@@ -1,4 +1,4 @@
-import { Aila } from "@oakai/aila";
+import { Aila } from "@oakai/aila/src/core/Aila";
 import { AilaPlugin } from "@oakai/aila/src/core/plugins";
 
 const cliPlugin: AilaPlugin = {

apps/nextjs/src/ai-apps/common/getSessionOutput.ts

@@ -1,4 +1,4 @@
-import { Apps } from "@oakai/core";
+import { Apps } from "@oakai/core/src/models/apps";
 import { prisma } from "@oakai/db";
 import { outputSchema } from "ai-apps/generations/types";
 

apps/nextjs/src/app/admin/aila/[chatId]/view.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
 
-import { type AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
+import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
 import { getSafetyResult } from "@oakai/core/src/utils/ailaModeration/helpers";
-import { type Moderation } from "@oakai/db";
+import type { Moderation } from "@oakai/db";
 import { OakAccordion, OakPrimaryButton } from "@oaknational/oak-components";
 
 import { trpc } from "@/utils/trpc";

apps/nextjs/src/app/aila/[id]/download/page.tsx

@@ -1,5 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import { type Metadata } from "next";
+import type { Metadata } from "next";
 import { notFound, redirect } from "next/navigation";
 
 import { getChatById } from "@/app/actions";

apps/nextjs/src/app/aila/[id]/share/page.tsx

@@ -1,10 +1,10 @@
 import type { User } from "@clerk/nextjs/server";
 import { clerkClient } from "@clerk/nextjs/server";
 import { getSessionModerations } from "@oakai/aila/src/features/moderation/getSessionModerations";
-import { demoUsers } from "@oakai/core";
+import { demoUsers } from "@oakai/core/src/models/demoUsers";
 import { isToxic } from "@oakai/core/src/utils/ailaModeration/helpers";
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { type Metadata } from "next";
+import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 
 import { getSharedChatById } from "@/app/actions";

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

@@ -1,11 +1,11 @@
-import type { Aila } from "@oakai/aila";
+import type { Aila } from "@oakai/aila/src/core/Aila";
+import type { AilaServices } from "@oakai/aila/src/core/AilaServices";
+import type { Message } from "@oakai/aila/src/core/chat";
+import type { AilaInitializationOptions } from "@oakai/aila/src/core/types";
 import type {
-  AilaInitializationOptions,
   AilaOptions,
   AilaPublicChatOptions,
-  AilaServices,
-  Message,
-} from "@oakai/aila";
+} from "@oakai/aila/src/core/types";
 import { AilaAmericanisms } from "@oakai/aila/src/features/americanisms/AilaAmericanisms";
 import {
   DatadogAnalyticsAdapter,
@@ -16,7 +16,7 @@ import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
 import { withTelemetry } from "@oakai/core/src/tracing/serverTracing";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
-import { prisma as globalPrisma } from "@oakai/db";
+import { prisma as globalPrisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 // #TODO StreamingTextResponse is deprecated. If we choose to adopt the "ai" package
 // more fully, we should refactor to support its approach to streaming

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

@@ -1,5 +1,5 @@
-import type { AilaInitializationOptions } from "@oakai/aila";
-import { Aila } from "@oakai/aila";
+import { Aila } from "@oakai/aila/src/core/Aila";
+import type { AilaInitializationOptions } from "@oakai/aila/src/core/types";
 import {
   prisma as globalPrisma,
   type PrismaClientWithAccelerate,

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

@@ -1,4 +1,5 @@
-import { AilaAuthenticationError, AilaThreatDetectionError } from "@oakai/aila";
+import { AilaAuthenticationError } from "@oakai/aila/src/core/AilaError";
+import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection";
 import type {
   ActionDocument,
   ErrorDocument,

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

@@ -1,6 +1,6 @@
-import type { AilaInitializationOptions } from "@oakai/aila";
-import { Aila } from "@oakai/aila";
+import { Aila } from "@oakai/aila/src/core/Aila";
 import { MockLLMService } from "@oakai/aila/src/core/llm/MockLLMService";
+import type { AilaInitializationOptions } from "@oakai/aila/src/core/types";
 import { MockCategoriser } from "@oakai/aila/src/features/categorisation/categorisers/MockCategoriser";
 import { mockTracer } from "@oakai/core/src/tracing/mockTracer";
 import { NextRequest } from "next/server";

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

@@ -1,7 +1,8 @@
 import { auth, clerkClient } from "@clerk/nextjs/server";
 import { AilaAuthenticationError } from "@oakai/aila/src/core/AilaError";
-import { demoUsers, inngest } from "@oakai/core";
+import { demoUsers } from "@oakai/core";
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
+import { inngest } from "@oakai/core/src/inngest";
 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";

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

@@ -1,5 +1,6 @@
 import type { AilaPluginContext } from "@oakai/aila/src/core/plugins";
 import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection/types";
+import { inngest } from "@oakai/core/src/inngest";
 import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import type { Moderation } from "@prisma/client";
@@ -68,8 +69,6 @@ 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/lesson-planner/preview/[slug]/page.tsx

@@ -1,5 +1,5 @@
-import { Apps } from "@oakai/core";
-import { prisma } from "@oakai/db";
+import { Apps } from "@oakai/core/src/models/apps";
+import { prisma } from "@oakai/db/client";
 import { aiLogger } from "@oakai/logger";
 
 import { LessonPlanPreview } from "./preview";

apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts

@@ -7,7 +7,7 @@ import {
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { useThrottle } from "@uidotdev/usehooks";
-import { type Message } from "ai/react";
+import type { Message } from "ai/react";
 import { deepClone } from "fast-json-patch";
 import hash from "object-hash";
 import { equals } from "remeda";

apps/nextjs/src/utils/checkFeatureFlag.ts

@@ -1,4 +1,4 @@
-import { type PostHog } from "posthog-js";
+import type { PostHog } from "posthog-js";
 
 export function checkFeatureFlag(
   posthogClient: PostHog,

apps/nextjs/src/utils/trpc.tsx

@@ -2,8 +2,8 @@
 
 import { useState } from "react";
 
-import { type AppRouter } from "@oakai/api/src/router";
-import { type ChatAppRouter } from "@oakai/api/src/router/chat";
+import type { AppRouter } from "@oakai/api/src/router";
+import type { ChatAppRouter } from "@oakai/api/src/router/chat";
 import { transformer } from "@oakai/api/transformer";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import type { TRPCLink } from "@trpc/client";

apps/nextjs/tests-e2e/config/common-persona.setup.ts

@@ -1,4 +1,5 @@
-import { Page, test as setup } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test as setup } from "@playwright/test";
 import path from "path";
 
 import { prepareUser } from "../helpers/auth";

apps/nextjs/tests-e2e/helpers/auth/clerkHelpers.ts

@@ -1,4 +1,5 @@
-import { Page, expect } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
 
 /**
  * This file replicates helpers provided by @clerk/testing

apps/nextjs/tests-e2e/helpers/auth/index.ts

@@ -1,7 +1,8 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { TestSupportRouter } from "@oakai/api/src/router/testSupport";
+import type { TestSupportRouter } from "@oakai/api/src/router/testSupport";
 import { transformer } from "@oakai/api/transformer";
-import { test, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test } from "@playwright/test";
 import { createTRPCProxyClient, httpBatchLink, loggerLink } from "@trpc/client";
 
 import {

apps/nextjs/tests-e2e/helpers/vercel.ts

@@ -1,4 +1,4 @@
-import { BrowserContext, Page } from "@playwright/test";
+import type { BrowserContext, Page } from "@playwright/test";
 
 import {
   TEST_BASE_URL,

apps/nextjs/tests-e2e/tests/aila-chat/downloads.test.ts

@@ -1,5 +1,6 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { test, expect, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../../config/config";
 import { bypassVercelProtection } from "../../helpers/vercel";

apps/nextjs/tests-e2e/tests/aila-chat/full-romans.mobile.test.ts

@@ -1,10 +1,11 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { test, expect, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../../config/config";
 import { bypassVercelProtection } from "../../helpers/vercel";
+import type { FixtureMode } from "./helpers";
 import {
-  FixtureMode,
   applyLlmFixtures,
   continueChat,
   expectFinished,

apps/nextjs/tests-e2e/tests/aila-chat/full-romans.test.ts

@@ -3,8 +3,8 @@ import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../../config/config";
 import { bypassVercelProtection } from "../../helpers/vercel";
+import type { FixtureMode } from "./helpers";
 import {
-  FixtureMode,
   applyLlmFixtures,
   continueChat,
   expectFinished,

apps/nextjs/tests-e2e/tests/auth.test.ts

@@ -1,5 +1,6 @@
 import { setupClerkTestingToken } from "@clerk/testing/playwright";
-import { Page, expect, test } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 
 import {
   TEST_USER_EMAIL,

apps/nextjs/tests-e2e/tests/sharing.test.ts

@@ -1,4 +1,5 @@
-import { test, expect, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 import { TEST_BASE_URL } from "../config/config";
 import { prepareUser } from "../helpers/auth";

packages/ingest/src/import-lessons/importLessons.ts

@@ -3,7 +3,7 @@ import { aiLogger } from "@oakai/logger";
 
 import { IngestError } from "../IngestError";
 import { getDataHash } from "../utils/getDataHash";
-import type { RawLesson} from "../zod-schema/zodSchema";
+import type { RawLesson } from "../zod-schema/zodSchema";
 import { RawLessonSchema } from "../zod-schema/zodSchema";
 import { graphqlClient } from "./graphql/client";
 import { query } from "./graphql/query";

packages/ingest/src/import-lessons/importLessonsFromOakDB.ts

@@ -3,7 +3,7 @@ import { prisma } from "@oakai/db";
 import { IngestError } from "../IngestError";
 import type { IngestLogger } from "../types";
 import { getDataHash } from "../utils/getDataHash";
-import type { RawLesson} from "../zod-schema/zodSchema";
+import type { RawLesson } from "../zod-schema/zodSchema";
 import { RawLessonSchema } from "../zod-schema/zodSchema";
 import { graphqlClient } from "./graphql/client";
 import { query } from "./graphql/query";

packages/ingest/src/openai-batches/handleOpenAiBatchErrorFile.ts

@@ -3,7 +3,7 @@ import type { PrismaClientWithAccelerate } from "@oakai/db";
 import type { Step } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
 import { jsonlToArray } from "../utils/jsonlToArray";
-import type { BatchTask} from "./customId";
+import type { BatchTask } from "./customId";
 import { getLessonIdFromCustomId } from "./customId";
 import { downloadOpenAiFile } from "./downloadOpenAiFile";
 
@@ -34,9 +34,16 @@ export async function handleOpenAiBatchErrorFile({
   });
   const text = await file.text();
   const jsonArray = jsonlToArray(text);
-  const lessonIds = jsonArray.map((json) =>
-    getLessonIdFromCustomId(json.custom_id),
-  );
+  const lessonIds = jsonArray
+    .map((json) =>
+      typeof json === "object" &&
+      json !== null &&
+      "custom_id" in json &&
+      typeof json.custom_id === "string"
+        ? getLessonIdFromCustomId(json.custom_id)
+        : undefined,
+    )
+    .filter((lessonId): lessonId is string => lessonId !== undefined);
 
   await updateLessonsState({
     ingestId,

packages/ingest/src/openai-batches/startBatch.ts

@@ -3,13 +3,10 @@ import { aiLogger } from "@oakai/logger";
 import { splitJsonlByRowsOrSize } from "../utils/splitJsonlByRowsOrSize";
 import { OPEN_AI_BATCH_MAX_ROWS, OPEN_AI_BATCH_MAX_SIZE_MB } from "./constants";
 import { getCustomIdsFromJsonlFile } from "./getCustomIdsFromJsonlFile";
-import type {
-  OpenAiBatchSubmitCallback} from "./submitOpenAiBatch";
-import {
-  submitOpenAiBatch,
-} from "./submitOpenAiBatch";
+import type { OpenAiBatchSubmitCallback } from "./submitOpenAiBatch";
+import { submitOpenAiBatch } from "./submitOpenAiBatch";
 import { uploadOpenAiBatchFile } from "./uploadOpenAiBatchFile";
-import type { GetBatchFileLine} from "./writeBatchFile";
+import type { GetBatchFileLine } from "./writeBatchFile";
 import { writeBatchFile } from "./writeBatchFile";
 
 const log = aiLogger("ingest");

packages/ingest/src/steps/1-captions.ts

@@ -7,7 +7,7 @@ import { createCaptionsRecord } from "../db-helpers/createCaptionsRecord";
 import { createErrorRecord } from "../db-helpers/createErrorRecord";
 import { getIngestById } from "../db-helpers/getIngestById";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import type { Step} from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
 import { getPrevStep } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
 import type { IngestLogger } from "../types";

packages/ingest/src/steps/4-lp-chunking.ts

@@ -1,13 +1,10 @@
-import type {
-  CompletedLessonPlan} from "@oakai/aila/src/protocol/schema";
-import {
-  CompletedLessonPlanSchema,
-} from "@oakai/aila/src/protocol/schema";
+import type { CompletedLessonPlan } from "@oakai/aila/src/protocol/schema";
+import { CompletedLessonPlanSchema } from "@oakai/aila/src/protocol/schema";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getLessonPlanParts } from "../chunking/getLessonPlanParts";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import type { Step} from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
 import { getPrevStep } from "../db-helpers/step";
 import { updateLessonsState } from "../db-helpers/updateLessonsState";
 import type { IngestLogger } from "../types";

packages/ingest/src/steps/5-lp-parts-embed-start.ts

@@ -2,7 +2,7 @@ import type { PrismaClientWithAccelerate } from "@oakai/db";
 
 import { getIngestById } from "../db-helpers/getIngestById";
 import { loadLessonsAndUpdateState } from "../db-helpers/loadLessonsAndUpdateState";
-import type { Step} from "../db-helpers/step";
+import type { Step } from "../db-helpers/step";
 import { getPrevStep } from "../db-helpers/step";
 import { startEmbedding } from "../embedding/startEmbedding";
 import { parseCustomId } from "../openai-batches/customId";