From c1bc231b410d875c2f51d580d8196cd238c34a1e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 4 Nov 2024 15:52:41 +0000
Subject: [PATCH 1/6] Fix issue counting number of filters when legacy
 structure is used

---
 .../controls/FilterEditor/FilterEditor.svelte   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
index 34c317e865..0af48ca38d 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -12,6 +12,7 @@
   import FilterBuilder from "./FilterBuilder.svelte"
   import { tables, selectedScreen } from "stores/builder"
   import { search } from "@budibase/frontend-core"
+  import { utils } from "@budibase/shared-core"
 
   const dispatch = createEventDispatcher()
 
@@ -22,7 +23,7 @@
 
   let drawer
 
-  $: localFilters = Helpers.cloneDeep(value)
+  $: localFilters = value
   $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
   $: dsSchema = getSchemaForDatasource($selectedScreen, datasource)?.schema
   $: schemaFields = search.getFields(
@@ -30,8 +31,7 @@
     Object.values(schema || dsSchema || {}),
     { allowLinks: true }
   )
-
-  $: text = getText(value?.groups)
+  $: text = getText(value)
 
   async function saveFilter() {
     dispatch("change", localFilters)
@@ -39,11 +39,14 @@
     drawer.hide()
   }
 
-  const getText = (filterGroups = []) => {
-    const allFilters = filterGroups.reduce((acc, group) => {
+  const getText = filters => {
+    if (Array.isArray(filters)) {
+      filters = utils.processSearchFilters(filters)
+    }
+    const groups = filters?.groups || []
+    const allFilters = groups.reduce((acc, group) => {
       return (acc += group.filters.filter(filter => filter.field).length)
     }, 0)
-
     if (allFilters === 0) {
       return "No filters set"
     } else {
@@ -62,7 +65,7 @@
   on:drawerShow
   on:drawerShow={() => {
     // Reset to the currently available value.
-    localFilters = Helpers.cloneDeep(value)
+    localFilters = value
   }}
 >
   <Button cta slot="buttons" on:click={saveFilter}>Save</Button>

From 507ca710b2c1b53ee26eeacf6a896d712107d7bd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 4 Nov 2024 16:02:54 +0000
Subject: [PATCH 2/6] Lint

---
 .../design/settings/controls/FilterEditor/FilterEditor.svelte    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
index 0af48ca38d..c48cc3b8ce 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -5,7 +5,6 @@
     Button,
     Drawer,
     DrawerContent,
-    Helpers,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"

From 7b867abd19bb17cacae455f4ed8411f9f1b222b7 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 4 Nov 2024 22:15:41 +0000
Subject: [PATCH 3/6] flag ai with feature flags correctly

---
 .../src/api/controllers/row/staticFormula.ts   | 17 +++++++++++++----
 .../server/src/automations/steps/openai.ts     | 18 +++++++++++-------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts
index 28853a8faf..31a6678012 100644
--- a/packages/server/src/api/controllers/row/staticFormula.ts
+++ b/packages/server/src/api/controllers/row/staticFormula.ts
@@ -4,8 +4,15 @@ import {
   processAIColumns,
   processFormulas,
 } from "../../../utilities/rowProcessor"
-import { context } from "@budibase/backend-core"
-import { Table, Row, FormulaType, FieldType, ViewV2 } from "@budibase/types"
+import { context, features } from "@budibase/backend-core"
+import {
+  Table,
+  Row,
+  FeatureFlag,
+  FormulaType,
+  FieldType,
+  ViewV2,
+} from "@budibase/types"
 import * as linkRows from "../../../db/linkedRows"
 import isEqual from "lodash/isEqual"
 import { cloneDeep } from "lodash/fp"
@@ -145,8 +152,10 @@ export async function finaliseRow(
     contextRows: [enrichedRow],
   })
   const aiEnabled =
-    (await pro.features.isBudibaseAIEnabled()) ||
-    (await pro.features.isAICustomConfigsEnabled())
+    ((await features.flags.isEnabled(FeatureFlag.BUDIBASE_AI)) &&
+      (await pro.features.isBudibaseAIEnabled())) ||
+    ((await features.flags.isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) &&
+      (await pro.features.isAICustomConfigsEnabled()))
   if (aiEnabled) {
     row = await processAIColumns(table, row, {
       contextRows: [enrichedRow],
diff --git a/packages/server/src/automations/steps/openai.ts b/packages/server/src/automations/steps/openai.ts
index b1dfa3df5b..b3db0da9c5 100644
--- a/packages/server/src/automations/steps/openai.ts
+++ b/packages/server/src/automations/steps/openai.ts
@@ -7,17 +7,17 @@ import {
   AutomationIOType,
   OpenAIStepInputs,
   OpenAIStepOutputs,
+  FeatureFlag,
 } from "@budibase/types"
-import { env } from "@budibase/backend-core"
+import { env, features } from "@budibase/backend-core"
 import * as automationUtils from "../automationUtils"
 import * as pro from "@budibase/pro"
 
 enum Model {
-  GPT_35_TURBO = "gpt-3.5-turbo",
-  // will only work with api keys that have access to the GPT4 API
-  GPT_4 = "gpt-4",
-  GPT_4O = "gpt-4o",
   GPT_4O_MINI = "gpt-4o-mini",
+  GPT_4O = "gpt-4o",
+  GPT_4 = "gpt-4",
+  GPT_35_TURBO = "gpt-3.5-turbo",
 }
 
 export const definition: AutomationStepDefinition = {
@@ -99,8 +99,12 @@ export async function run({
 
   try {
     let response
-    const customConfigsEnabled = await pro.features.isAICustomConfigsEnabled()
-    const budibaseAIEnabled = await pro.features.isBudibaseAIEnabled()
+    const customConfigsEnabled =
+      (await features.flags.isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) &&
+      (await pro.features.isAICustomConfigsEnabled())
+    const budibaseAIEnabled =
+      (await features.flags.isEnabled(FeatureFlag.BUDIBASE_AI)) &&
+      (await pro.features.isBudibaseAIEnabled())
 
     if (budibaseAIEnabled || customConfigsEnabled) {
       const llm = await pro.ai.LargeLanguageModel.forCurrentTenant(inputs.model)

From 7c918302a90e92f71ba2711c4343dcab389cdfa8 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 4 Nov 2024 22:27:43 +0000
Subject: [PATCH 4/6] update all areas where ai flags come from license to come
 from feature flag

---
 .../src/components/automation/SetupPanel/CronBuilder.svelte | 6 ++++--
 .../src/pages/builder/portal/settings/ai/index.svelte       | 5 +++--
 .../builder/src/pages/builder/portal/settings/index.svelte  | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index 51538944f4..fd235a70f2 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -9,7 +9,7 @@
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
   import { flags } from "stores/builder"
-  import { featureFlags } from "stores/portal"
+  import { featureFlags, licensing } from "stores/portal"
   import { API } from "api"
   import MagicWand from "../../../../assets/MagicWand.svelte"
 
@@ -26,7 +26,9 @@
   let aiCronPrompt = ""
   let loadingAICronExpression = false
 
-  $: aiEnabled = $featureFlags.AI_CUSTOM_CONFIGS || $featureFlags.BUDIBASE_AI
+  $: aiEnabled =
+    ($featureFlags.AI_CUSTOM_CONFIGS && $licensing.customAIConfigsEnabled) ||
+    ($featureFlags.BUDIBASE_AI && $licensing.budibaseAIEnabled)
   $: {
     if (cronExpression) {
       try {
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 bbdf46a24e..ec0ff31e58 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
@@ -12,7 +12,7 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { admin, licensing } from "stores/portal"
+  import { admin, licensing, featureFlags } from "stores/portal"
   import { API } from "api"
   import AIConfigModal from "./ConfigModal.svelte"
   import AIConfigTile from "./AIConfigTile.svelte"
@@ -27,7 +27,8 @@
   let editingUuid
 
   $: isCloud = $admin.cloud
-  $: customAIConfigsEnabled = $licensing.customAIConfigsEnabled
+  $: customAIConfigsEnabled =
+    $featureFlags.AI_CUSTOM_CONFIGS && $licensing.customAIConfigsEnabled
 
   async function fetchAIConfig() {
     try {
diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte
index 1448b43ec4..9ab8436f94 100644
--- a/packages/builder/src/pages/builder/portal/settings/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/index.svelte
@@ -1,8 +1,8 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { licensing } from "stores/portal"
+  import { licensing, featureFlags } from "stores/portal"
 
-  if ($licensing.customAIConfigsEnabled) {
+  if ($featureFlags.AI_CUSTOM_CONFIGS && $licensing.customAIConfigsEnabled) {
     $redirect("./ai")
   } else {
     $redirect("./auth")

From 53b28218cfed494d8d8aa1df62ec2ad098f6c797 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 4 Nov 2024 22:55:04 +0000
Subject: [PATCH 5/6] feature flag support in AI test

---
 .../portal/settings/ai/AISettings.spec.js     | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
index 300d5d5369..e797a1c5bd 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
+++ b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
@@ -1,7 +1,7 @@
 import { it, expect, describe, vi } from "vitest"
 import AISettings from "./index.svelte"
 import { render, fireEvent } from "@testing-library/svelte"
-import { admin, licensing } from "stores/portal"
+import { admin, licensing, featureFlags } from "stores/portal"
 import { notifications } from "@budibase/bbui"
 
 vi.spyOn(notifications, "error").mockImplementation(vi.fn)
@@ -12,12 +12,17 @@ const Hosting = {
   Self: "self",
 }
 
-function setupEnv(hosting, features = {}) {
+function setupEnv(hosting, features = {}, flags = {}) {
   const defaultFeatures = {
     budibaseAIEnabled: false,
     customAIConfigsEnabled: false,
     ...features,
   }
+  const defaultFlags = {
+    BUDIBASE_AI: false,
+    AI_CUSTOM_CONFIGS: false,
+    ...flags,
+  }
   admin.subscribe = vi.fn().mockImplementation(callback => {
     callback({ cloud: hosting === Hosting.Cloud })
     return () => {}
@@ -26,6 +31,10 @@ function setupEnv(hosting, features = {}) {
     callback(defaultFeatures)
     return () => {}
   })
+  featureFlags.subscribe = vi.fn().mockImplementation(callback => {
+    callback(defaultFlags)
+    return () => {}
+  })
 }
 
 describe("AISettings", () => {
@@ -72,7 +81,11 @@ describe("AISettings", () => {
       let addConfigurationButton
       let configModal
 
-      setupEnv(Hosting.Cloud, { customAIConfigsEnabled: true })
+      setupEnv(
+        Hosting.Cloud,
+        { customAIConfigsEnabled: true },
+        { AI_CUSTOM_CONFIGS: true }
+      )
       instance = render(AISettings)
       addConfigurationButton = instance.queryByText("Add configuration")
       expect(addConfigurationButton).toBeInTheDocument()
@@ -85,7 +98,11 @@ describe("AISettings", () => {
       let addConfigurationButton
       let configModal
 
-      setupEnv(Hosting.Self, { customAIConfigsEnabled: true })
+      setupEnv(
+        Hosting.Self,
+        { customAIConfigsEnabled: true },
+        { AI_CUSTOM_CONFIGS: true }
+      )
       instance = render(AISettings)
       addConfigurationButton = instance.queryByText("Add configuration")
       expect(addConfigurationButton).toBeInTheDocument()

From 41e3a40782bc0d4ea6f1dba8cf80f2a47db1cc7e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 5 Nov 2024 00:13:23 +0000
Subject: [PATCH 6/6] Bump version to 3.0.3

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 77ca852955..8e53ea97a9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*",