Skip to content

Commit

Permalink
🚑 Fix invalid timeout for long running integrations
Browse files Browse the repository at this point in the history
  • Loading branch information
baptisteArno committed Dec 19, 2023
1 parent 655b32e commit 64fc59b
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,15 @@ export const ForgedBlockNodeContent = ({ block }: Props) => {

const setVariableIds = actionDef?.getSetVariableIds?.(block.options) ?? []

const isConfigured =
block.options?.action && (!blockDef?.auth || block.options.credentialsId)
return (
<Stack>
<Text
color={block.options?.action ? 'currentcolor' : 'gray.500'}
noOfLines={1}
>
{block.options?.action &&
(!blockDef?.auth || block.options.credentialsId)
? block.options.action
: 'Configure...'}
<Text color={isConfigured ? 'currentcolor' : 'gray.500'} noOfLines={1}>
{isConfigured ? block.options.action : 'Configure...'}
</Text>
{typebot &&
isConfigured &&
setVariableIds.map((variableId, idx) => (
<SetVariableLabel
key={variableId + idx}
Expand Down
21 changes: 17 additions & 4 deletions packages/bot-engine/executeIntegration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,31 @@ export const executeIntegration =
return executeGoogleAnalyticsBlock(state, block)
case IntegrationBlockType.EMAIL:
return executeSendEmailBlock(state, block)
case IntegrationBlockType.WEBHOOK:
case IntegrationBlockType.ZAPIER:
case IntegrationBlockType.MAKE_COM:
case IntegrationBlockType.PABBLY_CONNECT:
return {
...(await executeWebhookBlock(state, block)),
startTimeShouldBeUpdated: true,
}
case IntegrationBlockType.WEBHOOK:
return executeWebhookBlock(state, block)
case IntegrationBlockType.OPEN_AI:
return executeOpenAIBlock(state, block)
return {
...(await executeOpenAIBlock(state, block)),
startTimeShouldBeUpdated: true,
}
case IntegrationBlockType.PIXEL:
return executePixelBlock(state, block)
case IntegrationBlockType.ZEMANTIC_AI:
return executeZemanticAiBlock(state, block)
return {
...(await executeZemanticAiBlock(state, block)),
startTimeShouldBeUpdated: true,
}
default:
return executeForgedBlock(state, block)
return {
...(await executeForgedBlock(state, block)),
startTimeShouldBeUpdated: true,
}
}
}
5 changes: 3 additions & 2 deletions packages/forge/blocks/openai/actions/createChatCompletion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ export const createChatCompletion = createAction({
},
stream: {
getStreamVariableId: (options) =>
options.responseMapping?.find((res) => res.item === 'Message content')
?.variableId,
options.responseMapping?.find(
(res) => res.item === 'Message content' || !res.item
)?.variableId,
run: async ({ credentials: { apiKey }, options, variables }) => {
const config = {
apiKey,
Expand Down

2 comments on commit 64fc59b

@vercel
Copy link

@vercel vercel bot commented on 64fc59b Dec 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

viewer-v2 – ./apps/viewer

bii.bj
1stop.au
houss.io
whatsnaweb.com
apo.nigerias.io
app.blogely.com
apr.nigerias.io
aso.nigerias.io
b.copyreveal.ai
baohanh.qmap.vn
blackcan.cr8.ai
blackvip.online
booking.qmap.vn
bot.4display.nl
bot.a6t-you.com
bot.airvenue.io
bot.artiweb.app
bot.devitus.com
bot.neobank.fun
bot.reeplai.com
bot.scayver.com
bot.tc-mail.com
bot.upreview.me
carspecs.lam.ee
chat.borang.net
chat.lalmon.com
chat.sureb4.com
conversawpp.com
draluciana.site
eventhub.com.au
feiraododia.com
fitness.riku.ai
games.klujo.com
govfederal.site
iludogaming.com
ironcitygym.com
localove.online
marksteward.org
mikestuward.org
projektelco.com
proscale.com.br
ren.hartawan.my
sellmycarbr.com
sniperclass.com
svhmapp.mprs.in
tanjakoil.store
techmate.africa
typebot.aloe.do
web.ofilipi.com
acordo-certo.com
app-liberado.pro
ask.pemantau.org
batepapo.digital
viewer-v2-typebot-io.vercel.app
bot.atendimentolimpafacilbrasil.com
download.thailandmicespecialist.com
mdb.assessoria.aloisio.progenbr.com
mdb.assessoria.girotto.progenbr.com
mdb.assessoria.marinho.progenbr.com
mdb.assessoria.rodrigo.progenbr.com
register.thailandmicespecialist.com
mdb.assessoria.desideri.progenbr.com
mdb.assessoria.fernanda.progenbr.com
mdb.assessoria.jbatista.progenbr.com
mdb.assessoria.mauricio.progenbr.com
mdb.evento.autocadastro.progenbr.com
form.shopmercedesbenzsouthorlando.com
mdb.evento.equipeinterna.progenbr.com
bot.studiotecnicoimmobiliaremerelli.it
mdb.assessoria.boaventura.progenbr.com
mdb.assessoria.jtrebesqui.progenbr.com
pesquisa.escolamodacomproposito.com.br
anamnese.clinicaramosodontologia.com.br
gabinete.baleia.formulario.progenbr.com
mdb.assessoria.carreirinha.progenbr.com
chrome-os-inquiry-system.itschromeos.com
mdb.assessoria.paulomarques.progenbr.com
viewer-v2-git-main-typebot-io.vercel.app
main-menu-for-itschromeos.itschromeos.com
mdb.assessoria.qrcode.ademir.progenbr.com
mdb.assessoria.qrcode.arthur.progenbr.com
mdb.assessoria.qrcode.danilo.progenbr.com
mdb.assessoria.qrcode.marcao.progenbr.com
mdb.assessoria.qrcode.marcio.progenbr.com
mdb.assessoria.qrcode.aloisio.progenbr.com
mdb.assessoria.qrcode.girotto.progenbr.com
mdb.assessoria.qrcode.marinho.progenbr.com
mdb.assessoria.qrcode.rodrigo.progenbr.com
mdb.assessoria.carlosalexandre.progenbr.com
mdb.assessoria.qrcode.desideri.progenbr.com
mdb.assessoria.qrcode.fernanda.progenbr.com
mdb.assessoria.qrcode.jbatista.progenbr.com
mdb.assessoria.qrcode.mauricio.progenbr.com
mdb.assessoria.fernanda.regional.progenbr.com
mdb.assessoria.qrcode.boaventura.progenbr.com
mdb.assessoria.qrcode.jtrebesqui.progenbr.com
mdb.assessoria.qrcode.carreirinha.progenbr.com
mdb.assessoria.qrcode.paulomarques.progenbr.com
mdb.assessoria.qrcode.carlosalexandre.progenbr.com
mdb.assessoria.qrcode.fernanda.regional.progenbr.com

@vercel
Copy link

@vercel vercel bot commented on 64fc59b Dec 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

builder-v2 – ./apps/builder

builder-v2-typebot-io.vercel.app
app.typebot.io
builder-v2-git-main-typebot-io.vercel.app

Please sign in to comment.