From 76ae562bd2fb54746bf1bb37d865a813c227389a Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 15 Apr 2025 14:32:37 +0100
Subject: [PATCH 01/18] Remove LLM options that aren't OpenAI.

---
 packages/pro                                  |   2 +-
 .../server/src/api/routes/tests/ai.spec.ts    | 189 ++++++++----------
 .../src/tests/utilities/mocks/ai/anthropic.ts |  48 -----
 packages/types/src/documents/global/config.ts |   8 +-
 4 files changed, 88 insertions(+), 159 deletions(-)
 delete mode 100644 packages/server/src/tests/utilities/mocks/ai/anthropic.ts

diff --git a/packages/pro b/packages/pro
index 8bcb90edac..1104c58a8c 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 8bcb90edac3d44c48eaecf526cedc82418035438
+Subproject commit 1104c58a8c225b4dfc10998ef87ebdba347f7863
diff --git a/packages/server/src/api/routes/tests/ai.spec.ts b/packages/server/src/api/routes/tests/ai.spec.ts
index 9e041a619e..58b538a2b1 100644
--- a/packages/server/src/api/routes/tests/ai.spec.ts
+++ b/packages/server/src/api/routes/tests/ai.spec.ts
@@ -13,8 +13,6 @@ import {
 } from "@budibase/types"
 import { context } from "@budibase/backend-core"
 import { mocks } from "@budibase/backend-core/tests"
-import { MockLLMResponseFn } from "../../../tests/utilities/mocks/ai"
-import { mockAnthropicResponse } from "../../../tests/utilities/mocks/ai/anthropic"
 import { quotas } from "@budibase/pro"
 
 function dedent(str: string) {
@@ -30,7 +28,6 @@ type SetupFn = (
 interface TestSetup {
   name: string
   setup: SetupFn
-  mockLLMResponse: MockLLMResponseFn
 }
 
 function budibaseAI(): SetupFn {
@@ -89,25 +86,14 @@ const allProviders: TestSetup[] = [
         OPENAI_API_KEY: "test-key",
       })
     },
-    mockLLMResponse: mockChatGPTResponse,
   },
   {
     name: "OpenAI API key with custom config",
     setup: customAIConfig({ provider: "OpenAI", defaultModel: "gpt-4o-mini" }),
-    mockLLMResponse: mockChatGPTResponse,
-  },
-  {
-    name: "Anthropic API key with custom config",
-    setup: customAIConfig({
-      provider: "Anthropic",
-      defaultModel: "claude-3-5-sonnet-20240620",
-    }),
-    mockLLMResponse: mockAnthropicResponse,
   },
   {
     name: "BudibaseAI",
     setup: budibaseAI(),
-    mockLLMResponse: mockChatGPTResponse,
   },
 ]
 
@@ -126,56 +112,54 @@ describe("AI", () => {
     nock.cleanAll()
   })
 
-  describe.each(allProviders)(
-    "provider: $name",
-    ({ setup, mockLLMResponse }: TestSetup) => {
-      let cleanup: () => Promise<void> | void
-      beforeAll(async () => {
-        cleanup = await setup(config)
+  describe.each(allProviders)("provider: $name", ({ setup }: TestSetup) => {
+    let cleanup: () => Promise<void> | void
+    beforeAll(async () => {
+      cleanup = await setup(config)
+    })
+
+    afterAll(async () => {
+      const maybePromise = cleanup()
+      if (maybePromise) {
+        await maybePromise
+      }
+    })
+
+    describe("POST /api/ai/js", () => {
+      let cleanup: () => void
+      beforeAll(() => {
+        cleanup = features.testutils.setFeatureFlags("*", {
+          AI_JS_GENERATION: true,
+        })
       })
 
-      afterAll(async () => {
-        const maybePromise = cleanup()
-        if (maybePromise) {
-          await maybePromise
-        }
+      afterAll(() => {
+        cleanup()
       })
 
-      describe("POST /api/ai/js", () => {
-        let cleanup: () => void
-        beforeAll(() => {
-          cleanup = features.testutils.setFeatureFlags("*", {
-            AI_JS_GENERATION: true,
-          })
-        })
+      it("handles correct plain code response", async () => {
+        mockChatGPTResponse(`return 42`)
 
-        afterAll(() => {
-          cleanup()
-        })
+        const { code } = await config.api.ai.generateJs({ prompt: "test" })
+        expect(code).toBe("return 42")
+      })
 
-        it("handles correct plain code response", async () => {
-          mockLLMResponse(`return 42`)
-
-          const { code } = await config.api.ai.generateJs({ prompt: "test" })
-          expect(code).toBe("return 42")
-        })
-
-        it("handles correct markdown code response", async () => {
-          mockLLMResponse(
-            dedent(`
+      it("handles correct markdown code response", async () => {
+        mockChatGPTResponse(
+          dedent(`
                 \`\`\`js
                 return 42
                 \`\`\`
             `)
-          )
+        )
 
-          const { code } = await config.api.ai.generateJs({ prompt: "test" })
-          expect(code).toBe("return 42")
-        })
+        const { code } = await config.api.ai.generateJs({ prompt: "test" })
+        expect(code).toBe("return 42")
+      })
 
-        it("handles multiple markdown code blocks returned", async () => {
-          mockLLMResponse(
-            dedent(`
+      it("handles multiple markdown code blocks returned", async () => {
+        mockChatGPTResponse(
+          dedent(`
                 This:
 
                 \`\`\`js
@@ -188,63 +172,62 @@ describe("AI", () => {
                 return 10
                 \`\`\`
             `)
-          )
+        )
 
-          const { code } = await config.api.ai.generateJs({ prompt: "test" })
-          expect(code).toBe("return 42")
-        })
-
-        // TODO: handle when this happens
-        it.skip("handles no code response", async () => {
-          mockLLMResponse("I'm sorry, you're quite right, etc.")
-          const { code } = await config.api.ai.generateJs({ prompt: "test" })
-          expect(code).toBe("")
-        })
-
-        it("handles LLM errors", async () => {
-          mockLLMResponse(() => {
-            throw new Error("LLM error")
-          })
-          await config.api.ai.generateJs({ prompt: "test" }, { status: 500 })
-        })
+        const { code } = await config.api.ai.generateJs({ prompt: "test" })
+        expect(code).toBe("return 42")
       })
 
-      describe("POST /api/ai/cron", () => {
-        it("handles correct cron response", async () => {
-          mockLLMResponse("0 0 * * *")
+      // TODO: handle when this happens
+      it.skip("handles no code response", async () => {
+        mockChatGPTResponse("I'm sorry, you're quite right, etc.")
+        const { code } = await config.api.ai.generateJs({ prompt: "test" })
+        expect(code).toBe("")
+      })
 
-          const { message } = await config.api.ai.generateCron({
+      it("handles LLM errors", async () => {
+        mockChatGPTResponse(() => {
+          throw new Error("LLM error")
+        })
+        await config.api.ai.generateJs({ prompt: "test" }, { status: 500 })
+      })
+    })
+
+    describe("POST /api/ai/cron", () => {
+      it("handles correct cron response", async () => {
+        mockChatGPTResponse("0 0 * * *")
+
+        const { message } = await config.api.ai.generateCron({
+          prompt: "test",
+        })
+        expect(message).toBe("0 0 * * *")
+      })
+
+      it("handles expected LLM error", async () => {
+        mockChatGPTResponse("Error generating cron: skill issue")
+
+        await config.api.ai.generateCron(
+          {
             prompt: "test",
-          })
-          expect(message).toBe("0 0 * * *")
-        })
-
-        it("handles expected LLM error", async () => {
-          mockLLMResponse("Error generating cron: skill issue")
-
-          await config.api.ai.generateCron(
-            {
-              prompt: "test",
-            },
-            { status: 400 }
-          )
-        })
-
-        it("handles unexpected LLM error", async () => {
-          mockLLMResponse(() => {
-            throw new Error("LLM error")
-          })
-
-          await config.api.ai.generateCron(
-            {
-              prompt: "test",
-            },
-            { status: 500 }
-          )
-        })
+          },
+          { status: 400 }
+        )
       })
-    }
-  )
+
+      it("handles unexpected LLM error", async () => {
+        mockChatGPTResponse(() => {
+          throw new Error("LLM error")
+        })
+
+        await config.api.ai.generateCron(
+          {
+            prompt: "test",
+          },
+          { status: 500 }
+        )
+      })
+    })
+  })
 })
 
 describe("BudibaseAI", () => {
diff --git a/packages/server/src/tests/utilities/mocks/ai/anthropic.ts b/packages/server/src/tests/utilities/mocks/ai/anthropic.ts
deleted file mode 100644
index ff0413aee1..0000000000
--- a/packages/server/src/tests/utilities/mocks/ai/anthropic.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import AnthropicClient from "@anthropic-ai/sdk"
-import nock from "nock"
-import { MockLLMResponseFn, MockLLMResponseOpts } from "."
-
-let chatID = 1
-const SPACE_REGEX = /\s+/g
-
-export const mockAnthropicResponse: MockLLMResponseFn = (
-  answer: string | ((prompt: string) => string),
-  opts?: MockLLMResponseOpts
-) => {
-  return nock(opts?.host || "https://api.anthropic.com")
-    .post("/v1/messages")
-    .reply((uri: string, body: nock.Body) => {
-      const req = body as AnthropicClient.MessageCreateParamsNonStreaming
-      const prompt = req.messages[0].content
-      if (typeof prompt !== "string") {
-        throw new Error("Anthropic mock only supports string prompts")
-      }
-
-      let content
-      if (typeof answer === "function") {
-        try {
-          content = answer(prompt)
-        } catch (e) {
-          return [500, "Internal Server Error"]
-        }
-      } else {
-        content = answer
-      }
-
-      const resp: AnthropicClient.Messages.Message = {
-        id: `${chatID++}`,
-        type: "message",
-        role: "assistant",
-        model: req.model,
-        stop_reason: "end_turn",
-        usage: {
-          input_tokens: prompt.split(SPACE_REGEX).length,
-          output_tokens: content.split(SPACE_REGEX).length,
-        },
-        stop_sequence: null,
-        content: [{ type: "text", text: content }],
-      }
-      return [200, resp]
-    })
-    .persist()
-}
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 422486e30f..3c311c5a86 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -111,13 +111,7 @@ export interface SCIMInnerConfig {
 
 export interface SCIMConfig extends Config<SCIMInnerConfig> {}
 
-export type AIProvider =
-  | "OpenAI"
-  | "Anthropic"
-  | "AzureOpenAI"
-  | "TogetherAI"
-  | "Custom"
-  | "BudibaseAI"
+export type AIProvider = "OpenAI" | "AzureOpenAI" | "BudibaseAI"
 
 export interface ProviderConfig {
   provider: AIProvider

From 9272f3dc5f4aa4e208084cdfcbe608bd6d40ec47 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 15 Apr 2025 15:35:06 +0100
Subject: [PATCH 02/18] Update pro reference.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 1104c58a8c..f27612865c 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 1104c58a8c225b4dfc10998ef87ebdba347f7863
+Subproject commit f27612865cd5f689b75b8f4e148293dff3b77bc4

From a12a85df8530c92c31b023381c50d378cdd2ca3f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 15 Apr 2025 16:02:13 +0100
Subject: [PATCH 03/18] Typing of AI Configuration files

---
 .../portal/settings/ai/AIConfigTile.svelte    | 12 ++---
 .../builder/portal/settings/ai/index.svelte   | 44 ++++++++++---------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
index fb040204c2..294f777186 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { Body, Label, Icon } from "@budibase/bbui"
   import BudibaseLogo from "./logos/Budibase.svelte"
   import OpenAILogo from "./logos/OpenAI.svelte"
@@ -6,7 +6,7 @@
   import TogetherAILogo from "./logos/TogetherAI.svelte"
   import AzureOpenAILogo from "./logos/AzureOpenAI.svelte"
   import { Providers } from "./constants"
-
+  import { ProviderConfig } from "@budibase/types"
   const logos = {
     ["Budibase AI"]: BudibaseLogo,
     [Providers.OpenAI.name]: OpenAILogo,
@@ -15,11 +15,11 @@
     [Providers.AzureOpenAI.name]: AzureOpenAILogo,
   }
 
-  export let config
-  export let disabled
+  export let config: ProviderConfig
+  export let disabled: boolean | null = null
 
-  export let editHandler
-  export let deleteHandler
+  export let editHandler: (() => void) | null
+  export let deleteHandler: (() => void) | null
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
index ae36fd5b98..e9b2058c74 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { onMount } from "svelte"
   import {
     Button,
@@ -16,22 +16,19 @@
   import { API } from "@/api"
   import AIConfigModal from "./ConfigModal.svelte"
   import AIConfigTile from "./AIConfigTile.svelte"
+  import { AIConfig, ConfigType, ProviderConfig } from "@budibase/types"
 
-  const ConfigTypes = {
-    AI: "ai",
-  }
-
-  let modal
-  let fullAIConfig
-  let editingAIConfig = {}
-  let editingUuid
+  let modal: Modal
+  let fullAIConfig: AIConfig
+  let editingAIConfig: ProviderConfig | undefined
+  let editingUuid: string | undefined
 
   $: isCloud = $admin.cloud
   $: customAIConfigsEnabled = $licensing.customAIConfigsEnabled
 
   async function fetchAIConfig() {
     try {
-      fullAIConfig = await API.getConfig(ConfigTypes.AI)
+      fullAIConfig = (await API.getConfig(ConfigType.AI)) as AIConfig
     } catch (error) {
       notifications.error("Error fetching AI config")
     }
@@ -42,9 +39,9 @@
     const id = editingUuid || Helpers.uuid()
 
     // Creating first custom AI Config
-    if (!fullAIConfig) {
+    if (!fullAIConfig && editingAIConfig) {
       fullAIConfig = {
-        type: ConfigTypes.AI,
+        type: ConfigType.AI,
         config: {
           [id]: editingAIConfig,
         },
@@ -54,7 +51,7 @@
       delete fullAIConfig.config.budibase_ai
 
       // unset the default value from other configs if default is set
-      if (editingAIConfig.isDefault) {
+      if (editingAIConfig?.isDefault) {
         for (let key in fullAIConfig.config) {
           if (key !== id) {
             fullAIConfig.config[key].isDefault = false
@@ -62,8 +59,10 @@
         }
       }
       // Add new or update existing custom AI Config
-      fullAIConfig.config[id] = editingAIConfig
-      fullAIConfig.type = ConfigTypes.AI
+      if (editingAIConfig) {
+        fullAIConfig.config[id] = editingAIConfig
+      }
+      fullAIConfig.type = ConfigType.AI
     }
 
     try {
@@ -72,7 +71,7 @@
     } catch (error) {
       notifications.error(
         `Failed to save AI Configuration, reason: ${
-          error?.message || "Unknown"
+          error instanceof Error ? error.message : "Unknown"
         }`
       )
     } finally {
@@ -80,7 +79,7 @@
     }
   }
 
-  async function deleteConfig(key) {
+  async function deleteConfig(key: string) {
     // We don't store the default BB AI config in the DB
     delete fullAIConfig.config.budibase_ai
     // Delete the configuration
@@ -91,14 +90,16 @@
       notifications.success(`Deleted config`)
     } catch (error) {
       notifications.error(
-        `Failed to delete config, reason: ${error?.message || "Unknown"}`
+        `Failed to delete config, reason: ${
+          error instanceof Error ? error.message : "Unknown"
+        }`
       )
     } finally {
       await fetchAIConfig()
     }
   }
 
-  function editConfig(uuid) {
+  function editConfig(uuid: string) {
     editingUuid = uuid
     editingAIConfig = fullAIConfig?.config[editingUuid]
     modal.show()
@@ -136,7 +137,10 @@
         </Tags>
       {/if}
     </div>
-    <Body>Configure your AI settings within this section:</Body>
+    <Body
+      >Connect an LLM to enable AI features. You can only enable one LLM at a
+      time.</Body
+    >
   </Layout>
   <Divider />
   <div style={`opacity: ${customAIConfigsEnabled ? 1 : 0.5}`}>

From ff34e54c309e6a7a2ac97f2a4090f5217f75f7ba Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 15 Apr 2025 16:08:25 +0100
Subject: [PATCH 04/18] needed type keyword

---
 .../pages/builder/portal/settings/ai/AIConfigTile.svelte    | 2 +-
 .../src/pages/builder/portal/settings/ai/index.svelte       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
index 294f777186..d7688835c3 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
@@ -6,7 +6,7 @@
   import TogetherAILogo from "./logos/TogetherAI.svelte"
   import AzureOpenAILogo from "./logos/AzureOpenAI.svelte"
   import { Providers } from "./constants"
-  import { ProviderConfig } from "@budibase/types"
+  import type { ProviderConfig } from "@budibase/types"
   const logos = {
     ["Budibase AI"]: BudibaseLogo,
     [Providers.OpenAI.name]: OpenAILogo,
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
index e9b2058c74..b569993cd1 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
@@ -16,7 +16,11 @@
   import { API } from "@/api"
   import AIConfigModal from "./ConfigModal.svelte"
   import AIConfigTile from "./AIConfigTile.svelte"
-  import { AIConfig, ConfigType, ProviderConfig } from "@budibase/types"
+  import {
+    type AIConfig,
+    ConfigType,
+    type ProviderConfig,
+  } from "@budibase/types"
 
   let modal: Modal
   let fullAIConfig: AIConfig

From c9cf9ad5065eb324c325d802e9bfaa252199744d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 15 Apr 2025 16:35:33 +0100
Subject: [PATCH 05/18] Fix data binding replacing partial matches

---
 packages/builder/src/dataBinding.js      | 20 ++++++++++++++++++++
 packages/builder/src/dataBinding.test.js | 19 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index ada1ee274d..f90488016c 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -1317,6 +1317,22 @@ const shouldReplaceBinding = (currentValue, from, convertTo, binding) => {
   return !invalids.find(invalid => noSpaces?.includes(invalid))
 }
 
+// If converting readable to runtime we need to ensure we don't replace words
+// which are substrings of other words - e.g. a binding of `a` would turn
+// `hah` into `h[a]h` which is obviously wrong. To avoid this we can strip all
+// expanded versions of the binding, then ensure the binding still exists.
+const excludeExtensions = (string, binding) => {
+  // Regex to find prefixed bindings (e.g. exclude xfoo for foo)
+  const regex1 = new RegExp(`[a-zA-Z0-9-_]+${binding}[a-zA-Z0-9-_]*`, "g")
+  // Regex to find prefixed bindings (e.g. exclude foox for foo)
+  const regex2 = new RegExp(`[a-zA-Z0-9-_]*${binding}[a-zA-Z0-9-_]+`, "g")
+  const matches = [...string.matchAll(regex1), ...string.matchAll(regex2)]
+  for (let match of matches) {
+    string = string.replace(match[0], new Array(match[0].length + 1).join("*"))
+  }
+  return string
+}
+
 /**
  * Utility function which replaces a string between given indices.
  */
@@ -1361,6 +1377,10 @@ const bindingReplacement = (
     // in the search, working from longest to shortest so always use best match first
     let searchString = newBoundValue
     for (let from of convertFromProps) {
+      // Blank out all extensions of this string to avoid partial matches
+      if (convertTo === "runtimeBinding") {
+        searchString = excludeExtensions(searchString, from)
+      }
       const binding = bindableProperties.find(el => el[convertFrom] === from)
       if (
         isJS ||
diff --git a/packages/builder/src/dataBinding.test.js b/packages/builder/src/dataBinding.test.js
index 5e3b484e22..3b7bc94c2b 100644
--- a/packages/builder/src/dataBinding.test.js
+++ b/packages/builder/src/dataBinding.test.js
@@ -72,6 +72,13 @@ describe("Builder dataBinding", () => {
         runtimeBinding: "count",
         type: "context",
       },
+      {
+        category: "Bindings",
+        icon: "Brackets",
+        readableBinding: "location",
+        runtimeBinding: "[location]",
+        type: "context",
+      },
     ]
     it("should convert a readable binding to a runtime one", () => {
       const textWithBindings = `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
@@ -83,6 +90,18 @@ describe("Builder dataBinding", () => {
         )
       ).toEqual(`Hello {{ [user].[firstName] }}! The count is {{ count }}.`)
     })
+    it("should not convert a partial match", () => {
+      const textWithBindings = `location {{ _location Zlocation location locationZ _location_ }}`
+      expect(
+        readableToRuntimeBinding(
+          bindableProperties,
+          textWithBindings,
+          "runtimeBinding"
+        )
+      ).toEqual(
+        `location {{ _location Zlocation [location] locationZ _location_ }}`
+      )
+    })
   })
 
   describe("updateReferencesInObject", () => {

From 13b2d5c16ab08e45db00cc3837384c0c15df252a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 15 Apr 2025 16:46:23 +0100
Subject: [PATCH 06/18] Include static formula fields in related table bindings

---
 .../src/components/backend/DataTable/formula.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js
index 8dcda83c27..65506726e6 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -1,4 +1,4 @@
-import { FieldType } from "@budibase/types"
+import { FieldType, FormulaType } from "@budibase/types"
 import { FIELDS } from "@/constants/backend"
 import { tables } from "@/stores/builder"
 import { get as svelteGet } from "svelte/store"
@@ -8,7 +8,6 @@ import { makeReadableKeyPropSafe } from "@/dataBinding"
 const MAX_DEPTH = 1
 
 const TYPES_TO_SKIP = [
-  FieldType.FORMULA,
   FieldType.AI,
   FieldType.LONGFORM,
   FieldType.SIGNATURE_SINGLE,
@@ -17,6 +16,18 @@ const TYPES_TO_SKIP = [
   FieldType.INTERNAL,
 ]
 
+const shouldSkipFieldSchema = fieldSchema => {
+  // Skip some types always
+  if (TYPES_TO_SKIP.includes(fieldSchema.type)) {
+    return true
+  }
+  // Skip dynamic formula fields
+  return (
+    fieldSchema.type === FieldType.FORMULA &&
+    fieldSchema.formulaType === FormulaType.DYNAMIC
+  )
+}
+
 export function getBindings({
   table,
   path = null,
@@ -32,7 +43,7 @@ export function getBindings({
     // skip relationships after a certain depth and types which
     // can't bind to
     if (
-      TYPES_TO_SKIP.includes(schema.type) ||
+      shouldSkipFieldSchema(schema) ||
       (isRelationship && depth >= MAX_DEPTH)
     ) {
       continue

From c897bb1a915a298d987fbbd68a85b36815a9dfd5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 15 Apr 2025 16:50:03 +0100
Subject: [PATCH 07/18] Comment update

---
 packages/builder/src/dataBinding.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index f90488016c..1d30a342ac 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -1319,8 +1319,8 @@ const shouldReplaceBinding = (currentValue, from, convertTo, binding) => {
 
 // If converting readable to runtime we need to ensure we don't replace words
 // which are substrings of other words - e.g. a binding of `a` would turn
-// `hah` into `h[a]h` which is obviously wrong. To avoid this we can strip all
-// expanded versions of the binding, then ensure the binding still exists.
+// `hah` into `h[a]h` which is obviously wrong. To avoid this we can remove all
+// expanded versions of the binding to be replaced.
 const excludeExtensions = (string, binding) => {
   // Regex to find prefixed bindings (e.g. exclude xfoo for foo)
   const regex1 = new RegExp(`[a-zA-Z0-9-_]+${binding}[a-zA-Z0-9-_]*`, "g")

From 42c258114ddef7e93b7f396c3dfdbcb7b4d44966 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 16 Apr 2025 08:54:40 +0100
Subject: [PATCH 08/18] Show AI JS prompt in expanded state when in drawer

---
 .../src/components/common/CodeEditor/AIGen.svelte | 15 +++++++++++++--
 .../common/CodeEditor/CodeEditor.svelte           |  2 --
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/AIGen.svelte b/packages/builder/src/components/common/CodeEditor/AIGen.svelte
index b03aff7aba..1b88550c8a 100644
--- a/packages/builder/src/components/common/CodeEditor/AIGen.svelte
+++ b/packages/builder/src/components/common/CodeEditor/AIGen.svelte
@@ -43,11 +43,22 @@
   $: accountPortalAccess = $auth?.user?.accountPortalAccess
   $: accountPortal = $admin.accountPortalUrl
   $: aiEnabled = $auth?.user?.llm
-  $: expanded = expandedOnly ? true : expanded
+
+  $: expanded =
+    expandedOnly || (parentWidth !== null && parentWidth > 450)
+      ? true
+      : expanded
+
   $: creditsExceeded = $licensing.aiCreditsExceeded
   $: disabled = suggestedCode !== null || !aiEnabled || creditsExceeded
-  $: if (expandedOnly) {
+
+  $: if (
+    expandedOnly ||
+    (expanded && parentWidth !== null && parentWidth > 350)
+  ) {
     containerWidth = calculateExpandedWidth()
+  } else if (!expanded) {
+    containerWidth = "auto"
   }
 
   async function generateJs(prompt: string) {
diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index 0448d4d048..c159804e47 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -443,7 +443,6 @@
     const resizeObserver = new ResizeObserver(() => {
       updateEditorWidth()
     })
-
     resizeObserver.observe(editorEle)
     return () => {
       resizeObserver.disconnect()
@@ -469,7 +468,6 @@
 
 {#if aiGenEnabled}
   <AIGen
-    expandedOnly={true}
     {bindings}
     {value}
     parentWidth={editorWidth}

From be5934a2dc86f9e5f6f22c3a86332e9653345ff0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 16 Apr 2025 09:55:32 +0100
Subject: [PATCH 09/18] add magic number to const

---
 .../builder/src/components/common/CodeEditor/AIGen.svelte   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/AIGen.svelte b/packages/builder/src/components/common/CodeEditor/AIGen.svelte
index 1b88550c8a..199c7aa42a 100644
--- a/packages/builder/src/components/common/CodeEditor/AIGen.svelte
+++ b/packages/builder/src/components/common/CodeEditor/AIGen.svelte
@@ -40,12 +40,14 @@
   let switchOnAIModal: Modal
   let addCreditsModal: Modal
 
+  const thresholdExpansionWidth = 350
   $: accountPortalAccess = $auth?.user?.accountPortalAccess
   $: accountPortal = $admin.accountPortalUrl
   $: aiEnabled = $auth?.user?.llm
 
   $: expanded =
-    expandedOnly || (parentWidth !== null && parentWidth > 450)
+    expandedOnly ||
+    (parentWidth !== null && parentWidth > thresholdExpansionWidth)
       ? true
       : expanded
 
@@ -54,7 +56,7 @@
 
   $: if (
     expandedOnly ||
-    (expanded && parentWidth !== null && parentWidth > 350)
+    (expanded && parentWidth !== null && parentWidth > thresholdExpansionWidth)
   ) {
     containerWidth = calculateExpandedWidth()
   } else if (!expanded) {

From 4ba465cd97d36436c7ddbcd5276fedeece547eb8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 16 Apr 2025 11:01:05 +0200
Subject: [PATCH 10/18] Pass format

---
 packages/pro                     | 2 +-
 packages/types/src/api/web/ai.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 8bcb90edac..6c88253245 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 8bcb90edac3d44c48eaecf526cedc82418035438
+Subproject commit 6c88253245b77bf589a7027b72032e9aa942fc4c
diff --git a/packages/types/src/api/web/ai.ts b/packages/types/src/api/web/ai.ts
index 3ae1b08f81..4800f037c6 100644
--- a/packages/types/src/api/web/ai.ts
+++ b/packages/types/src/api/web/ai.ts
@@ -5,8 +5,11 @@ export interface Message {
   content: string
 }
 
+export type ResponseFormat = "text" | "json"
+
 export interface ChatCompletionRequest {
   messages: Message[]
+  format?: ResponseFormat
 }
 
 export interface ChatCompletionResponse {

From 083486f84b13bca06a12cebc65a7914530a04a54 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 16 Apr 2025 11:33:58 +0200
Subject: [PATCH 11/18] "Allow" passing structured outputs

---
 packages/pro                     | 2 +-
 packages/types/src/api/web/ai.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/pro b/packages/pro
index 6c88253245..39c20eebc3 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 6c88253245b77bf589a7027b72032e9aa942fc4c
+Subproject commit 39c20eebc3baece4562abc0826779f20aac62267
diff --git a/packages/types/src/api/web/ai.ts b/packages/types/src/api/web/ai.ts
index 4800f037c6..b84b648591 100644
--- a/packages/types/src/api/web/ai.ts
+++ b/packages/types/src/api/web/ai.ts
@@ -5,7 +5,9 @@ export interface Message {
   content: string
 }
 
-export type ResponseFormat = "text" | "json"
+export enum StructuredOutput {}
+
+export type ResponseFormat = "text" | "json" | StructuredOutput
 
 export interface ChatCompletionRequest {
   messages: Message[]

From 442cd93191ba63736ed7b33a1fad56eb4416f0a2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 16 Apr 2025 10:38:37 +0100
Subject: [PATCH 12/18] Update packages/builder/src/dataBinding.js

Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
---
 packages/builder/src/dataBinding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 1d30a342ac..8ead78d8bf 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -1327,7 +1327,7 @@ const excludeExtensions = (string, binding) => {
   // Regex to find prefixed bindings (e.g. exclude foox for foo)
   const regex2 = new RegExp(`[a-zA-Z0-9-_]*${binding}[a-zA-Z0-9-_]+`, "g")
   const matches = [...string.matchAll(regex1), ...string.matchAll(regex2)]
-  for (let match of matches) {
+  for (const match of matches) {
     string = string.replace(match[0], new Array(match[0].length + 1).join("*"))
   }
   return string

From a09427675f4528ab70af2a069bff268e70e75677 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 16 Apr 2025 12:17:22 +0200
Subject: [PATCH 13/18] Add tests

---
 packages/pro                                  |  2 +-
 .../server/src/api/routes/tests/ai.spec.ts    | 43 ++++++++++++++++++-
 .../src/tests/utilities/mocks/ai/index.ts     |  2 +
 .../src/tests/utilities/mocks/ai/openai.ts    | 11 ++++-
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/packages/pro b/packages/pro
index 39c20eebc3..55ae1eab04 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 39c20eebc3baece4562abc0826779f20aac62267
+Subproject commit 55ae1eab04d7bd8f7557428e609064003da9a178
diff --git a/packages/server/src/api/routes/tests/ai.spec.ts b/packages/server/src/api/routes/tests/ai.spec.ts
index 9e041a619e..515a9b4f88 100644
--- a/packages/server/src/api/routes/tests/ai.spec.ts
+++ b/packages/server/src/api/routes/tests/ai.spec.ts
@@ -12,7 +12,7 @@ import {
   ProviderConfig,
 } from "@budibase/types"
 import { context } from "@budibase/backend-core"
-import { mocks } from "@budibase/backend-core/tests"
+import { generator, mocks } from "@budibase/backend-core/tests"
 import { MockLLMResponseFn } from "../../../tests/utilities/mocks/ai"
 import { mockAnthropicResponse } from "../../../tests/utilities/mocks/ai/anthropic"
 import { quotas } from "@budibase/pro"
@@ -285,7 +285,8 @@ describe("BudibaseAI", () => {
       envCleanup()
     })
 
-    beforeEach(() => {
+    beforeEach(async () => {
+      await config.newTenant()
       nock.cleanAll()
       const license: License = {
         plan: {
@@ -366,5 +367,43 @@ describe("BudibaseAI", () => {
         }
       )
     })
+
+    it("handles text format", async () => {
+      let usage = await getQuotaUsage()
+      expect(usage._id).toBe(`quota_usage_${config.getTenantId()}`)
+      expect(usage.monthly.current.budibaseAICredits).toBe(0)
+
+      const gptResponse = generator.word()
+      mockChatGPTResponse(gptResponse, { format: "text" })
+      const { message } = await config.api.ai.chat({
+        messages: [{ role: "user", content: "Hello!" }],
+        format: "text",
+        licenseKey: licenseKey,
+      })
+      expect(message).toBe(gptResponse)
+
+      usage = await getQuotaUsage()
+      expect(usage.monthly.current.budibaseAICredits).toBeGreaterThan(0)
+    })
+
+    it("handles json format", async () => {
+      let usage = await getQuotaUsage()
+      expect(usage._id).toBe(`quota_usage_${config.getTenantId()}`)
+      expect(usage.monthly.current.budibaseAICredits).toBe(0)
+
+      const gptResponse = JSON.stringify({
+        [generator.word()]: generator.word(),
+      })
+      mockChatGPTResponse(gptResponse, { format: "json" })
+      const { message } = await config.api.ai.chat({
+        messages: [{ role: "user", content: "Hello!" }],
+        format: "json",
+        licenseKey: licenseKey,
+      })
+      expect(message).toBe(gptResponse)
+
+      usage = await getQuotaUsage()
+      expect(usage.monthly.current.budibaseAICredits).toBeGreaterThan(0)
+    })
   })
 })
diff --git a/packages/server/src/tests/utilities/mocks/ai/index.ts b/packages/server/src/tests/utilities/mocks/ai/index.ts
index 87f8ce77be..d7df6be44f 100644
--- a/packages/server/src/tests/utilities/mocks/ai/index.ts
+++ b/packages/server/src/tests/utilities/mocks/ai/index.ts
@@ -1,7 +1,9 @@
+import { ResponseFormat } from "@budibase/types"
 import { Scope } from "nock"
 
 export interface MockLLMResponseOpts {
   host?: string
+  format?: ResponseFormat
 }
 
 export type MockLLMResponseFn = (
diff --git a/packages/server/src/tests/utilities/mocks/ai/openai.ts b/packages/server/src/tests/utilities/mocks/ai/openai.ts
index 827caad9be..3a9ac7f87a 100644
--- a/packages/server/src/tests/utilities/mocks/ai/openai.ts
+++ b/packages/server/src/tests/utilities/mocks/ai/openai.ts
@@ -1,5 +1,7 @@
 import nock from "nock"
 import { MockLLMResponseFn, MockLLMResponseOpts } from "."
+import _ from "lodash"
+import { ai } from "@budibase/pro"
 
 let chatID = 1
 const SPACE_REGEX = /\s+/g
@@ -48,8 +50,15 @@ export const mockChatGPTResponse: MockLLMResponseFn = (
   answer: string | ((prompt: string) => string),
   opts?: MockLLMResponseOpts
 ) => {
+  let body: any = undefined
+
+  if (opts?.format) {
+    body = _.matches({
+      response_format: ai.openai.parseResponseFormat(opts.format),
+    })
+  }
   return nock(opts?.host || "https://api.openai.com")
-    .post("/v1/chat/completions")
+    .post("/v1/chat/completions", body)
     .reply((uri: string, body: nock.Body) => {
       const req = body as ChatCompletionRequest
       const messages = req.messages

From d9b9e731c54cf46180fb7b0caa11c75931625b83 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 16 Apr 2025 12:23:43 +0200
Subject: [PATCH 14/18] Add structured outputs tests

---
 .../server/src/api/routes/tests/ai.spec.ts    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/ai.spec.ts b/packages/server/src/api/routes/tests/ai.spec.ts
index 515a9b4f88..aca5bfe432 100644
--- a/packages/server/src/api/routes/tests/ai.spec.ts
+++ b/packages/server/src/api/routes/tests/ai.spec.ts
@@ -1,3 +1,4 @@
+import { z } from "zod"
 import { mockChatGPTResponse } from "../../../tests/utilities/mocks/ai/openai"
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import nock from "nock"
@@ -10,12 +11,13 @@ import {
   PlanModel,
   PlanType,
   ProviderConfig,
+  StructuredOutput,
 } from "@budibase/types"
 import { context } from "@budibase/backend-core"
 import { generator, mocks } from "@budibase/backend-core/tests"
 import { MockLLMResponseFn } from "../../../tests/utilities/mocks/ai"
 import { mockAnthropicResponse } from "../../../tests/utilities/mocks/ai/anthropic"
-import { quotas } from "@budibase/pro"
+import { ai, quotas } from "@budibase/pro"
 
 function dedent(str: string) {
   return str
@@ -405,5 +407,28 @@ describe("BudibaseAI", () => {
       usage = await getQuotaUsage()
       expect(usage.monthly.current.budibaseAICredits).toBeGreaterThan(0)
     })
+
+    it("handles structured outputs", async () => {
+      let usage = await getQuotaUsage()
+      expect(usage._id).toBe(`quota_usage_${config.getTenantId()}`)
+      expect(usage.monthly.current.budibaseAICredits).toBe(0)
+
+      const gptResponse = generator.guid()
+      const structuredOutput = generator.word() as unknown as StructuredOutput
+      ai.structuredOutputs[structuredOutput] = {
+        key: generator.word(),
+        validator: z.object({ name: z.string() }),
+      }
+      mockChatGPTResponse(gptResponse, { format: structuredOutput })
+      const { message } = await config.api.ai.chat({
+        messages: [{ role: "user", content: "Hello!" }],
+        format: structuredOutput,
+        licenseKey: licenseKey,
+      })
+      expect(message).toBe(gptResponse)
+
+      usage = await getQuotaUsage()
+      expect(usage.monthly.current.budibaseAICredits).toBeGreaterThan(0)
+    })
   })
 })

From 61d746ac8473745fae6bba82d89d81b72e09d14c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 17 Apr 2025 09:47:07 +0100
Subject: [PATCH 15/18] Fix issue with square brackets in readable bindings

---
 packages/builder/src/dataBinding.js      | 14 +++++++++-----
 packages/builder/src/dataBinding.test.js | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 8ead78d8bf..f71c838f18 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -1321,11 +1321,14 @@ const shouldReplaceBinding = (currentValue, from, convertTo, binding) => {
 // which are substrings of other words - e.g. a binding of `a` would turn
 // `hah` into `h[a]h` which is obviously wrong. To avoid this we can remove all
 // expanded versions of the binding to be replaced.
-const excludeExtensions = (string, binding) => {
+const excludeReadableExtensions = (string, binding) => {
+  // Escape any special chars in the binding so we can treat it as a literal
+  // string match in the regexes below
+  const escaped = binding.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
   // Regex to find prefixed bindings (e.g. exclude xfoo for foo)
-  const regex1 = new RegExp(`[a-zA-Z0-9-_]+${binding}[a-zA-Z0-9-_]*`, "g")
+  const regex1 = new RegExp(`[a-zA-Z0-9-_]+${escaped}[a-zA-Z0-9-_]*`, "g")
   // Regex to find prefixed bindings (e.g. exclude foox for foo)
-  const regex2 = new RegExp(`[a-zA-Z0-9-_]*${binding}[a-zA-Z0-9-_]+`, "g")
+  const regex2 = new RegExp(`[a-zA-Z0-9-_]*${escaped}[a-zA-Z0-9-_]+`, "g")
   const matches = [...string.matchAll(regex1), ...string.matchAll(regex2)]
   for (const match of matches) {
     string = string.replace(match[0], new Array(match[0].length + 1).join("*"))
@@ -1377,9 +1380,10 @@ const bindingReplacement = (
     // in the search, working from longest to shortest so always use best match first
     let searchString = newBoundValue
     for (let from of convertFromProps) {
-      // Blank out all extensions of this string to avoid partial matches
+      // If converting readable > runtime, blank out all extensions of this
+      // string to avoid partial matches
       if (convertTo === "runtimeBinding") {
-        searchString = excludeExtensions(searchString, from)
+        searchString = excludeReadableExtensions(searchString, from)
       }
       const binding = bindableProperties.find(el => el[convertFrom] === from)
       if (
diff --git a/packages/builder/src/dataBinding.test.js b/packages/builder/src/dataBinding.test.js
index 3b7bc94c2b..b406ef4277 100644
--- a/packages/builder/src/dataBinding.test.js
+++ b/packages/builder/src/dataBinding.test.js
@@ -79,6 +79,20 @@ describe("Builder dataBinding", () => {
         runtimeBinding: "[location]",
         type: "context",
       },
+      {
+        category: "Bindings",
+        icon: "Brackets",
+        readableBinding: "foo.[bar]",
+        runtimeBinding: "[foo].[qwe]",
+        type: "context",
+      },
+      {
+        category: "Bindings",
+        icon: "Brackets",
+        readableBinding: "foo.baz",
+        runtimeBinding: "[foo].[baz]",
+        type: "context",
+      },
     ]
     it("should convert a readable binding to a runtime one", () => {
       const textWithBindings = `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
@@ -102,6 +116,16 @@ describe("Builder dataBinding", () => {
         `location {{ _location Zlocation [location] locationZ _location_ }}`
       )
     })
+    it("should handle special characters in the readable binding", () => {
+      const textWithBindings = `{{ foo.baz }}`
+      expect(
+        readableToRuntimeBinding(
+          bindableProperties,
+          textWithBindings,
+          "runtimeBinding"
+        )
+      ).toEqual(`{{ [foo].[baz] }}`)
+    })
   })
 
   describe("updateReferencesInObject", () => {

From 68c394ed41619b2839cc053e869eb49270478891 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 17 Apr 2025 11:09:58 +0100
Subject: [PATCH 16/18] Revert "Remove LLM options that aren't OpenAI."

---
 packages/pro                                  |   2 +-
 .../server/src/api/routes/tests/ai.spec.ts    | 177 ++++++++++--------
 .../src/tests/utilities/mocks/ai/anthropic.ts |  48 +++++
 packages/types/src/documents/global/config.ts |   8 +-
 4 files changed, 153 insertions(+), 82 deletions(-)
 create mode 100644 packages/server/src/tests/utilities/mocks/ai/anthropic.ts

diff --git a/packages/pro b/packages/pro
index f27612865c..8bcb90edac 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit f27612865cd5f689b75b8f4e148293dff3b77bc4
+Subproject commit 8bcb90edac3d44c48eaecf526cedc82418035438
diff --git a/packages/server/src/api/routes/tests/ai.spec.ts b/packages/server/src/api/routes/tests/ai.spec.ts
index 58b538a2b1..9e041a619e 100644
--- a/packages/server/src/api/routes/tests/ai.spec.ts
+++ b/packages/server/src/api/routes/tests/ai.spec.ts
@@ -13,6 +13,8 @@ import {
 } from "@budibase/types"
 import { context } from "@budibase/backend-core"
 import { mocks } from "@budibase/backend-core/tests"
+import { MockLLMResponseFn } from "../../../tests/utilities/mocks/ai"
+import { mockAnthropicResponse } from "../../../tests/utilities/mocks/ai/anthropic"
 import { quotas } from "@budibase/pro"
 
 function dedent(str: string) {
@@ -28,6 +30,7 @@ type SetupFn = (
 interface TestSetup {
   name: string
   setup: SetupFn
+  mockLLMResponse: MockLLMResponseFn
 }
 
 function budibaseAI(): SetupFn {
@@ -86,14 +89,25 @@ const allProviders: TestSetup[] = [
         OPENAI_API_KEY: "test-key",
       })
     },
+    mockLLMResponse: mockChatGPTResponse,
   },
   {
     name: "OpenAI API key with custom config",
     setup: customAIConfig({ provider: "OpenAI", defaultModel: "gpt-4o-mini" }),
+    mockLLMResponse: mockChatGPTResponse,
+  },
+  {
+    name: "Anthropic API key with custom config",
+    setup: customAIConfig({
+      provider: "Anthropic",
+      defaultModel: "claude-3-5-sonnet-20240620",
+    }),
+    mockLLMResponse: mockAnthropicResponse,
   },
   {
     name: "BudibaseAI",
     setup: budibaseAI(),
+    mockLLMResponse: mockChatGPTResponse,
   },
 ]
 
@@ -112,54 +126,56 @@ describe("AI", () => {
     nock.cleanAll()
   })
 
-  describe.each(allProviders)("provider: $name", ({ setup }: TestSetup) => {
-    let cleanup: () => Promise<void> | void
-    beforeAll(async () => {
-      cleanup = await setup(config)
-    })
+  describe.each(allProviders)(
+    "provider: $name",
+    ({ setup, mockLLMResponse }: TestSetup) => {
+      let cleanup: () => Promise<void> | void
+      beforeAll(async () => {
+        cleanup = await setup(config)
+      })
 
-    afterAll(async () => {
-      const maybePromise = cleanup()
-      if (maybePromise) {
-        await maybePromise
-      }
-    })
+      afterAll(async () => {
+        const maybePromise = cleanup()
+        if (maybePromise) {
+          await maybePromise
+        }
+      })
 
-    describe("POST /api/ai/js", () => {
-      let cleanup: () => void
-      beforeAll(() => {
-        cleanup = features.testutils.setFeatureFlags("*", {
-          AI_JS_GENERATION: true,
+      describe("POST /api/ai/js", () => {
+        let cleanup: () => void
+        beforeAll(() => {
+          cleanup = features.testutils.setFeatureFlags("*", {
+            AI_JS_GENERATION: true,
+          })
         })
-      })
 
-      afterAll(() => {
-        cleanup()
-      })
+        afterAll(() => {
+          cleanup()
+        })
 
-      it("handles correct plain code response", async () => {
-        mockChatGPTResponse(`return 42`)
+        it("handles correct plain code response", async () => {
+          mockLLMResponse(`return 42`)
 
-        const { code } = await config.api.ai.generateJs({ prompt: "test" })
-        expect(code).toBe("return 42")
-      })
+          const { code } = await config.api.ai.generateJs({ prompt: "test" })
+          expect(code).toBe("return 42")
+        })
 
-      it("handles correct markdown code response", async () => {
-        mockChatGPTResponse(
-          dedent(`
+        it("handles correct markdown code response", async () => {
+          mockLLMResponse(
+            dedent(`
                 \`\`\`js
                 return 42
                 \`\`\`
             `)
-        )
+          )
 
-        const { code } = await config.api.ai.generateJs({ prompt: "test" })
-        expect(code).toBe("return 42")
-      })
+          const { code } = await config.api.ai.generateJs({ prompt: "test" })
+          expect(code).toBe("return 42")
+        })
 
-      it("handles multiple markdown code blocks returned", async () => {
-        mockChatGPTResponse(
-          dedent(`
+        it("handles multiple markdown code blocks returned", async () => {
+          mockLLMResponse(
+            dedent(`
                 This:
 
                 \`\`\`js
@@ -172,62 +188,63 @@ describe("AI", () => {
                 return 10
                 \`\`\`
             `)
-        )
+          )
 
-        const { code } = await config.api.ai.generateJs({ prompt: "test" })
-        expect(code).toBe("return 42")
-      })
-
-      // TODO: handle when this happens
-      it.skip("handles no code response", async () => {
-        mockChatGPTResponse("I'm sorry, you're quite right, etc.")
-        const { code } = await config.api.ai.generateJs({ prompt: "test" })
-        expect(code).toBe("")
-      })
-
-      it("handles LLM errors", async () => {
-        mockChatGPTResponse(() => {
-          throw new Error("LLM error")
+          const { code } = await config.api.ai.generateJs({ prompt: "test" })
+          expect(code).toBe("return 42")
         })
-        await config.api.ai.generateJs({ prompt: "test" }, { status: 500 })
-      })
-    })
 
-    describe("POST /api/ai/cron", () => {
-      it("handles correct cron response", async () => {
-        mockChatGPTResponse("0 0 * * *")
-
-        const { message } = await config.api.ai.generateCron({
-          prompt: "test",
+        // TODO: handle when this happens
+        it.skip("handles no code response", async () => {
+          mockLLMResponse("I'm sorry, you're quite right, etc.")
+          const { code } = await config.api.ai.generateJs({ prompt: "test" })
+          expect(code).toBe("")
+        })
+
+        it("handles LLM errors", async () => {
+          mockLLMResponse(() => {
+            throw new Error("LLM error")
+          })
+          await config.api.ai.generateJs({ prompt: "test" }, { status: 500 })
         })
-        expect(message).toBe("0 0 * * *")
       })
 
-      it("handles expected LLM error", async () => {
-        mockChatGPTResponse("Error generating cron: skill issue")
+      describe("POST /api/ai/cron", () => {
+        it("handles correct cron response", async () => {
+          mockLLMResponse("0 0 * * *")
 
-        await config.api.ai.generateCron(
-          {
+          const { message } = await config.api.ai.generateCron({
             prompt: "test",
-          },
-          { status: 400 }
-        )
-      })
-
-      it("handles unexpected LLM error", async () => {
-        mockChatGPTResponse(() => {
-          throw new Error("LLM error")
+          })
+          expect(message).toBe("0 0 * * *")
         })
 
-        await config.api.ai.generateCron(
-          {
-            prompt: "test",
-          },
-          { status: 500 }
-        )
+        it("handles expected LLM error", async () => {
+          mockLLMResponse("Error generating cron: skill issue")
+
+          await config.api.ai.generateCron(
+            {
+              prompt: "test",
+            },
+            { status: 400 }
+          )
+        })
+
+        it("handles unexpected LLM error", async () => {
+          mockLLMResponse(() => {
+            throw new Error("LLM error")
+          })
+
+          await config.api.ai.generateCron(
+            {
+              prompt: "test",
+            },
+            { status: 500 }
+          )
+        })
       })
-    })
-  })
+    }
+  )
 })
 
 describe("BudibaseAI", () => {
diff --git a/packages/server/src/tests/utilities/mocks/ai/anthropic.ts b/packages/server/src/tests/utilities/mocks/ai/anthropic.ts
new file mode 100644
index 0000000000..ff0413aee1
--- /dev/null
+++ b/packages/server/src/tests/utilities/mocks/ai/anthropic.ts
@@ -0,0 +1,48 @@
+import AnthropicClient from "@anthropic-ai/sdk"
+import nock from "nock"
+import { MockLLMResponseFn, MockLLMResponseOpts } from "."
+
+let chatID = 1
+const SPACE_REGEX = /\s+/g
+
+export const mockAnthropicResponse: MockLLMResponseFn = (
+  answer: string | ((prompt: string) => string),
+  opts?: MockLLMResponseOpts
+) => {
+  return nock(opts?.host || "https://api.anthropic.com")
+    .post("/v1/messages")
+    .reply((uri: string, body: nock.Body) => {
+      const req = body as AnthropicClient.MessageCreateParamsNonStreaming
+      const prompt = req.messages[0].content
+      if (typeof prompt !== "string") {
+        throw new Error("Anthropic mock only supports string prompts")
+      }
+
+      let content
+      if (typeof answer === "function") {
+        try {
+          content = answer(prompt)
+        } catch (e) {
+          return [500, "Internal Server Error"]
+        }
+      } else {
+        content = answer
+      }
+
+      const resp: AnthropicClient.Messages.Message = {
+        id: `${chatID++}`,
+        type: "message",
+        role: "assistant",
+        model: req.model,
+        stop_reason: "end_turn",
+        usage: {
+          input_tokens: prompt.split(SPACE_REGEX).length,
+          output_tokens: content.split(SPACE_REGEX).length,
+        },
+        stop_sequence: null,
+        content: [{ type: "text", text: content }],
+      }
+      return [200, resp]
+    })
+    .persist()
+}
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 3c311c5a86..422486e30f 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -111,7 +111,13 @@ export interface SCIMInnerConfig {
 
 export interface SCIMConfig extends Config<SCIMInnerConfig> {}
 
-export type AIProvider = "OpenAI" | "AzureOpenAI" | "BudibaseAI"
+export type AIProvider =
+  | "OpenAI"
+  | "Anthropic"
+  | "AzureOpenAI"
+  | "TogetherAI"
+  | "Custom"
+  | "BudibaseAI"
 
 export interface ProviderConfig {
   provider: AIProvider

From a5a0fade23717b5ae71ae0e9fb823d55bda4bbcd Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 17 Apr 2025 11:14:09 +0100
Subject: [PATCH 17/18] Update pro reference.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 8bcb90edac..6c9ccbb8a5 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 8bcb90edac3d44c48eaecf526cedc82418035438
+Subproject commit 6c9ccbb8a5737733448f6b0e23696de1ed343015

From aa36a45fa241cb38ed6858f41bdf57b34612977f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 17 Apr 2025 12:14:38 +0200
Subject: [PATCH 18/18] Update pro submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index dc0cf7b47d..6c9ccbb8a5 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit dc0cf7b47d4331332d7ead5580be0b834d74d91e
+Subproject commit 6c9ccbb8a5737733448f6b0e23696de1ed343015