⚡ Regroup database queries of /sendMessage in one place

Potentially reduces the total queries to database and it will help to migrate to Edge runtime
baptisteArno · Jul 18, 2023 · aa4c16d · aa4c16d · vercel · Jul 18, 2023
1 parent 1095cf7
commit aa4c16d
Show file tree

Hide file tree

Showing 32 changed files with 520 additions and 482 deletions.
diff --git a/apps/builder/src/features/templates/templates.spec.ts b/apps/builder/src/features/templates/templates.spec.ts
@@ -27,6 +27,6 @@ test.describe.parallel('Templates page', () => {
     await page.click('text=Customer Support')
     await expect(page.locator('text=How can I help you?')).toBeVisible()
     await page.click('text=Use this template')
-    await expect(page).toHaveURL(new RegExp(`/edit`), { timeout: 10000 })
+    await expect(page).toHaveURL(new RegExp(`/edit`), { timeout: 20000 })
   })
 })
diff --git a/apps/viewer/src/features/blocks/inputs/buttons/injectVariableValuesInButtonsInputBlock.ts b/apps/viewer/src/features/blocks/inputs/buttons/injectVariableValuesInButtonsInputBlock.ts
@@ -12,15 +12,15 @@ import { filterChoiceItems } from './filterChoiceItems'
 
 export const injectVariableValuesInButtonsInputBlock =
   (state: SessionState) =>
-  async (block: ChoiceInputBlock): Promise<ChoiceInputBlock> => {
+  (block: ChoiceInputBlock): ChoiceInputBlock => {
     if (block.options.dynamicVariableId) {
       const variable = state.typebot.variables.find(
         (variable) =>
           variable.id === block.options.dynamicVariableId &&
           isDefined(variable.value)
       ) as VariableWithValue | undefined
       if (!variable) return block
-      const value = await getVariableValue(state)(variable)
+      const value = getVariableValue(state)(variable)
       return {
         ...block,
         items: value.filter(isDefined).map((item, idx) => ({
@@ -38,12 +38,12 @@ export const injectVariableValuesInButtonsInputBlock =
 
 const getVariableValue =
   (state: SessionState) =>
-  async (variable: VariableWithValue): Promise<(string | null)[]> => {
+  (variable: VariableWithValue): (string | null)[] => {
     if (!Array.isArray(variable.value)) {
       const [transformedVariable] = transformStringVariablesToList(
         state.typebot.variables
       )([variable.id])
-      await updateVariables(state)([transformedVariable])
+      updateVariables(state)([transformedVariable])
       return transformedVariable.value as string[]
     }
     return variable.value

diff --git a/apps/viewer/src/features/blocks/integrations/googleSheets/getRow.ts b/apps/viewer/src/features/blocks/integrations/googleSheets/getRow.ts
@@ -7,11 +7,9 @@ import {
 import { isNotEmpty, byId } from '@typebot.io/lib'
 import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
 import { ExecuteIntegrationResponse } from '@/features/chat/types'
-import { saveErrorLog } from '@/features/logs/saveErrorLog'
 import { updateVariables } from '@/features/variables/updateVariables'
 import { deepParseVariables } from '@/features/variables/deepParseVariable'
 import { matchFilter } from './helpers/matchFilter'
-import { saveInfoLog } from '@/features/logs/saveInfoLog'
 
 export const getRow = async (
   state: SessionState,
@@ -20,15 +18,13 @@ export const getRow = async (
     options,
   }: { outgoingEdgeId?: string; options: GoogleSheetsGetOptions }
 ): Promise<ExecuteIntegrationResponse> => {
+  const logs: ReplyLog[] = []
   const { sheetId, cellsToExtract, referenceCell, filter } = deepParseVariables(
     state.typebot.variables
   )(options)
   if (!sheetId) return { outgoingEdgeId }
 
-  let log: ReplyLog | undefined
-
   const variables = state.typebot.variables
-  const resultId = state.result?.id
 
   const doc = await getAuthenticatedGoogleDoc({
     credentialsId: options.credentialsId,
@@ -48,16 +44,12 @@ export const getRow = async (
       )
     )
     if (filteredRows.length === 0) {
-      log = {
+      logs.push({
         status: 'info',
         description: `Couldn't find any rows matching the filter`,
         details: JSON.stringify(filter, null, 2),
-      }
-      await saveInfoLog({
-        resultId,
-        message: log.description,
       })
-      return { outgoingEdgeId, logs: log ? [log] : undefined }
+      return { outgoingEdgeId, logs }
     }
     const extractingColumns = cellsToExtract
       .map((cell) => cell.column)
@@ -85,24 +77,19 @@ export const getRow = async (
       },
       []
     )
-    const newSessionState = await updateVariables(state)(newVariables)
+    const newSessionState = updateVariables(state)(newVariables)
     return {
       outgoingEdgeId,
       newSessionState,
     }
   } catch (err) {
-    log = {
+    logs.push({
       status: 'error',
       description: `An error occurred while fetching the spreadsheet data`,
       details: err,
-    }
-    await saveErrorLog({
-      resultId,
-      message: log.description,
-      details: err,
     })
   }
-  return { outgoingEdgeId, logs: log ? [log] : undefined }
+  return { outgoingEdgeId, logs }
 }
 
 const getTotalRows = <T>(

diff --git a/apps/viewer/src/features/blocks/integrations/googleSheets/insertRow.ts b/apps/viewer/src/features/blocks/integrations/googleSheets/insertRow.ts
@@ -6,19 +6,17 @@ import {
 import { parseCellValues } from './helpers/parseCellValues'
 import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
 import { ExecuteIntegrationResponse } from '@/features/chat/types'
-import { saveErrorLog } from '@/features/logs/saveErrorLog'
-import { saveSuccessLog } from '@/features/logs/saveSuccessLog'
 
 export const insertRow = async (
-  { result, typebot: { variables } }: SessionState,
+  { typebot: { variables } }: SessionState,
   {
     outgoingEdgeId,
     options,
   }: { outgoingEdgeId?: string; options: GoogleSheetsInsertRowOptions }
 ): Promise<ExecuteIntegrationResponse> => {
   if (!options.cellsToInsert || !options.sheetId) return { outgoingEdgeId }
 
-  let log: ReplyLog | undefined
+  const logs: ReplyLog[] = []
 
   const doc = await getAuthenticatedGoogleDoc({
     credentialsId: options.credentialsId,
@@ -31,27 +29,17 @@ export const insertRow = async (
     await doc.loadInfo()
     const sheet = doc.sheetsById[Number(options.sheetId)]
     await sheet.addRow(parsedValues)
-    log = {
+    logs.push({
       status: 'success',
       description: `Succesfully inserted row in ${doc.title} > ${sheet.title}`,
-    }
-    result &&
-      (await saveSuccessLog({
-        resultId: result.id,
-        message: log?.description,
-      }))
+    })
   } catch (err) {
-    log = {
+    logs.push({
       status: 'error',
       description: `An error occured while inserting the row`,
       details: err,
-    }
-    result &&
-      (await saveErrorLog({
-        resultId: result.id,
-        message: log.description,
-        details: err,
-      }))
+    })
   }
-  return { outgoingEdgeId, logs: log ? [log] : undefined }
+
+  return { outgoingEdgeId, logs }
 }
diff --git a/apps/viewer/src/features/blocks/integrations/googleSheets/updateRow.ts b/apps/viewer/src/features/blocks/integrations/googleSheets/updateRow.ts
@@ -7,13 +7,10 @@ import { parseCellValues } from './helpers/parseCellValues'
 import { getAuthenticatedGoogleDoc } from './helpers/getAuthenticatedGoogleDoc'
 import { deepParseVariables } from '@/features/variables/deepParseVariable'
 import { ExecuteIntegrationResponse } from '@/features/chat/types'
-import { saveErrorLog } from '@/features/logs/saveErrorLog'
-import { saveSuccessLog } from '@/features/logs/saveSuccessLog'
 import { matchFilter } from './helpers/matchFilter'
-import { saveInfoLog } from '@/features/logs/saveInfoLog'
 
 export const updateRow = async (
-  { result, typebot: { variables } }: SessionState,
+  { typebot: { variables } }: SessionState,
   {
     outgoingEdgeId,
     options,
@@ -24,7 +21,7 @@ export const updateRow = async (
   if (!options.cellsToUpsert || !sheetId || (!referenceCell && !filter))
     return { outgoingEdgeId }
 
-  let log: ReplyLog | undefined
+  const logs: ReplyLog[] = []
 
   const doc = await getAuthenticatedGoogleDoc({
     credentialsId: options.credentialsId,
@@ -42,18 +39,12 @@ export const updateRow = async (
       : matchFilter(row, filter as NonNullable<typeof filter>)
   )
   if (filteredRows.length === 0) {
-    log = {
+    logs.push({
       status: 'info',
       description: `Could not find any row that matches the filter`,
-      details: JSON.stringify(filter, null, 2),
-    }
-    result &&
-      (await saveInfoLog({
-        resultId: result.id,
-        message: log.description,
-        details: log.details,
-      }))
-    return { outgoingEdgeId, logs: log ? [log] : undefined }
+      details: filter,
+    })
+    return { outgoingEdgeId, logs }
   }
 
   try {
@@ -65,28 +56,17 @@ export const updateRow = async (
       await rows[rowIndex].save()
     }
 
-    log = log = {
+    logs.push({
       status: 'success',
       description: `Succesfully updated matching rows`,
-    }
-    result &&
-      (await saveSuccessLog({
-        resultId: result.id,
-        message: log.description,
-      }))
+    })
   } catch (err) {
     console.log(err)
-    log = {
+    logs.push({
       status: 'error',
       description: `An error occured while updating the row`,
       details: err,
-    }
-    result &&
-      (await saveErrorLog({
-        resultId: result.id,
-        message: log.description,
-        details: err,
-      }))
+    })
   }
-  return { outgoingEdgeId, logs: log ? [log] : undefined }
+  return { outgoingEdgeId, logs }
 }
diff --git a/apps/viewer/src/features/blocks/integrations/openai/createChatCompletionOpenAI.ts b/apps/viewer/src/features/blocks/integrations/openai/createChatCompletionOpenAI.ts
@@ -50,7 +50,7 @@ export const createChatCompletionOpenAI = async (
     newSessionState.typebot.variables
   )(options.messages)
   if (variablesTransformedToList.length > 0)
-    newSessionState = await updateVariables(state)(variablesTransformedToList)
+    newSessionState = updateVariables(state)(variablesTransformedToList)
 
   const temperature = parseVariableNumber(newSessionState.typebot.variables)(
     options.advancedSettings?.temperature

diff --git a/apps/viewer/src/features/blocks/integrations/openai/executeChatCompletionOpenAIRequest.ts b/apps/viewer/src/features/blocks/integrations/openai/executeChatCompletionOpenAIRequest.ts
@@ -79,6 +79,7 @@ export const executeChatCompletionOpenAIRequest = async ({
     logs.push({
       status: 'error',
       description: `Internal error`,
+      details: error,
     })
     return { logs }
   }

diff --git a/apps/viewer/src/features/blocks/integrations/openai/resumeChatCompletion.ts b/apps/viewer/src/features/blocks/integrations/openai/resumeChatCompletion.ts
@@ -1,4 +1,3 @@
-import { saveSuccessLog } from '@/features/logs/saveSuccessLog'
 import { updateVariables } from '@/features/variables/updateVariables'
 import { byId, isDefined } from '@typebot.io/lib'
 import { ChatReply, SessionState } from '@typebot.io/schemas'
@@ -11,7 +10,7 @@ export const resumeChatCompletion =
     {
       outgoingEdgeId,
       options,
-      logs,
+      logs = [],
     }: {
       outgoingEdgeId?: string
       options: ChatCompletionOpenAIOptions
@@ -44,12 +43,11 @@ export const resumeChatCompletion =
       return newVariables
     }, [])
     if (newVariables.length > 0)
-      newSessionState = await updateVariables(newSessionState)(newVariables)
-    state.result &&
-      (await saveSuccessLog({
-        resultId: state.result.id,
-        message: 'OpenAI block successfully executed',
-      }))
+      newSessionState = updateVariables(newSessionState)(newVariables)
+    logs.push({
+      description: 'OpenAI block successfully executed',
+      status: 'success',
+    })
     return {
       outgoingEdgeId,
       newSessionState,