Merge branch 'main' into fix/dropdown_sections

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

@@ -1,6 +1,14 @@
+import { aiLogger } from "@oakai/logger";
+
+const log = aiLogger("chat");
 export const copyLinkToClipboard = () => {
   const currentURL = window.location.href;
-  navigator.clipboard.writeText(currentURL).then(() => {
-    alert("Link copied to clipboard!");
-  });
+  navigator.clipboard
+    .writeText(currentURL)
+    .then(() => {
+      alert("Link copied to clipboard!");
+    })
+    .catch((error) => {
+      log.error(error);
+    });
 };

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

@@ -1,11 +1,19 @@
+import { aiLogger } from "@oakai/logger";
+
+const log = aiLogger("chat");
 export const copyTextToClipboard = () => {
   const elementsToCopy =
     document.querySelectorAll<HTMLElement>(".copy-to-clipboard");
   const textToCopy = Array.from(elementsToCopy)
     .map((element) => element.innerText)
     .join("\n");
 
-  navigator.clipboard.writeText(textToCopy).then(() => {
-    alert("Text copied to clipboard!");
-  });
+  navigator.clipboard
+    .writeText(textToCopy)
+    .then(() => {
+      alert("Text copied to clipboard!");
+    })
+    .catch((error) => {
+      log.error(error);
+    });
 };

apps/nextjs/src/app/api/chat/fixtures/FixtureRecordLLMService.ts

@@ -1,4 +1,4 @@
-import type { Message } from "@oakai/aila";
+import type { Message } from "@oakai/aila/src/core/chat";
 import type { LLMService } from "@oakai/aila/src/core/llm/LLMService";
 import { OpenAIService } from "@oakai/aila/src/core/llm/OpenAIService";
 import { aiLogger } from "@oakai/logger";
@@ -8,7 +8,7 @@ import type { ZodSchema } from "zod";
 const log = aiLogger("fixtures");
 
 export class FixtureRecordLLMService implements LLMService {
-  name = "FixureRecordLLM";
+  name = "FixtureRecordLLM";
   private _openAIService: OpenAIService;
 
   constructor(

apps/nextjs/src/app/api/chat/fixtures/FixtureReplayLLMService.ts

@@ -5,7 +5,7 @@ import fs from "fs";
 const log = aiLogger("fixtures");
 
 export class FixtureReplayLLMService extends MockLLMService {
-  name = "FixureReplayLLM";
+  name = "FixtureReplayLLM";
 
   constructor(fixtureName: string) {
     const fileUrl = `${process.cwd()}/tests-e2e/recordings/${fixtureName}.chunks.txt`;

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

@@ -1,8 +1,8 @@
 import type { AilaPlugin } from "@oakai/aila/src/core/plugins";
 import { AilaThreatDetectionError } from "@oakai/aila/src/features/threatDetection";
 import { handleHeliconeError } from "@oakai/aila/src/utils/moderation/moderationErrorHandling";
-import { SafetyViolations as defaultSafetyViolations } from "@oakai/core";
 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";

apps/nextjs/src/app/lesson-planner/preview/[slug]/preview.tsx

@@ -42,7 +42,7 @@ export const LessonPlanPreview = ({ planSections }) => {
             <ol className="list-decimal pl-10">
               {planSections?.planSections.keyLearningPoints.map(
                 (learningPoint) => (
-                  <li key={learningPoint.value} className={`mb-6 list-decimal`}>
+                  <li key={learningPoint.value} className={"mb-6 list-decimal"}>
                     <p>{learningPoint.value}</p>
                   </li>
                 ),
@@ -58,7 +58,7 @@ export const LessonPlanPreview = ({ planSections }) => {
                 return (
                   <li
                     key={miscon.value.misconception}
-                    className={`mb-12 flex flex-col gap-8`}
+                    className={"mb-12 flex flex-col gap-8"}
                   >
                     <p className="font-bold">{miscon.value.misconception}</p>
                     <p>{miscon.value.description}</p>
@@ -152,7 +152,7 @@ const Quiz = ({ question }: Readonly<QuizProps>) => {
       <ul className="mt-10">
         {question.distractors.map((distractor) => {
           return (
-            <li key={distractor.value} className={`mb-12 flex flex-col gap-8`}>
+            <li key={distractor.value} className={"mb-12 flex flex-col gap-8"}>
               <p>{distractor.value}</p>
             </li>
           );

apps/nextjs/src/app/user/[[...index]]/page.tsx

@@ -5,5 +5,5 @@ export default function Page() {
     <div>
       <UserProfile />
     </div>
-  )
+  );
 }

apps/nextjs/src/hooks/useGenerationCallbacks.ts

@@ -16,6 +16,7 @@ import {
 import type { z } from "zod";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
+
 import { usePreviousValue } from "./usePreviousValue";
 
 type UseGenerationCallbackTypes<TSchema extends z.Schema> = {

apps/nextjs/src/lib/hooks/use-at-bottom.tsx

@@ -1,23 +1,23 @@
-import * as React from 'react'
+import * as React from "react";
 
 export function useAtBottom(offset = 0) {
-  const [isAtBottom, setIsAtBottom] = React.useState(false)
+  const [isAtBottom, setIsAtBottom] = React.useState(false);
 
   React.useEffect(() => {
     const handleScroll = () => {
       setIsAtBottom(
         window.innerHeight + window.scrollY >=
-          document.body.offsetHeight - offset
-      )
-    }
+          document.body.offsetHeight - offset,
+      );
+    };
 
-    window.addEventListener('scroll', handleScroll, { passive: true })
-    handleScroll()
+    window.addEventListener("scroll", handleScroll, { passive: true });
+    handleScroll();
 
     return () => {
-      window.removeEventListener('scroll', handleScroll)
-    }
-  }, [offset])
+      window.removeEventListener("scroll", handleScroll);
+    };
+  }, [offset]);
 
-  return isAtBottom
+  return isAtBottom;
 }

apps/nextjs/src/lib/sentry/SentryIdentify.ts

@@ -4,10 +4,12 @@ import * as Sentry from "@sentry/nextjs";
 
 import { useClerkIdentify } from "../clerk/useClerkIdentify";
 
-const sentrySetUser = ({ userId }) => {
-  Sentry.setUser({
-    id: userId,
-  });
+const sentrySetUser = ({ userId }: { userId: string }) => {
+  if (userId) {
+    Sentry.setUser({
+      id: userId,
+    });
+  }
 };
 const sentryUnsetUser = () => {
   Sentry.setUser(null);

apps/nextjs/tests-e2e/tests/aila-chat/helpers.ts

@@ -1,6 +1,7 @@
-import { expect, Page, test, TestInfo } from "@playwright/test";
+import type { Page, TestInfo } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 
-import { AilaStreamingStatus } from "@/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "@/components/AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
 
 export async function expectStreamingStatus(
   page: Page,
@@ -20,6 +21,7 @@ export async function waitForStreamingStatusChange(
   await page.waitForFunction(
     ([currentStatus, expectedStatus]) => {
       const statusElement = document.querySelector(
+        // eslint-disable-next-line @typescript-eslint/quotes, quotes
         '[data-testid="chat-aila-streaming-status"]',
       );
       return (

packages/aila/index.ts

@@ -1 +1 @@
-export * from "./src";
+export { Aila } from "./src/core/Aila";

packages/aila/src/core/chat/AilaStreamHandler.ts

@@ -44,7 +44,7 @@ export class AilaStreamHandler {
         await this.readFromStream();
       }
     } catch (e) {
-      this.handleStreamError(e);
+      await this.handleStreamError(e);
       log.info("Stream error", e, this._chat.iteration, this._chat.id);
     } finally {
       this._isStreaming = false;
@@ -109,7 +109,7 @@ export class AilaStreamHandler {
     for (const plugin of this._chat.aila.plugins ?? []) {
       await plugin.onStreamError?.(error, {
         aila: this._chat.aila,
-        enqueue: this._chat.enqueue,
+        enqueue: (patch) => this._chat.enqueue(patch),
       });
     }
 

packages/api/.eslintrc.cjs

@@ -0,0 +1,7 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["eslint-config-custom"],
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
+  },
+};

packages/api/src/router/exports.ts

@@ -27,6 +27,31 @@ import { router } from "../trpc";
 
 const log = aiLogger("exports");
 
+function getValidLink(
+  data:
+    | {
+        link: string;
+        canViewSourceDoc: boolean;
+      }
+    | {
+        error: unknown;
+        message: string;
+      },
+): string | undefined {
+  if (data && "link" in data && typeof data.link === "string") {
+    return data.link;
+  }
+  if ("error" in data && "message" in data) {
+    Sentry.captureException(data.error, {
+      extra: {
+        error: data.error,
+        message: data.message,
+      },
+    });
+    throw new Error(data.message);
+  }
+}
+
 export async function ailaSaveExport({
   auth,
   prisma,
@@ -643,31 +668,6 @@ export const exportsRouter = router({
           }),
         ]);
 
-        function getValidLink(
-          data:
-            | {
-                link: string;
-                canViewSourceDoc: boolean;
-              }
-            | {
-                error: unknown;
-                message: string;
-              },
-        ): string | undefined {
-          if (data && "link" in data && typeof data.link === "string") {
-            return data.link;
-          }
-          if ("error" in data && "message" in data) {
-            Sentry.captureException(data.error, {
-              extra: {
-                error: data.error,
-                message: data.message,
-              },
-            });
-            throw new Error(data.message);
-          }
-        }
-
         const allExports = {
           lessonSlides: getValidLink(lessonSlides),
           lessonPlan: getValidLink(lessonPlan),

packages/core/.eslintrc.cjs

@@ -0,0 +1,7 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["eslint-config-custom"],
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
+  },
+};

packages/db/.eslintrc.cjs

@@ -0,0 +1,7 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["eslint-config-custom"],
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
+  },
+};

packages/exports/.eslintrc.cjs

@@ -0,0 +1,7 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["eslint-config-custom"],
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
+  },
+};

packages/ingest/.eslintrc.cjs

@@ -0,0 +1,7 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["eslint-config-custom"],
+  parserOptions: {
+    project: __dirname + "/tsconfig.json",
+  },
+};

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

@@ -6,7 +6,7 @@ import fs from "node:fs";
 import { IngestError } from "../IngestError";
 import { chunkAndPromiseAll } from "../utils/chunkAndPromiseAll";
 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";
 
 const log = aiLogger("ingest");

packages/ingest/src/index.ts

@@ -27,25 +27,25 @@ async function main() {
   const ingestId = process.argv[3] ?? (await getLatestIngestId({ prisma }));
   switch (command) {
     case "start":
-      ingestStart({ prisma, log });
+      await ingestStart({ prisma, log });
       break;
     case "captions":
-      captions({ prisma, log, ingestId });
+      await captions({ prisma, log, ingestId });
       break;
     case "lp-start":
-      lpBatchStart({ prisma, log, ingestId });
+      await lpBatchStart({ prisma, log, ingestId });
       break;
     case "lp-sync":
-      lpBatchSync({ prisma, log, ingestId });
+      await lpBatchSync({ prisma, log, ingestId });
       break;
     case "chunk":
-      lpChunking({ prisma, log, ingestId });
+      await lpChunking({ prisma, log, ingestId });
       break;
     case "embed-start":
-      lpPartsEmbedStart({ prisma, log, ingestId });
+      await lpPartsEmbedStart({ prisma, log, ingestId });
       break;
     case "embed-sync":
-      lpPartsEmbedSync({ prisma, log, ingestId });
+      await lpPartsEmbedSync({ prisma, log, ingestId });
       break;
     default:
       log.error("Unknown command");

packages/ingest/src/utils/jsonlToArray.ts

@@ -1,6 +1,9 @@
-export function jsonlToArray(jsonl: string) {
-  return jsonl
-    .split("\n")
-    .filter((line) => line.trim() !== "")
-    .map((line) => JSON.parse(line));
+export function jsonlToArray(jsonl: string): unknown[] {
+  return (
+    jsonl
+      .split("\n")
+      .filter((line) => line.trim() !== "")
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      .map((line) => JSON.parse(line))
+  );
 }