Merge main and update to use inngest instead of client.ts

oaknational · Oct 29, 2024 · e37190a · e37190a
1 parent 5782d72
commit e37190a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 61 deletions.
diff --git a/apps/nextjs/src/app/api/chat/user.test.ts b/apps/nextjs/src/app/api/chat/user.test.ts
@@ -1,10 +1,10 @@
 import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
-import { inngest } from "@oakai/core/src/client";
+import { inngest } from "@oakai/core/src/inngest";
 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(),

diff --git a/apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts b/apps/nextjs/src/app/api/chat/webActionsPlugin.test.ts
@@ -6,10 +6,11 @@ import type { Moderation } from "@prisma/client";
 
 import { createWebActionsPlugin } from "./webActionsPlugin";
 
-jest.mock("@oakai/core/src/client", () => ({
+jest.mock("@oakai/core/src/inngest", () => ({
   __esModule: true,
 
   inngest: {
+    createFunction: jest.fn(),
     send: jest.fn(),
   },
 }));

diff --git a/apps/nextjs/src/app/api/chat/webActionsPlugin.ts b/apps/nextjs/src/app/api/chat/webActionsPlugin.ts
@@ -2,7 +2,7 @@ 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/client";
+import { inngest } from "@oakai/core/src/inngest";
 import { UserBannedError } from "@oakai/core/src/models/userBannedError";
 import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";

diff --git a/packages/api/src/middleware/rateLimiter.ts b/packages/api/src/middleware/rateLimiter.ts
@@ -1,10 +1,7 @@
-import { inngest } from "@oakai/core";
+import { inngest } from "@oakai/core/src/inngest";
 import { rateLimits } from "@oakai/core/src/utils/rateLimiting/rateLimit";
-import type {
-  RateLimiter} from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
-import {
-  RateLimitExceededError
-} from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
+import type { RateLimiter } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
+import { RateLimitExceededError } from "@oakai/core/src/utils/rateLimiting/userBasedRateLimiter";
 import { TRPCError } from "@trpc/server";
 
 import { t } from "../trpc";

diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
diff --git a/packages/core/src/models/lessons.ts b/packages/core/src/models/lessons.ts
@@ -15,7 +15,7 @@ import { PromptTemplate } from "langchain/prompts";
 import { RunnableSequence } from "langchain/schema/runnable";
 import { z } from "zod";
 
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 import { createOpenAILangchainClient } from "../llm/langchain";
 import type { SnippetWithLesson } from "./snippets";
 import { Snippets } from "./snippets";

diff --git a/packages/core/src/models/snippets.ts b/packages/core/src/models/snippets.ts
@@ -18,7 +18,7 @@ import { formatDocumentsAsString } from "langchain/util/document";
 import { PrismaVectorStore } from "langchain/vectorstores/prisma";
 import { difference } from "remeda";
 
-import { inngest } from "../client";
+import { inngest } from "../inngest";
 import { createOpenAILangchainClient } from "../llm/langchain";
 import { embedWithCache } from "../utils/embeddings";