@budibase/worker 3.31.9 → 3.32.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.31.9",
+  "version": "3.32.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -91,5 +91,5 @@
     "supertest": "6.3.3",
     "timekeeper": "2.2.0"
   },
-  "gitHead": "fd3896fb9777306c4a0f32479094782ab428081b"
+  "gitHead": "6ba2ff716f459a1e39604fb846f71db1bdb56545"
 }

package/scripts/test.sh

@@ -4,10 +4,10 @@ set -e
 if [[ -n $CI ]]
 then
   # Running in ci, where resources are limited
-  echo "jest --coverage --maxWorkers=2 --forceExit --bail $@"
-  jest --coverage --maxWorkers=2 --forceExit --bail $@
+  echo "jest --maxWorkers=2 --forceExit --bail $@"
+  jest --maxWorkers=2 --forceExit --bail $@
 else
   # --maxWorkers performs better in development
   echo "jest --coverage --detectOpenHandles $@"
   jest --coverage --detectOpenHandles $@
-fi
+fi

package/src/api/controllers/global/configs.ts

@@ -15,7 +15,6 @@ import {
   filterValidTranslationOverrides,
 } from "@budibase/shared-core"
 import {
-  AIInnerConfig,
   Config,
   ConfigChecklistResponse,
   ConfigType,
@@ -27,7 +26,6 @@ import {
   GetPublicTranslationsResponse,
   GoogleInnerConfig,
   TranslationOverrides,
-  isAIConfig,
   isGoogleConfig,
   isOIDCConfig,
   isRecaptchaConfig,
@@ -62,8 +60,6 @@ const getEventFns = async (config: Config, existing?: Config) => {
   if (!existing) {
     if (isSMTPConfig(config)) {
       fns.push(events.email.SMTPCreated)
-    } else if (isAIConfig(config)) {
-      fns.push(() => events.ai.AIConfigCreated)
     } else if (isGoogleConfig(config)) {
       fns.push(() => events.auth.SSOCreated(ConfigType.GOOGLE))
       if (config.config.activated) {
@@ -100,8 +96,6 @@ const getEventFns = async (config: Config, existing?: Config) => {
   } else {
     if (isSMTPConfig(config)) {
       fns.push(events.email.SMTPUpdated)
-    } else if (isAIConfig(config)) {
-      fns.push(() => events.ai.AIConfigUpdated)
     } else if (isGoogleConfig(config)) {
       fns.push(() => events.auth.SSOUpdated(ConfigType.GOOGLE))
       if (!existing.config.activated && config.config.activated) {
@@ -266,33 +260,6 @@ async function processOIDCConfig(config: OIDCConfigs, existing?: OIDCConfigs) {
   }
 }
 
-export async function processAIConfig(
-  newConfig: AIInnerConfig,
-  existingConfig: AIInnerConfig
-) {
-  for (const key in existingConfig) {
-    if (newConfig[key]?.apiKey === PASSWORD_REPLACEMENT) {
-      newConfig[key].apiKey = existingConfig[key].apiKey
-    }
-  }
-
-  let numBudibaseAI = 0
-  for (const config of Object.values(newConfig)) {
-    if (config.provider === "BudibaseAI") {
-      numBudibaseAI++
-      if (numBudibaseAI > 1) {
-        throw new BadRequestError("Only one Budibase AI provider is allowed")
-      }
-    } else {
-      if (!config.apiKey) {
-        throw new BadRequestError(
-          `API key is required for provider ${config.provider}`
-        )
-      }
-    }
-  }
-}
-
 export async function processRecaptchaConfig(
   config: RecaptchaInnerConfig,
   existingConfig?: RecaptchaInnerConfig
@@ -407,11 +374,6 @@ export async function save(
       case ConfigType.OIDC:
         await processOIDCConfig(config, existingConfig?.config)
         break
-      case ConfigType.AI:
-        if (existingConfig) {
-          await processAIConfig(config, existingConfig.config)
-        }
-        break
       case ConfigType.RECAPTCHA:
         await processRecaptchaConfig(config, existingConfig?.config)
         break
@@ -521,7 +483,7 @@ export async function find(ctx: UserCtx<void, FindConfigResponse>) {
 }
 
 function stripSecrets(config: Config, ctx?: UserCtx) {
-  if (isAIConfig(config)) {
+  if (config.type === ConfigType.AI) {
     for (const key in config.config) {
       if (config.config[key].apiKey) {
         config.config[key].apiKey = PASSWORD_REPLACEMENT

package/src/api/controllers/global/self.ts

@@ -7,7 +7,7 @@ import {
   tenancy,
   utils,
 } from "@budibase/backend-core"
-import { ai, groups } from "@budibase/pro"
+import { groups } from "@budibase/pro"
 import {
   DevInfo,
   FetchAPIKeyResponse,
@@ -116,13 +116,6 @@ export async function getSelf(ctx: UserCtx<void, GetGlobalSelfResponse>) {
 
   // add the feature flags for this tenant
   const flags = await features.flags.fetch()
-  const llmConfig = await ai.getLLMConfig()
-  const sanitisedLLMConfig = llmConfig
-    ? {
-        provider: llmConfig.provider,
-        model: llmConfig.model,
-      }
-    : undefined
 
   const settingsConfig = await configs.getSettingsConfig()
 
@@ -130,7 +123,6 @@ export async function getSelf(ctx: UserCtx<void, GetGlobalSelfResponse>) {
     ...enrichedUser,
     ...sessionAttributes,
     flags,
-    llm: sanitisedLLMConfig,
     lockedBy: settingsConfig?.lockedBy,
   }
 }

package/src/api/routes/global/configs.ts

@@ -64,22 +64,6 @@ function scimValidation() {
   }).unknown(true)
 }
 
-function aiValidation() {
-  // prettier-ignore
-  return Joi.object().pattern(
-    Joi.string(),
-    Joi.object({
-      provider: Joi.string().required(),
-      isDefault: Joi.boolean().required(),
-      name: Joi.string().required(),
-      active: Joi.boolean().required(),
-      baseUrl: Joi.string().optional().allow("", null),
-      apiKey: Joi.string().optional(),
-      defaultModel: Joi.string().optional(),
-    }).required()
-  )
-}
-
 function recaptchaValidation() {
   return Joi.object({
     siteKey: Joi.string().required(),
@@ -124,7 +108,6 @@ function buildConfigSaveValidation() {
           { is: ConfigType.GOOGLE, then: googleValidation() },
           { is: ConfigType.OIDC, then: oidcValidation() },
           { is: ConfigType.SCIM, then: scimValidation() },
-          { is: ConfigType.AI, then: aiValidation() },
           { is: ConfigType.RECAPTCHA, then: recaptchaValidation() },
           { is: ConfigType.TRANSLATIONS, then: translationsValidation() },
         ],

package/src/tests/api/configs.ts

@@ -32,10 +32,6 @@ export class ConfigAPI extends TestAPI {
       .expect("Content-Type", /json/)
   }
 
-  getAIConfig = async () => {
-    return await this.getConfig(ConfigType.AI)
-  }
-
   getConfig = async <T extends ConfigType>(type: T) => {
     const resp = await this.request
       .get(`/api/global/configs/${type}`)

package/src/api/controllers/global/tests/configs.spec.ts

@@ -1,97 +0,0 @@
-import { TestConfiguration } from "../../../../tests"
-import { AIConfig, ConfigType } from "@budibase/types"
-import { configs, context } from "@budibase/backend-core"
-
-const BASE_CONFIG: AIConfig = {
-  type: ConfigType.AI,
-  config: {
-    ai: {
-      provider: "OpenAI",
-      isDefault: false,
-      name: "Test",
-      active: true,
-      defaultModel: "gpt4",
-      apiKey: "myapikey",
-      baseUrl: "https://api.example.com",
-    },
-  },
-}
-
-describe("Global configs controller", () => {
-  const config = new TestConfiguration()
-
-  beforeAll(async () => {
-    await config.beforeAll()
-  })
-
-  afterAll(async () => {
-    await config.afterAll()
-  })
-
-  it("should strip secrets when pulling AI config", async () => {
-    await config.api.configs.saveConfig(BASE_CONFIG)
-    const response = await config.api.configs.getAIConfig()
-    expect(response.config.ai.apiKey).toEqual("--secret-value--")
-  })
-
-  it("should not update existing secrets when updating an existing AI Config", async () => {
-    await config.api.configs.saveConfig(BASE_CONFIG)
-
-    const savedConfig = await config.api.configs.getAIConfig()
-    delete savedConfig._id
-    delete savedConfig._rev
-    delete savedConfig.createdAt
-    delete savedConfig.updatedAt
-
-    await config.api.configs.saveConfig(savedConfig)
-
-    await context.doInTenant(config.tenantId, async () => {
-      const aiConfig = await configs.getAIConfig()
-      expect(aiConfig!.config.ai.apiKey).toEqual(BASE_CONFIG.config.ai.apiKey)
-    })
-  })
-
-  it("should allow BudibaseAI to save without an apiKey", async () => {
-    await config.api.configs.saveConfig({
-      type: ConfigType.AI,
-      config: {
-        ai: {
-          name: "Budibase AI",
-          active: true,
-          provider: "BudibaseAI",
-          isDefault: true,
-        },
-      },
-    })
-
-    const aiConfig = await config.api.configs.getAIConfig()
-    expect(aiConfig.config.ai).toEqual({
-      name: "Budibase AI",
-      provider: "BudibaseAI",
-      active: true,
-      isDefault: true,
-    })
-  })
-
-  it("should not allow OpenAI to save without an apiKey", async () => {
-    await config.api.configs.saveConfig(
-      {
-        type: ConfigType.AI,
-        config: {
-          ai: {
-            name: "OpenAI",
-            active: true,
-            provider: "OpenAI",
-            isDefault: true,
-          },
-        },
-      },
-      {
-        status: 400,
-        body: {
-          message: /API key is required for provider OpenAI/,
-        },
-      }
-    )
-  })
-})