🐛 (openai) Fix ask assistant not correctly referencing uploaded f… (#…

…1469) …iles Closes #1468, closes #1467, closes #1211
baptisteArno · Apr 24, 2024 · dc1929e · dc1929e
1 parent a45e8ec
commit dc1929e
Show file tree

Hide file tree

Showing 57 changed files with 1,572 additions and 444 deletions.
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -128,7 +128,7 @@
     "eslint-config-custom": "workspace:*",
     "next-runtime-env": "1.6.2",
     "superjson": "1.12.4",
-    "typescript": "5.3.2",
+    "typescript": "5.4.5",
     "zod": "3.22.4"
   }
 }
diff --git a/apps/chat-api/package.json b/apps/chat-api/package.json
@@ -22,9 +22,9 @@
     "@typebot.io/prisma": "workspace:*",
     "@typebot.io/schemas": "workspace:*",
     "@typebot.io/variables": "workspace:*",
-    "ai": "3.0.12",
+    "ai": "3.0.31",
     "hono": "4.0.5",
-    "openai": "4.28.4",
+    "openai": "4.38.3",
     "prom-client": "15.1.0"
   },
   "devDependencies": {

diff --git a/apps/docs/openapi/builder.json b/apps/docs/openapi/builder.json
@@ -19149,7 +19149,7 @@
                       "assistantId": {
                         "type": "string"
                       },
-                      "threadId": {
+                      "threadVariableId": {
                         "type": "string"
                       },
                       "message": {
@@ -19186,6 +19186,9 @@
                             }
                           }
                         }
+                      },
+                      "threadId": {
+                        "type": "string"
                       }
                     },
                     "required": [

diff --git a/apps/docs/openapi/viewer.json b/apps/docs/openapi/viewer.json
@@ -9977,7 +9977,7 @@
                       "assistantId": {
                         "type": "string"
                       },
-                      "threadId": {
+                      "threadVariableId": {
                         "type": "string"
                       },
                       "message": {
@@ -10014,6 +10014,9 @@
                             }
                           }
                         }
+                      },
+                      "threadId": {
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -12480,18 +12483,10 @@
                     }
                   }
                 }
-              },
-              "runtime": {
-                "type": "string",
-                "enum": [
-                  "edge",
-                  "nodejs"
-                ]
               }
             },
             "required": [
-              "messages",
-              "runtime"
+              "messages"
             ]
           },
           "lastBubbleBlockId": {
@@ -12768,13 +12763,6 @@
               true
             ]
           },
-          "runtime": {
-            "type": "string",
-            "enum": [
-              "edge",
-              "nodejs"
-            ]
-          },
           "lastBubbleBlockId": {
             "type": "string"
           },
@@ -12784,8 +12772,7 @@
         },
         "required": [
           "type",
-          "stream",
-          "runtime"
+          "stream"
         ],
         "title": "Exec stream"
       },

diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json
@@ -48,6 +48,6 @@
     "postcss": "8.4.26",
     "prettier": "3.0.0",
     "tailwindcss": "3.3.3",
-    "typescript": "5.3.2"
+    "typescript": "5.4.5"
   }
 }
diff --git a/apps/viewer/package.json b/apps/viewer/package.json
@@ -21,7 +21,7 @@
     "@typebot.io/js": "workspace:*",
     "@typebot.io/nextjs": "workspace:*",
     "@typebot.io/prisma": "workspace:*",
-    "ai": "3.0.12",
+    "ai": "3.0.31",
     "bot-engine": "workspace:*",
     "cors": "2.8.5",
     "google-spreadsheet": "4.1.1",
@@ -30,7 +30,7 @@
     "next": "14.1.0",
     "nextjs-cors": "2.1.2",
     "nodemailer": "6.9.8",
-    "openai": "4.28.4",
+    "openai": "4.38.3",
     "qs": "6.11.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
@@ -62,7 +62,7 @@
     "next-runtime-env": "1.6.2",
     "papaparse": "5.4.1",
     "superjson": "1.12.4",
-    "typescript": "5.3.2",
+    "typescript": "5.4.5",
     "zod": "3.22.4",
     "@typebot.io/playwright": "workspace:*",
     "@typebot.io/results": "workspace:*"

diff --git a/apps/viewer/src/app/api/integrations/openai/streamer/route.ts b/apps/viewer/src/app/api/integrations/openai/streamer/route.ts
@@ -7,7 +7,7 @@ import { NextResponse } from 'next/dist/server/web/spec-extension/response'
 import { getBlockById } from '@typebot.io/schemas/helpers'
 import { forgedBlocks } from '@typebot.io/forge-repository/definitions'
 import { decryptV2 } from '@typebot.io/lib/api/encryption/decryptV2'
-import { ReadOnlyVariableStore } from '@typebot.io/forge'
+import { VariableStore } from '@typebot.io/forge'
 import {
   ParseVariablesOptions,
   parseVariables,
@@ -38,6 +38,7 @@ export async function OPTIONS() {
   })
 }
 
+// Deprecated in favor of `/api/v1/sessions/:sessionId/streamMessage`.
 export async function POST(req: Request) {
   const { sessionId, messages } = (await req.json()) as {
     messages: OpenAI.Chat.ChatCompletionMessage[] | undefined
@@ -140,7 +141,7 @@ export async function POST(req: Request) {
       credentials.data,
       credentials.iv
     )
-    const variables: ReadOnlyVariableStore = {
+    const variables: VariableStore = {
       list: () => state.typebotsQueue[0].typebot.variables,
       get: (id: string) => {
         const variable = state.typebotsQueue[0].typebot.variables.find(
@@ -150,6 +151,8 @@ export async function POST(req: Request) {
       },
       parse: (text: string, params?: ParseVariablesOptions) =>
         parseVariables(state.typebotsQueue[0].typebot.variables, params)(text),
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      set: (_1: string, _2: unknown) => {},
     }
     const stream = await action.run.stream.run({
       credentials: decryptedCredentials,

diff --git a/apps/viewer/src/app/api/v1/sessions/[sessionId]/streamMessage/route.ts b/apps/viewer/src/app/api/v1/sessions/[sessionId]/streamMessage/route.ts
@@ -26,11 +26,6 @@ export async function POST(
   req: Request,
   { params }: { params: { sessionId: string } }
 ) {
-  if (process.env.VERCEL_ENV)
-    return NextResponse.json(
-      { message: "Can't get streaming if hosted on Vercel" },
-      { status: 400, headers: responseHeaders }
-    )
   const messages =
     typeof req.body === 'string' ? JSON.parse(req.body) : req.body
   const { stream, status, message } = await getMessageStream({
@@ -39,7 +34,22 @@ export async function POST(
   })
   if (!stream)
     return NextResponse.json({ message }, { status, headers: responseHeaders })
-  return new StreamingTextResponse(stream, {
-    headers: responseHeaders,
+  return new StreamingTextResponse(
+    stream.pipeThrough(createStreamDataTransformer()),
+    {
+      headers: responseHeaders,
+    }
+  )
+}
+
+const createStreamDataTransformer = () => {
+  const encoder = new TextEncoder()
+  const decoder = new TextDecoder()
+  return new TransformStream({
+    transform: async (chunk, controller) => {
+      const decodedChunk = decoder.decode(chunk)
+      if (decodedChunk[0] !== '0') return
+      controller.enqueue(encoder.encode(JSON.parse(decodedChunk.slice(2))))
+    },
   })
 }
diff --git a/apps/viewer/src/app/api/v2/sessions/[sessionId]/streamMessage/route.ts b/apps/viewer/src/app/api/v2/sessions/[sessionId]/streamMessage/route.ts
@@ -0,0 +1,40 @@
+import { getMessageStream } from '@typebot.io/bot-engine/apiHandlers/getMessageStream'
+import { StreamingTextResponse } from 'ai'
+import { NextResponse } from 'next/server'
+
+export const dynamic = 'force-dynamic'
+
+const responseHeaders = {
+  'Access-Control-Allow-Origin': '*',
+  'Access-Control-Allow-Methods': 'POST, OPTIONS',
+  'Access-Control-Expose-Headers': 'Content-Length, X-JSON',
+  'Access-Control-Allow-Headers': '*',
+}
+
+export async function OPTIONS() {
+  return new Response('ok', {
+    headers: {
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Methods': 'POST',
+      'Access-Control-Expose-Headers': 'Content-Length, X-JSON',
+      'Access-Control-Allow-Headers': '*',
+    },
+  })
+}
+
+export async function POST(
+  req: Request,
+  { params }: { params: { sessionId: string } }
+) {
+  const messages =
+    typeof req.body === 'string' ? JSON.parse(req.body) : req.body
+  const { stream, status, message } = await getMessageStream({
+    sessionId: params.sessionId,
+    messages,
+  })
+  if (!stream)
+    return NextResponse.json({ message }, { status, headers: responseHeaders })
+  return new StreamingTextResponse(stream, {
+    headers: responseHeaders,
+  })
+}
diff --git a/packages/bot-engine/apiHandlers/getMessageStream.ts b/packages/bot-engine/apiHandlers/getMessageStream.ts
@@ -3,7 +3,7 @@ import { ChatCompletionOpenAIOptions } from '@typebot.io/schemas/features/blocks
 import { OpenAI } from 'openai'
 import { decryptV2 } from '@typebot.io/lib/api/encryption/decryptV2'
 import { forgedBlocks } from '@typebot.io/forge-repository/definitions'
-import { ReadOnlyVariableStore } from '@typebot.io/forge'
+import { VariableStore } from '@typebot.io/forge'
 import {
   ParseVariablesOptions,
   parseVariables,
@@ -13,6 +13,9 @@ import { getCredentials } from '../queries/getCredentials'
 import { getSession } from '../queries/getSession'
 import { getBlockById } from '@typebot.io/schemas/helpers'
 import { isForgedBlockType } from '@typebot.io/schemas/features/blocks/forged/helpers'
+import { updateVariablesInSession } from '@typebot.io/variables/updateVariablesInSession'
+import { updateSession } from '../queries/updateSession'
+import { deepParseVariables } from '@typebot.io/variables/deepParseVariables'
 
 type Props = {
   sessionId: string
@@ -92,7 +95,8 @@ export const getMessageStream = async ({ sessionId, messages }: Props) => {
       credentials.data,
       credentials.iv
     )
-    const variables: ReadOnlyVariableStore = {
+
+    const variables: VariableStore = {
       list: () => session.state.typebotsQueue[0].typebot.variables,
       get: (id: string) => {
         const variable = session.state.typebotsQueue[0].typebot.variables.find(
@@ -105,10 +109,25 @@ export const getMessageStream = async ({ sessionId, messages }: Props) => {
           session.state.typebotsQueue[0].typebot.variables,
           params
         )(text),
+      set: async (id: string, value: unknown) => {
+        const variable = session.state.typebotsQueue[0].typebot.variables.find(
+          (variable) => variable.id === id
+        )
+        if (!variable) return
+        await updateSession({
+          id: session.id,
+          state: updateVariablesInSession(session.state)([
+            { ...variable, value },
+          ]),
+          isReplying: undefined,
+        })
+      },
     }
     const stream = await action.run.stream.run({
       credentials: decryptedCredentials,
-      options: block.options,
+      options: deepParseVariables(
+        session.state.typebotsQueue[0].typebot.variables
+      )(block.options),
       variables,
     })
     if (!stream) return { status: 500, message: 'Could not create stream' }

diff --git a/packages/bot-engine/blocks/integrations/legacy/openai/createChatCompletionOpenAI.ts b/packages/bot-engine/blocks/integrations/legacy/openai/createChatCompletionOpenAI.ts
@@ -89,9 +89,7 @@ export const createChatCompletionOpenAI = async (
     isNextBubbleMessageWithAssistantMessage(typebot)(
       blockId,
       assistantMessageVariableName
-    ) &&
-    (!process.env.VERCEL_ENV ||
-      (isPlaneteScale() && credentials && isCredentialsV2(credentials)))
+    )
   ) {
     return {
       clientSideActions: [
@@ -102,7 +100,6 @@ export const createChatCompletionOpenAI = async (
               content?: string
               role: (typeof chatCompletionMessageRoles)[number]
             }[],
-            runtime: process.env.VERCEL_ENV ? 'edge' : 'nodejs',
           },
           expectsDedicatedReply: true,
         },

diff --git a/packages/bot-engine/forge/executeForgedBlock.ts b/packages/bot-engine/forge/executeForgedBlock.ts
@@ -58,9 +58,7 @@ export const executeForgedBlock = async (
       action.run.stream.getStreamVariableId(block.options)
     ) &&
     state.isStreamEnabled &&
-    !state.whatsApp &&
-    (!process.env.VERCEL_ENV ||
-      (isPlaneteScale() && credentials && isCredentialsV2(credentials)))
+    !state.whatsApp
   ) {
     return {
       outgoingEdgeId: block.outgoingEdgeId,
@@ -69,7 +67,6 @@ export const executeForgedBlock = async (
           type: 'stream',
           expectsDedicatedReply: true,
           stream: true,
-          runtime: process.env.VERCEL_ENV ? 'edge' : 'nodejs',
         },
       ],
     }

diff --git a/packages/bot-engine/package.json b/packages/bot-engine/package.json
@@ -19,7 +19,7 @@
     "@typebot.io/tsconfig": "workspace:*",
     "@typebot.io/variables": "workspace:*",
     "@udecode/plate-common": "30.4.5",
-    "ai": "3.0.12",
+    "ai": "3.0.31",
     "chrono-node": "2.7.5",
     "date-fns": "2.30.0",
     "date-fns-tz": "2.0.0",
@@ -29,7 +29,7 @@
     "libphonenumber-js": "1.10.37",
     "node-html-parser": "6.1.5",
     "nodemailer": "6.9.8",
-    "openai": "4.28.4",
+    "openai": "4.38.3",
     "qs": "6.11.2",
     "stripe": "12.13.0"
   },

diff --git a/packages/bot-engine/queries/updateSession.ts b/packages/bot-engine/queries/updateSession.ts
@@ -5,7 +5,7 @@ import { SessionState } from '@typebot.io/schemas'
 type Props = {
   id: string
   state: SessionState
-  isReplying: boolean
+  isReplying: boolean | undefined
 }
 
 export const updateSession = ({

diff --git a/packages/deprecated/bot-engine/package.json b/packages/deprecated/bot-engine/package.json
@@ -6,7 +6,7 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "scripts": {
-    "build": "pnpm tsc --noEmit && tsup",
+    "build": "tsup",
     "dev": "tsup --watch"
   },
   "dependencies": {
@@ -40,7 +40,7 @@
     "@typebot.io/tsconfig": "workspace:*",
     "tsup": "6.5.0",
     "typebot-js": "workspace:*",
-    "typescript": "5.3.2",
+    "typescript": "5.4.5",
     "@typebot.io/lib": "workspace:*",
     "@typebot.io/env": "workspace:*"
   },

diff --git a/packages/deprecated/typebot-js/package.json b/packages/deprecated/typebot-js/package.json
@@ -18,7 +18,7 @@
     "jest-environment-jsdom": "29.4.1",
     "prettier": "2.8.3",
     "ts-jest": "29.0.5",
-    "typescript": "5.3.2",
+    "typescript": "5.4.5",
     "@typebot.io/tsconfig": "workspace:*"
   }
 }