Merge pull request #16789 from Budibase/chore/cleanup-flags

Cleanup AI flags

Author: adrinr

packages/builder/src/components/common/CodeEditor/CodeEditor.svelte

@@ -50,7 +50,7 @@
   import type { Extension } from "@codemirror/state"
   import { javascript } from "@codemirror/lang-javascript"
   import { EditorModes } from "./"
-  import { featureFlags, themeStore } from "@/stores/portal"
+  import { themeStore } from "@/stores/portal"
   import { type EnrichedBinding, type EditorMode } from "@budibase/types"
   import { tooltips } from "@codemirror/view"
   import type { BindingCompletion, CodeValidator } from "@/types"
@@ -87,8 +87,7 @@
   let isDark = !currentTheme.includes("light")
   let themeConfig = new Compartment()
 
-  $: aiGenEnabled =
-    $featureFlags.AI_JS_GENERATION && mode.name === "javascript" && !readonly
+  $: aiGenEnabled = mode.name === "javascript" && !readonly
 
   $: {
     if (autofocus && isEditorInitialised) {

packages/builder/src/pages/builder/app/[application]/data/new.svelte

@@ -16,7 +16,6 @@
   import CreationPage from "@/components/common/CreationPage.svelte"
   import ICONS from "@/components/backend/DatasourceNavigator/icons/index.js"
   import AiTableGeneration from "./_components/AITableGeneration.svelte"
-  import { featureFlags } from "@/stores/portal"
 
   let internalTableModal: CreateInternalTableModal
   let externalDatasourceModal: CreateExternalDatasourceModal
@@ -25,7 +24,6 @@
   let externalDatasourceLoading = false
 
   $: disabled = sampleDataLoading || externalDatasourceLoading
-  $: aiTableGenerationEnabled = $featureFlags.AI_TABLE_GENERATION
 
   const createSampleData = async () => {
     sampleDataLoading = true
@@ -62,11 +60,9 @@
   </div>
 
   <div class="options bb-options">
-    {#if aiTableGenerationEnabled}
-      <div class="ai-generation">
-        <AiTableGeneration />
-      </div>
-    {/if}
+    <div class="ai-generation">
+      <AiTableGeneration />
+    </div>
     <DatasourceOption
       on:click={() => internalTableModal.show()}
       title="Create new table"

packages/server/src/api/controllers/ai/budibaseai.ts

@@ -2,12 +2,11 @@ import {
   ChatCompletionRequest,
   ChatCompletionResponse,
   Ctx,
-  FeatureFlag,
   UploadFileRequest,
   UploadFileResponse,
 } from "@budibase/types"
 import { ai } from "@budibase/pro"
-import { features, env } from "@budibase/backend-core"
+import { env } from "@budibase/backend-core"
 import * as tools from "../../../ai/tools"
 
 export async function uploadFile(
@@ -33,13 +32,6 @@ export async function uploadFile(
 export async function chatCompletion(
   ctx: Ctx<ChatCompletionRequest, ChatCompletionResponse>
 ) {
-  if (
-    !(await features.isEnabled(FeatureFlag.AI_JS_GENERATION)) &&
-    !(await features.isEnabled(FeatureFlag.AI_TABLE_GENERATION))
-  ) {
-    ctx.throw(500, "AI generation is disabled")
-  }
-
   if (env.SELF_HOSTED) {
     ctx.throw(500, "Budibase AI endpoints are not available in self-host")
   }

packages/server/src/api/controllers/ai/js.ts

@@ -1,21 +1,12 @@
-import {
-  FeatureFlag,
-  GenerateJsRequest,
-  GenerateJsResponse,
-  UserCtx,
-} from "@budibase/types"
-import { context, features } from "@budibase/backend-core"
+import { GenerateJsRequest, GenerateJsResponse, UserCtx } from "@budibase/types"
+import { context } from "@budibase/backend-core"
 import { ai } from "@budibase/pro"
 
 const MARKDOWN_CODE_BLOCK = /```(?:\w+)?\n([\s\S]+?)\n```/
 
 export async function generateJs(
   ctx: UserCtx<GenerateJsRequest, GenerateJsResponse>
 ) {
-  if (!(await features.isEnabled(FeatureFlag.AI_JS_GENERATION))) {
-    ctx.throw(500, "AI JS generation is disabled")
-  }
-
   const llm = await ai.getLLMOrThrow()
 
   await context.ensureSnippetContext()

packages/server/src/api/routes/tests/ai.spec.ts

@@ -6,7 +6,7 @@ import {
 } from "../../../tests/utilities/mocks/ai/openai"
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import nock from "nock"
-import { configs, env, features, setEnv } from "@budibase/backend-core"
+import { configs, env, setEnv } from "@budibase/backend-core"
 import {
   AIInnerConfig,
   AIOperationEnum,
@@ -174,17 +174,6 @@ describe("AI", () => {
       })
 
       describe("POST /api/ai/js", () => {
-        let cleanup: () => void
-        beforeAll(() => {
-          cleanup = features.testutils.setFeatureFlags("*", {
-            AI_JS_GENERATION: true,
-          })
-        })
-
-        afterAll(() => {
-          cleanup()
-        })
-
         it("handles correct plain code response", async () => {
           mockLLMResponse(`return 42`)
 
@@ -310,19 +299,14 @@ describe("BudibaseAI", () => {
     let internalApiKey = "api-key"
 
     let envCleanup: () => void
-    let featureCleanup: () => void
     beforeAll(() => {
       envCleanup = setEnv({
         SELF_HOSTED: false,
         ACCOUNT_PORTAL_API_KEY: internalApiKey,
       })
-      featureCleanup = features.testutils.setFeatureFlags("*", {
-        AI_JS_GENERATION: true,
-      })
     })
 
     afterAll(() => {
-      featureCleanup()
       envCleanup()
     })
 
@@ -500,17 +484,6 @@ describe("BudibaseAI", () => {
   })
 
   describe("POST /api/ai/tables", () => {
-    let featureCleanup: () => void
-    beforeAll(() => {
-      featureCleanup = features.testutils.setFeatureFlags("*", {
-        AI_TABLE_GENERATION: true,
-      })
-    })
-
-    afterAll(() => {
-      featureCleanup()
-    })
-
     beforeEach(async () => {
       await config.newTenant()
       nock.cleanAll()

packages/types/src/sdk/featureFlag.ts

@@ -1,8 +1,6 @@
 export enum FeatureFlag {
   DEBUG_UI = "DEBUG_UI",
   USE_ZOD_VALIDATOR = "USE_ZOD_VALIDATOR",
-  AI_JS_GENERATION = "AI_JS_GENERATION",
-  AI_TABLE_GENERATION = "AI_TABLE_GENERATION",
   AI_AGENTS = "AI_AGENTS",
   WORKSPACES = "WORKSPACES",
 
@@ -12,8 +10,6 @@ export enum FeatureFlag {
 
 export const FeatureFlagDefaults: Record<FeatureFlag, boolean> = {
   [FeatureFlag.USE_ZOD_VALIDATOR]: false,
-  [FeatureFlag.AI_JS_GENERATION]: true,
-  [FeatureFlag.AI_TABLE_GENERATION]: true,
   [FeatureFlag.AI_AGENTS]: false,
   [FeatureFlag.WORKSPACES]: false,