[pull] master from botpress:master

integrations/notion/integration.definition.ts

@@ -3,7 +3,7 @@ import filesReadonly from './bp_modules/files-readonly'
 import { actions, configuration, configurations, identifier, secrets, states, user } from './definitions'
 
 export const INTEGRATION_NAME = 'notion'
-export const INTEGRATION_VERSION = '2.2.1'
+export const INTEGRATION_VERSION = '2.2.2'
 
 export default new sdk.IntegrationDefinition({
   name: INTEGRATION_NAME,
@@ -19,9 +19,6 @@ export default new sdk.IntegrationDefinition({
   secrets,
   states,
   user,
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 }).extend(filesReadonly, ({}) => ({
   entities: {},
   actions: {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run build:types && pnpm run bundle && pnpm run template:gen",
@@ -27,7 +27,7 @@
     "@apidevtools/json-schema-ref-parser": "^11.7.0",
     "@botpress/chat": "0.5.4",
     "@botpress/client": "1.27.2",
-    "@botpress/sdk": "5.0.0",
+    "@botpress/sdk": "5.0.1",
     "@bpinternal/const": "^0.1.0",
     "@bpinternal/tunnel": "^0.1.1",
     "@bpinternal/verel": "^0.2.0",

packages/cli/src/linter/base-linter.ts

@@ -22,7 +22,8 @@ export abstract class BaseLinter<TDefinition> {
 
   public logResults(logger: Logger) {
     for (const result of this.getSortedResults()) {
-      const message = `${result.path}: ${result.message}`
+      const resultPath = result.path.trim() || '{root}'
+      const message = `${resultPath}: ${result.message}`
 
       this._logResultMessage(logger, message, result.severity)
     }

packages/cli/templates/empty-bot/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {
     "@botpress/client": "1.27.2",
-    "@botpress/sdk": "5.0.0"
+    "@botpress/sdk": "5.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

packages/cli/templates/empty-integration/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@botpress/client": "1.27.2",
-    "@botpress/sdk": "5.0.0"
+    "@botpress/sdk": "5.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

packages/cli/templates/empty-plugin/package.json

@@ -6,7 +6,7 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/sdk": "5.0.0"
+    "@botpress/sdk": "5.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

packages/cli/templates/hello-world/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@botpress/client": "1.27.2",
-    "@botpress/sdk": "5.0.0"
+    "@botpress/sdk": "5.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.16.4",

packages/cli/templates/webhook-message/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@botpress/client": "1.27.2",
-    "@botpress/sdk": "5.0.0",
+    "@botpress/sdk": "5.0.1",
     "axios": "^1.6.8"
   },
   "devDependencies": {

packages/cognitive/package.json

@@ -35,7 +35,7 @@
     "@botpress/cli": "workspace:*",
     "@botpress/client": "workspace:*",
     "@botpress/common": "workspace:*",
-    "@bpinternal/zui": "1.3.0",
+    "@bpinternal/zui": "1.3.1",
     "@size-limit/file": "^11.1.6",
     "@types/axios": "^0.14.4",
     "@types/debug": "^4.1.12",

packages/llmz/examples/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@botpress/client": "workspace:^",
     "@botpress/zai": "^2.0.8",
-    "@bpinternal/zui": "1.3.0",
+    "@bpinternal/zui": "1.3.1",
     "chalk": "^4.1.2",
     "llmz": "link:..",
     "lodash": "^4.17.21",

packages/llmz/package.json

@@ -74,7 +74,7 @@
     "@botpress/client": "1.27.2",
     "@botpress/cognitive": "0.3.1",
     "@bpinternal/thicktoken": "^1.0.5",
-    "@bpinternal/zui": "1.3.0"
+    "@bpinternal/zui": "1.3.1"
   },
   "dependenciesMeta": {
     "@bpinternal/zui": {

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/sdk",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Botpress SDK",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -30,7 +30,7 @@
     "tsup": "^8.0.2"
   },
   "peerDependencies": {
-    "@bpinternal/zui": "1.3.0",
+    "@bpinternal/zui": "1.3.1",
     "esbuild": "^0.16.12"
   },
   "peerDependenciesMeta": {

packages/sdk/src/plugin/conversation-proxy/proxy.ts

@@ -26,7 +26,7 @@ export const proxyConversations = <TPlugin extends BasePlugin>(props: {
                 list(listProps): any {
                   const integrationName =
                     props.plugin?.interfaces[interfaceOrIntegrationAlias]?.integrationAlias ??
-                    props.plugin?.integrations[interfaceOrIntegrationAlias]?.integrationAlias!
+                    props.plugin?.integrations[interfaceOrIntegrationAlias]?.integrationAlias
 
                   const actualChannelName =
                     props.plugin?.interfaces[interfaceOrIntegrationAlias]?.channels?.[channel]?.name ?? channel
@@ -35,8 +35,8 @@ export const proxyConversations = <TPlugin extends BasePlugin>(props: {
                     props.client
                       .listConversations({
                         ...prefixTagsIfNeeded(listProps ?? {}, { alias: props.plugin?.alias }),
-                        channel: actualChannelName,
-                        integrationName,
+                        channel: actualChannelName === '*' ? undefined : actualChannelName,
+                        integrationName: integrationName === '*' ? undefined : integrationName,
                         nextToken,
                       })
                       .then(({ meta, conversations }) => ({

packages/vai/package.json

@@ -42,7 +42,7 @@
   "peerDependencies": {
     "@botpress/client": "1.27.2",
     "@bpinternal/thicktoken": "^1.0.1",
-    "@bpinternal/zui": "1.3.0",
+    "@bpinternal/zui": "1.3.1",
     "lodash": "^4.17.21",
     "vitest": "^2 || ^3 || ^4 || ^5"
   },

packages/zai/package.json

@@ -56,7 +56,7 @@
   },
   "peerDependencies": {
     "@bpinternal/thicktoken": "^1.0.0",
-    "@bpinternal/zui": "^1.3.0"
+    "@bpinternal/zui": "^1.3.1"
   },
   "engines": {
     "node": ">=18.0.0"

plugins/analytics/plugin.definition.ts

@@ -14,7 +14,4 @@ export default new sdk.PluginDefinition({
       },
     },
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })

plugins/conversation-insights/plugin.definition.ts

@@ -2,7 +2,7 @@ import { PluginDefinition, z } from '@botpress/sdk'
 
 export default new PluginDefinition({
   name: 'conversation-insights',
-  version: '0.4.6',
+  version: '0.4.8',
   configuration: {
     schema: z.object({
       aiEnabled: z.boolean().default(true).describe('Set to true to enable title, summary and sentiment ai generation'),

plugins/conversation-insights/src/error-handler.ts

@@ -0,0 +1,9 @@
+import { BotLogger } from '@botpress/sdk'
+
+export const handleError =
+  (props: { context: string; logger: BotLogger }) =>
+  async (thrown: unknown): Promise<undefined> => {
+    const error = thrown instanceof Error ? thrown : new Error(String(thrown))
+    const message = `An error occured in the conversation-insights plugin while ${props.context}: ${error.message}`
+    props.logger.error(message)
+  }

plugins/conversation-insights/src/handlers/after-incoming-message.ts

@@ -0,0 +1,19 @@
+import * as onNewMessageHandler from '../onNewMessageHandler'
+import * as bp from '.botpress'
+
+const HOUR_MILLISECONDS = 60 * 60 * 1000
+
+export const handleAfterIncomingMessage: bp.HookHandlers['after_incoming_message']['*'] = async (props) => {
+  const conversation = await props.conversations['*']['*'].getById({ id: props.data.conversationId })
+  await onNewMessageHandler.onNewMessage({ ...props, conversation })
+
+  if (props.configuration.aiEnabled) {
+    const events = await props.events.updateAiInsight.list({ status: 'scheduled' }).take(1)
+    if (events.length === 0) {
+      const dateTime = new Date(Date.now() + HOUR_MILLISECONDS).toISOString()
+      await props.events.updateAiInsight.schedule({}, { dateTime })
+    }
+  }
+
+  return undefined
+}

plugins/conversation-insights/src/handlers/after-outgoing-message.ts

@@ -0,0 +1,8 @@
+import * as onNewMessageHandler from '../onNewMessageHandler'
+import * as bp from '.botpress'
+
+export const handleAfterOutgoingMessage: bp.HookHandlers['after_outgoing_message']['*'] = async (props) => {
+  const conversation = await props.conversations['*']['*'].getById({ id: props.data.message.conversationId })
+  await onNewMessageHandler.onNewMessage({ ...props, conversation })
+  return undefined
+}

plugins/conversation-insights/src/handlers/index.ts

@@ -0,0 +1,4 @@
+export * from './after-incoming-message'
+export * from './after-outgoing-message'
+export * from './update-ai-insight'
+export * from './update-all-conversations'

plugins/conversation-insights/src/handlers/update-ai-insight.ts

@@ -0,0 +1,11 @@
+import * as bp from '.botpress'
+
+export const handleUpdateAiInsight: bp.EventHandlers['updateAiInsight'] = async (props) => {
+  const workflows = await props.workflows.updateAllConversations
+    .listInstances({ statuses: ['pending', 'cancelled', 'listening', 'paused'] })
+    .take(1)
+
+  if (workflows.length === 0) {
+    await props.workflows.updateAllConversations.startNewInstance({ input: {} })
+  }
+}

plugins/conversation-insights/src/handlers/update-all-conversations.ts

@@ -0,0 +1,18 @@
+import { updateAllConversations } from '../updateAllConversations'
+import * as bp from '.botpress'
+
+export const handleStartUpdateAllConversations: bp.WorkflowHandlers['updateAllConversations'] = async (props) => {
+  props.logger.info('Starting updateAllConversations workflow')
+  await updateAllConversations(props)
+
+  return undefined
+}
+export const handleContinueUpdateAllConversations: bp.WorkflowHandlers['updateAllConversations'] = async (props) => {
+  await updateAllConversations(props)
+
+  return undefined
+}
+
+export const handleTimeoutUpdateAllConversations: bp.WorkflowHandlers['updateAllConversations'] = async (props) => {
+  await props.workflow.setFailed({ failureReason: 'Workflow timed out' })
+}

plugins/conversation-insights/src/index.ts

@@ -1,10 +1,8 @@
 import { isBrowser } from 'browser-or-node'
-import * as onNewMessageHandler from './onNewMessageHandler'
-import { updateAllConversations } from './updateAllConversations'
+import { handleError } from './error-handler'
+import * as handlers from './handlers'
 import * as bp from '.botpress'
 
-const HOUR_MILLISECONDS = 60 * 60 * 1000
-
 const plugin = new bp.Plugin({
   actions: {},
 })
@@ -13,60 +11,49 @@ plugin.on.afterIncomingMessage('*', async (props) => {
   if (isBrowser) {
     return
   }
-  const conversation = await props.conversations['*']['*'].getById({ id: props.data.conversationId })
-  await onNewMessageHandler.onNewMessage({ ...props, conversation })
-
-  if (props.configuration.aiEnabled) {
-    const events = await props.events.updateAiInsight.list().take(1)
-
-    if (events.length === 0) {
-      const dateTime = new Date(Date.now() + HOUR_MILLISECONDS).toISOString()
-      await props.events.updateAiInsight.schedule({}, { dateTime })
-    }
-  }
-
-  return undefined
+  return await handlers
+    .handleAfterIncomingMessage(props)
+    .catch(handleError({ context: 'trying to process an incoming message', logger: props.logger }))
 })
 
 plugin.on.afterOutgoingMessage('*', async (props) => {
   if (isBrowser) {
     return
   }
-  const conversation = await props.conversations['*']['*'].getById({ id: props.data.message.conversationId })
-  await onNewMessageHandler.onNewMessage({ ...props, conversation })
-  return undefined
+  return await handlers
+    .handleAfterOutgoingMessage(props)
+    .catch(handleError({ context: 'trying to process an outgoing message', logger: props.logger }))
 })
 
 plugin.on.event('updateAiInsight', async (props) => {
   if (isBrowser) {
     props.logger.error('This event is not supported by the browser')
     return
   }
-
-  const workflows = await props.workflows.updateAllConversations
-    .listInstances({ statuses: ['pending', 'cancelled', 'listening', 'paused'] })
-    .take(1)
-
-  if (workflows.length === 0) {
-    await props.workflows.updateAllConversations.startNewInstance({ input: {} })
-  }
+  return await handlers
+    .handleUpdateAiInsight(props)
+    .catch(handleError({ context: 'trying to update an AI insight', logger: props.logger }))
 })
 
 plugin.on.workflowStart('updateAllConversations', async (props) => {
-  props.logger.info('Starting updateAllConversations workflow')
-  await updateAllConversations(props)
-
-  return undefined
+  return await handlers
+    .handleStartUpdateAllConversations(props)
+    .catch(handleError({ context: 'trying to start the updateAllConversations workflow', logger: props.logger }))
 })
 
 plugin.on.workflowContinue('updateAllConversations', async (props) => {
-  await updateAllConversations(props)
-
-  return undefined
+  return await handlers
+    .handleContinueUpdateAllConversations(props)
+    .catch(handleError({ context: 'trying to continue the updateAllConversations workflow', logger: props.logger }))
 })
 
 plugin.on.workflowTimeout('updateAllConversations', async (props) => {
-  await props.workflow.setFailed({ failureReason: 'Workflow timed out' })
+  return await handlers.handleTimeoutUpdateAllConversations(props).catch(
+    handleError({
+      context: 'trying to process the timeout of the updateAllConversations workflow',
+      logger: props.logger,
+    })
+  )
 })
 
 export default plugin

plugins/knowledge/plugin.definition.ts

@@ -8,7 +8,4 @@ export default new sdk.PluginDefinition({
   interfaces: {
     llm: sdk.version.allWithinMajorOf(llm),
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })

plugins/logger/plugin.definition.ts

@@ -4,7 +4,4 @@ export default new sdk.PluginDefinition({
   name: 'logger',
   version: '0.0.1',
   configuration: { schema: sdk.z.object({}) },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })

plugins/personality/plugin.definition.ts

@@ -18,7 +18,4 @@ export default new sdk.PluginDefinition({
   interfaces: {
     llm: sdk.version.allWithinMajorOf(llm),
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })

plugins/synchronizer/plugin.definition.ts

@@ -71,7 +71,4 @@ export default new sdk.PluginDefinition({
     listable: sdk.version.allWithinMajorOf(listable),
     deletable: sdk.version.allWithinMajorOf(deletable),
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })