[pull] master from botpress:master

bots/hit-looper/src/index.ts

@@ -63,6 +63,7 @@ bot.on.message('*', async (props) => {
         userId: upstreamUser.id,
       },
     })
+
     return
   }
 
@@ -73,6 +74,7 @@ bot.on.message('*', async (props) => {
         conversationId: upstreamConversation.id,
       },
     })
+
     return
   }
 

package.json

@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "^3.564.0",
-    "@botpress/api": "1.34.0",
+    "@botpress/api": "1.37.0",
     "@botpress/cli": "workspace:*",
     "@botpress/client": "workspace:*",
     "@botpress/sdk": "workspace:*",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "4.16.2",
+  "version": "4.17.0",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^11.7.0",
     "@botpress/chat": "0.5.1",
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "@botpress/sdk": "4.15.2",
     "@bpinternal/const": "^0.1.0",
     "@bpinternal/tunnel": "^0.1.1",

packages/cli/src/api/bot-body.ts

@@ -1,6 +1,5 @@
 import * as client from '@botpress/client'
 import * as sdk from '@botpress/sdk'
-import { PluginTagNames } from '../command-implementations/project-command'
 import * as utils from '../utils'
 import * as types from './types'
 
@@ -47,65 +46,33 @@ export const prepareCreateBotBody = async (bot: sdk.BotDefinition): Promise<type
 })
 
 export const prepareUpdateBotBody = (
-  localBot: types.UpdateBotRequestBody & PluginTagNames,
+  localBot: types.UpdateBotRequestBody,
   remoteBot: client.Bot
 ): types.UpdateBotRequestBody => ({
   ...localBot,
-  shouldMergePlugins: true,
-  states: _setNullOnMissingValuesAndOmitPluginDefs(localBot.states, remoteBot.states),
-  recurringEvents: _setNullOnMissingValuesAndOmitPluginDefs(localBot.recurringEvents, remoteBot.recurringEvents),
+  states: utils.records.setNullOnMissingValues(localBot.states, remoteBot.states),
+  recurringEvents: utils.records.setNullOnMissingValues(localBot.recurringEvents, remoteBot.recurringEvents),
   events: utils.attributes.prepareAttributeUpdateBody({
-    localItems: _setNullOnMissingValuesAndOmitPluginDefs(localBot.events, remoteBot.events),
+    localItems: utils.records.setNullOnMissingValues(localBot.events, remoteBot.events),
     remoteItems: remoteBot.events,
   }),
   actions: utils.attributes.prepareAttributeUpdateBody({
-    localItems: _setNullOnMissingValuesAndOmitPluginDefs(localBot.actions, remoteBot.actions),
+    localItems: utils.records.setNullOnMissingValues(localBot.actions, remoteBot.actions),
     remoteItems: remoteBot.actions,
   }),
   user: {
     ...localBot.user,
-    tags: _setNullOnMissingValuesAndOmitImmutableTags(
-      localBot.user?.tags,
-      remoteBot.user?.tags,
-      localBot.immutableTags.user
-    ),
+    tags: utils.records.setNullOnMissingValues(localBot.user?.tags, remoteBot.user?.tags),
   },
   conversation: {
     ...localBot.conversation,
-    tags: _setNullOnMissingValuesAndOmitImmutableTags(
-      localBot.conversation?.tags,
-      remoteBot.conversation?.tags,
-      localBot.immutableTags.conversation
-    ),
+    tags: utils.records.setNullOnMissingValues(localBot.conversation?.tags, remoteBot.conversation?.tags),
   },
   message: {
     ...localBot.message,
-    tags: _setNullOnMissingValuesAndOmitImmutableTags(
-      localBot.message?.tags,
-      remoteBot.message?.tags,
-      localBot.immutableTags.message
-    ),
+    tags: utils.records.setNullOnMissingValues(localBot.message?.tags, remoteBot.message?.tags),
   },
-  integrations: _setNullOnMissingValuesAndOmitPluginDefs(localBot.integrations, remoteBot.integrations),
-  plugins: _setNullOnMissingValuesAndOmitPluginDefs(localBot.plugins, remoteBot.plugins),
+  integrations: utils.records.setNullOnMissingValues(localBot.integrations, remoteBot.integrations),
+  plugins: utils.records.setNullOnMissingValues(localBot.plugins, remoteBot.plugins),
   tags: localBot.tags, // TODO: allow removing bot tags (aka attributes) by setting to null
 })
-
-export const _setNullOnMissingValuesAndOmitPluginDefs: typeof utils.records.setNullOnMissingValues = (
-  record,
-  oldRecord = {}
-) =>
-  utils.records.setNullOnMissingValues(
-    record,
-    Object.fromEntries(Object.entries(oldRecord).filter(([key]) => !key.includes('#')))
-  )
-
-export const _setNullOnMissingValuesAndOmitImmutableTags = <A, B>(
-  record: Record<string, A> = {},
-  oldRecord: Record<string, B> = {},
-  immutableTags: string[] = []
-): Record<string, A | null> =>
-  utils.records.setNullOnMissingValues(
-    record,
-    Object.fromEntries(Object.entries(oldRecord).filter(([key]) => !immutableTags.includes(key)))
-  )

packages/cli/src/command-implementations/add-command.ts

@@ -113,6 +113,11 @@ export class AddCommand extends GlobalCommand<AddCommandDefinition> {
       await this._uninstall(installPath)
     }
 
+    if (ref.type === 'name') {
+      // Preserve the semver version expression in the generated code:
+      targetPackage.pkg.version = ref.version
+    }
+
     let files: codegen.File[]
     if (targetPackage.type === 'integration') {
       files = await codegen.generateIntegrationPackage(targetPackage.pkg)

packages/cli/src/command-implementations/project-command.ts

@@ -33,10 +33,6 @@ export type ProjectDefinition = LintIgnoredConfig &
     | { type: 'plugin'; definition: sdk.PluginDefinition }
   )
 
-export type PluginTagNames = {
-  immutableTags: { user: string[]; conversation: string[]; message: string[] }
-}
-
 class ProjectPaths extends utils.path.PathStore<keyof AllProjectPaths> {
   public constructor(argv: CommandArgv<ProjectCommandDefinition>) {
     const absWorkDir = utils.path.absoluteFrom(utils.path.cwd(), argv.workDir)
@@ -345,7 +341,7 @@ export abstract class ProjectCommand<C extends ProjectCommandDefinition> extends
   protected async prepareBotDependencies(
     botDef: sdk.BotDefinition,
     api: apiUtils.ApiClient
-  ): Promise<Partial<apiUtils.UpdateBotRequestBody> & PluginTagNames> {
+  ): Promise<Partial<apiUtils.UpdateBotRequestBody>> {
     const integrations = await this._fetchDependencies(botDef.integrations ?? {}, ({ name, version }) =>
       api.getPublicOrPrivateIntegration({ type: 'name', name, version })
     )
@@ -383,30 +379,6 @@ export abstract class ProjectCommand<C extends ProjectCommandDefinition> extends
           integrationId: iface.id,
         })),
       })),
-      // Tags that are defined by plugins and that cannot be updated:
-      immutableTags: {
-        user: [
-          ...new Set(
-            Object.values(pluginsWithBackingIntegrations).flatMap((plugin) =>
-              Object.keys(plugin.definition.user?.tags ?? {})
-            )
-          ),
-        ],
-        conversation: [
-          ...new Set(
-            Object.values(pluginsWithBackingIntegrations).flatMap((plugin) =>
-              Object.keys(plugin.definition.conversation?.tags ?? {})
-            )
-          ),
-        ],
-        message: [
-          ...new Set(
-            Object.values(pluginsWithBackingIntegrations).flatMap((plugin) =>
-              Object.keys(plugin.definition.message?.tags ?? {})
-            )
-          ),
-        ],
-      },
     }
   }
 

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

@@ -5,7 +5,7 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "@botpress/sdk": "4.15.2"
   },
   "devDependencies": {

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

@@ -6,7 +6,7 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "@botpress/sdk": "4.15.2"
   },
   "devDependencies": {

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

@@ -6,7 +6,7 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "@botpress/sdk": "4.15.2"
   },
   "devDependencies": {

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

@@ -6,7 +6,7 @@
   },
   "private": true,
   "dependencies": {
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "@botpress/sdk": "4.15.2",
     "axios": "^1.6.8"
   },

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/client",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "description": "Botpress Client",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

packages/llmz/package.json

@@ -34,7 +34,7 @@
     "@babel/standalone": "^7.26.4",
     "@babel/traverse": "^7.26.4",
     "@babel/types": "^7.26.3",
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "bytes": "^3.1.2",
     "exponential-backoff": "^3.1.1",
     "handlebars": "^4.7.8",

packages/sdk/package.json

@@ -16,7 +16,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "browser-or-node": "^2.1.1"
   },
   "devDependencies": {

packages/vai/package.json

@@ -36,7 +36,7 @@
     "tsup": "^8.0.2"
   },
   "peerDependencies": {
-    "@botpress/client": "1.21.0",
+    "@botpress/client": "1.22.0",
     "@bpinternal/thicktoken": "^1.0.1",
     "@bpinternal/zui": "^1.0.1",
     "lodash": "^4.17.21",