From 1a57e37d38502e12b88ac625d475e656388f74de Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 2 Sep 2024 15:22:33 +0100 Subject: [PATCH 01/36] initial framework for platform AI --- .../portal/settings/ai/ConfigModal.svelte | 81 +++++++++++++++++++ .../builder/portal/settings/ai/index.svelte | 74 +++++++++++++++++ packages/builder/src/stores/portal/menu.js | 4 + 3 files changed, 159 insertions(+) create mode 100644 packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte create mode 100644 packages/builder/src/pages/builder/portal/settings/ai/index.svelte diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte new file mode 100644 index 0000000000..408e71bd1f --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -0,0 +1,81 @@ + + + {}} + disabled={!validation} + size="M" + title="Custom AI Configuration" +> +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + + + + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte new file mode 100644 index 0000000000..e40a6cf4ff --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte @@ -0,0 +1,74 @@ + + + + + + + + + + + AI + Configure your AI settings within this section: + + + +
+ AI Configurations + +
+ Use the following interface to select your preferred AI configuration. + Select your AI Model: + + + + diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js index c7c71d89bc..ec40f6d4ee 100644 --- a/packages/builder/src/stores/portal/menu.js +++ b/packages/builder/src/stores/portal/menu.js @@ -45,6 +45,10 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { title: "Auth", href: "/builder/portal/settings/auth", }, + { + title: "AI", + href: "/builder/portal/settings/ai", + }, { title: "Email", href: "/builder/portal/settings/email", From 99035ad8aea269ef93c6e26cd892c167503797a9 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 2 Sep 2024 20:16:37 +0100 Subject: [PATCH 02/36] rough pass on AI platform CRUD --- packages/backend-core/src/configs/configs.ts | 41 +++++++ .../portal/settings/ai/ConfigModal.svelte | 106 +++++++++++++----- .../builder/portal/settings/ai/ai.spec.ts | 0 .../builder/portal/settings/ai/constants.ts | 8 ++ .../builder/portal/settings/ai/index.svelte | 69 +++++++----- .../builder/src/stores/portal/licensing.js | 12 ++ .../functions/backfill/global/configs.ts | 7 +- packages/types/src/documents/global/config.ts | 18 +++ packages/types/src/sdk/licensing/feature.ts | 2 + .../src/api/controllers/global/configs.ts | 14 +++ 10 files changed, 220 insertions(+), 57 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/settings/ai/ai.spec.ts create mode 100644 packages/builder/src/pages/builder/portal/settings/ai/constants.ts diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 0d189e3f7d..6062d3624f 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -1,4 +1,5 @@ import { + AIConfig, AIInnerConfig, Config, ConfigType, GoogleConfig, @@ -17,6 +18,7 @@ import { DocumentType, SEPARATOR } from "../constants" import { CacheKey, TTL, withCache } from "../cache" import * as context from "../context" import env from "../environment" +import { getConfigParams } from "@budibase/server/src/migrations/functions/backfill/global/configs" // UTILS @@ -254,3 +256,42 @@ export async function getSCIMConfig(): Promise { const config = await getConfig(ConfigType.SCIM) return config?.config } + + +// AI + +// TODO: Can we assume that you are licensed when you hit this endpoint? +export async function getAIConfig(): Promise { + if (!env.SELF_HOSTED) { + // always use the env vars in cloud + // TODO: Licensing stuff - make this right + if (env.OPENAI_API_KEY) { + return getDefaultBudibaseAIConfig() + } + } + + // prefer the config in self-host + let config = await getConfig(ConfigType.AI) + + // fallback to env vars + if (!config || !config.activated) { + config = getDefaultBudibaseAIConfig() + } + + return config +} + +export function getDefaultBudibaseAIConfig(): AIInnerConfig | undefined { + if (env.OPENAI_API_KEY) { + return { + provider: "", + isDefault: true, + name: "Budibase AI", + active: true, + baseUrl: "", + apiKey: env.OPENAI_API_KEY, + // TODO: should be enum + defaultModel: "" + } + } +} diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 408e71bd1f..30830cff1a 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -5,15 +5,14 @@ Input, Select, Toggle, - Dropzone, Body, notifications, } from "@budibase/bbui" - import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" - import { plugins } from "stores/portal" - import { PluginSource } from "constants" + import { ConfigMap } from "./constants" + import { API } from "api" - const options = [ + // TODO: Update these + const providers = [ "OpenAI", "Anthropic", "Together AI", @@ -21,21 +20,69 @@ "Custom" ] - let source = PluginSource.GITHUB - let dynamicValues = {} + const models = [ + "gpt4o-mini", + ] - let name - let baseUrl - let apiKey - let active - let isDefault + let formValues = {} let validation + + $: { + const { provider, model, name, apiKey } = formValues + validation = provider && model && name && apiKey + } + + function prefillConfig(evt) { + const provider = evt.detail + // grab the preset config from the constants for that provider and fill it in + if (ConfigMap[provider]) { + formValues = { + ...formValues, + ...ConfigMap[provider] + } + } else { + formValues = { + provider + } + } + } + + async function saveConfig() { + try { + const savedConfig = await API.saveConfig(formValues) + formValues._rev = savedConfig._rev + formValues._id = savedConfig._id + notifications.success(`Configuration saved`) + } catch (error) { + notifications.error( + `Failed to save AI Configuration, reason: ${error?.message || "Unknown"}` + ) + } + } + + async function deleteConfig() { + // Delete a configuration + try { + // await API.deleteConfig({ + // id: smtpConfig._id, + // rev: smtpConfig._rev, + // }) + notifications.success(`Deleted config`) + } catch (error) { + notifications.error( + `Failed to clear email settings, reason: ${error?.message || "Unknown"}` + ) + } + } + {}} + cancelText={"Delete"} + onConfirm={saveConfig} + onCancel={deleteConfig} disabled={!validation} size="M" title="Custom AI Configuration" @@ -43,39 +90,40 @@
- +
- +
- +
- - + + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ai.spec.ts b/packages/builder/src/pages/builder/portal/settings/ai/ai.spec.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts new file mode 100644 index 0000000000..df5508109d --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts @@ -0,0 +1,8 @@ +export const ConfigMap = { + OpenAI: { + baseUrl: "https://api.openai.com" + }, + Anthropic: { + baseUrl: "https://api.together.xyz/v1" + }, +} \ No newline at end of file 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 e40a6cf4ff..427b09a7f2 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte @@ -8,57 +8,76 @@ Divider, notifications, Modal, - ModalContent, + Tags, + Tag } from "@budibase/bbui" - import { auth, admin } from "stores/portal" - import { redirect } from "@roxi/routify" + import { admin, licensing } from "stores/portal" import { API } from "api" import AIConfigModal from "./ConfigModal.svelte" import { onMount } from "svelte" import { sdk } from "@budibase/shared-core" - let diagnosticInfo = "" - let modal + const ConfigTypes = { + AI: "ai", + } - // async function fetchSystemDebugInfo() { - // const diagnostics = await API.fetchSystemDebugInfo() - // diagnosticInfo = { - // browser: { - // language: navigator.language || navigator.userLanguage, - // userAgent: navigator.userAgent, - // platform: navigator.platform, - // vendor: navigator.vendor, - // }, - // server: diagnostics, - // } - // } - // - // const copyToClipboard = async () => { - // await Helpers.copyToClipboard(JSON.stringify(diagnosticInfo, undefined, 2)) - // notifications.success("Copied") - // } + let modal + let aiConfig + let loading = false + + $: isCloud = $admin.cloud + $: budibaseAIEnabled = $licensing.budibaseAIEnabled + $: customAIConfigsEnabled = $licensing.customAIConfigsEnabled + + async function fetchAIConfig() { + loading = true + try { + // Fetch the configs for smtp + const aiDoc = await API.getConfig(ConfigTypes.AI) + if (aiDoc._id) { + aiConfig = aiDoc + } + loading = false + } catch (error) { + notifications.error("Error fetching AI config") + } + } onMount(async () => { - // await fetchSystemDebugInfo() + await fetchAIConfig() }) - AI + {#if isCloud && !budibaseAIEnabled} + + Premium + + {/if} Configure your AI settings within this section:
AI Configurations - + {#if !isCloud && !customAIConfigsEnabled} + + Premium + + {:else if isCloud && !customAIConfigsEnabled} + + Enterprise + + {:else} + + {/if}
Use the following interface to select your preferred AI configuration. Select your AI Model: diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index 0e44650479..d48377207c 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -22,6 +22,8 @@ export const createLicensingStore = () => { backupsEnabled: false, brandingEnabled: false, scimEnabled: false, + budibaseAIEnabled: false, + customAIConfigsEnabled: false, // the currently used quotas from the db quotaUsage: undefined, // derived quota metrics for percentages used @@ -142,6 +144,14 @@ export const createLicensingStore = () => { Constants.Features.VIEW_READONLY_COLUMNS ) + const budibaseAIEnabled = license.features.includes( + Constants.Features.BUDIBASE_AI + ) + + const customAIConfigsEnabled = license.features.includes( + Constants.Features.AI_CUSTOM_CONFIGS + ) + store.update(state => { return { ...state, @@ -153,6 +163,8 @@ export const createLicensingStore = () => { groupsEnabled, backupsEnabled, brandingEnabled, + budibaseAIEnabled, + customAIConfigsEnabled, scimEnabled, environmentVariablesEnabled, auditLogsEnabled, diff --git a/packages/server/src/migrations/functions/backfill/global/configs.ts b/packages/server/src/migrations/functions/backfill/global/configs.ts index 04eb9caff2..bb0781eba3 100644 --- a/packages/server/src/migrations/functions/backfill/global/configs.ts +++ b/packages/server/src/migrations/functions/backfill/global/configs.ts @@ -15,11 +15,12 @@ import { } from "@budibase/types" import env from "./../../../../environment" -export function getConfigParams(): DatabaseQueryOpts { +export function getConfigParams(type?: ConfigType): DatabaseQueryOpts { + const configType = type || "" return { include_docs: true, - startkey: `${DocumentType.CONFIG}${SEPARATOR}`, - endkey: `${DocumentType.CONFIG}${SEPARATOR}${UNICODE_MAX}`, + startkey: `${DocumentType.CONFIG}${SEPARATOR}${configType}`, + endkey: `${DocumentType.CONFIG}${SEPARATOR}${configType}${UNICODE_MAX}`, } } diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index 3fd352aada..246874d0f1 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -111,6 +111,20 @@ export interface SCIMInnerConfig { export interface SCIMConfig extends Config {} +export interface AIInnerConfig { + // TODO: should be enum + provider: string + isDefault: boolean + name: string + active: boolean + baseUrl: string + apiKey: string + // TODO: should be enum + defaultModel: string +} + +export interface AIConfig extends Config {} + export const isSettingsConfig = (config: Config): config is SettingsConfig => config.type === ConfigType.SETTINGS @@ -126,6 +140,9 @@ export const isOIDCConfig = (config: Config): config is OIDCConfig => export const isSCIMConfig = (config: Config): config is SCIMConfig => config.type === ConfigType.SCIM +export const isAIConfig = (config: Config): config is AIConfig => + config.type === ConfigType.AI + export enum ConfigType { SETTINGS = "settings", ACCOUNT = "account", @@ -134,4 +151,5 @@ export enum ConfigType { OIDC = "oidc", OIDC_LOGOS = "logos_oidc", SCIM = "scim", + AI = "ai" } diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts index 0d8db8258e..bf2bcb72b6 100644 --- a/packages/types/src/sdk/licensing/feature.ts +++ b/packages/types/src/sdk/licensing/feature.ts @@ -15,6 +15,8 @@ export enum Feature { EXPANDED_PUBLIC_API = "expandedPublicApi", VIEW_PERMISSIONS = "viewPermissions", VIEW_READONLY_COLUMNS = "viewReadonlyColumns", + BUDIBASE_AI = "budibaseAI", + AI_CUSTOM_CONFIGS = "customAIConfigs" } export type PlanFeatures = { [key in PlanType]: Feature[] | undefined } diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index a44b173869..43aac19b18 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -197,6 +197,12 @@ async function verifyOIDCConfig(config: OIDCConfigs) { await verifySSOConfig(ConfigType.OIDC, config.configs[0]) } +async function verifyAIConfig(config: OIDCConfigs) { + // await verifySSOConfig(ConfigType.OIDC, config.configs[0]) + // Shape should be `config_ai` + return true +} + export async function save(ctx: UserCtx) { const body = ctx.request.body const type = body.type @@ -224,6 +230,9 @@ export async function save(ctx: UserCtx) { case ConfigType.OIDC: await verifyOIDCConfig(config) break + case ConfigType.AI: + await verifyAIConfig(config) + break } } catch (err: any) { ctx.throw(400, err) @@ -314,6 +323,11 @@ export async function find(ctx: UserCtx) { if (type === ConfigType.OIDC_LOGOS) { enrichOIDCLogos(scopedConfig) } + + if (type === ConfigType.AI) { + // TODO: strip the keys from the configs here + // TODO: do the licensing checks here and return the right things based on the license + } ctx.body = scopedConfig } else { // don't throw an error, there simply is nothing to return From 67d5219f754ad15ed313a4c88a2ea2621e61b15f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 2 Sep 2024 20:20:58 +0100 Subject: [PATCH 03/36] basic crud working --- .../src/pages/builder/portal/settings/ai/ConfigModal.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 30830cff1a..e9ec5159f9 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -49,6 +49,7 @@ } async function saveConfig() { + formValues.type = "ai" try { const savedConfig = await API.saveConfig(formValues) formValues._rev = savedConfig._rev From f328ae4bf9dff216e8a23471cc60b074f0e41e0d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 2 Sep 2024 20:45:32 +0100 Subject: [PATCH 04/36] account for arrays --- packages/backend-core/src/configs/configs.ts | 3 +- .../portal/settings/ai/ConfigModal.svelte | 49 ++++++++++++------- .../worker/src/api/routes/global/configs.ts | 20 +++++++- 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 6062d3624f..1771716f57 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -1,5 +1,6 @@ import { - AIConfig, AIInnerConfig, + AIConfig, + AIInnerConfig, Config, ConfigType, GoogleConfig, diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index e9ec5159f9..749cebeb2c 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -23,37 +23,48 @@ const models = [ "gpt4o-mini", ] + + const defaultConfig = { + active: false, + isDefault: false, + } - let formValues = {} - + let aiConfig = defaultConfig let validation $: { - const { provider, model, name, apiKey } = formValues - validation = provider && model && name && apiKey + const { provider, defaultModel, name, apiKey } = aiConfig + validation = provider && defaultModel && name && apiKey } function prefillConfig(evt) { const provider = evt.detail // grab the preset config from the constants for that provider and fill it in if (ConfigMap[provider]) { - formValues = { - ...formValues, + aiConfig = { + ...aiConfig, ...ConfigMap[provider] } } else { - formValues = { + aiConfig = { + ...aiConfig, provider } } } async function saveConfig() { - formValues.type = "ai" + const config = { + type: "ai", + config: [ + // TODO: include the ones that are already there, or just handle this in the backend + aiConfig, + ] + } try { - const savedConfig = await API.saveConfig(formValues) - formValues._rev = savedConfig._rev - formValues._id = savedConfig._id + const savedConfig = await API.saveConfig(config) + aiConfig._rev = savedConfig._rev + aiConfig._id = savedConfig._id notifications.success(`Configuration saved`) } catch (error) { notifications.error( @@ -92,33 +103,33 @@
- +
- +
- +
- - + + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 749cebeb2c..70ddba5407 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -8,27 +8,17 @@ Body, notifications, } from "@budibase/bbui" - import { ConfigMap } from "./constants" + import { ConfigMap, Providers } from "./constants" import { API } from "api" - // TODO: Update these - const providers = [ - "OpenAI", - "Anthropic", - "Together AI", - "Azure Open AI", - "Custom" - ] - - const models = [ - "gpt4o-mini", - ] - - const defaultConfig = { + export let defaultConfig = { active: false, isDefault: false, } + export let saveHandler + export let deleteHandler + let aiConfig = defaultConfig let validation @@ -43,48 +33,15 @@ if (ConfigMap[provider]) { aiConfig = { ...aiConfig, - ...ConfigMap[provider] - } - } else { - aiConfig = { - ...aiConfig, + ...ConfigMap[provider], provider } - } - } - - async function saveConfig() { - const config = { - type: "ai", - config: [ - // TODO: include the ones that are already there, or just handle this in the backend - aiConfig, - ] - } - try { - const savedConfig = await API.saveConfig(config) - aiConfig._rev = savedConfig._rev - aiConfig._id = savedConfig._id - notifications.success(`Configuration saved`) - } catch (error) { - notifications.error( - `Failed to save AI Configuration, reason: ${error?.message || "Unknown"}` - ) - } - } - - async function deleteConfig() { - // Delete a configuration - try { - // await API.deleteConfig({ - // id: smtpConfig._id, - // rev: smtpConfig._rev, - // }) - notifications.success(`Deleted config`) - } catch (error) { - notifications.error( - `Failed to clear email settings, reason: ${error?.message || "Unknown"}` - ) + } else { + aiConfig.provider = provider + // aiConfig = { + // ...aiConfig, + // provider + // } } } @@ -93,8 +50,8 @@
+
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts index df5508109d..07e0ea1cb7 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts +++ b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts @@ -1,8 +1,47 @@ +export const Providers = { + OpenAI: { + name: "OpenAI", + models: [ + "gpt-4o-mini", + "gpt-4o", + "gpt-3.5-turbo", + "chatgpt-4o-latest", + "gpt-4-turbo", + "gpt-4", + ] + }, + Anthropic: { + name: "Anthropic", + models: [ + "claude-3-5-sonnet-20240620", + "claude-3-sonnet-20240229", + "claude-3-opus-20240229", + "claude-3-haiku-20240307" + ] + }, + TogetherAI: { + name: "Together AI", + // TODO: too many - probably need to use an autocomplete for this + models: [""] + }, + Custom: { + name: "Custom", + // TODO: too many - probably need to use an autocomplete for this + models: [""] + }, +} + export const ConfigMap = { OpenAI: { baseUrl: "https://api.openai.com" }, Anthropic: { + baseUrl: "" + }, + TogetherAI: { baseUrl: "https://api.together.xyz/v1" }, + Custom: { + baseUrl: "" + } } \ No newline at end of file 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 427b09a7f2..65cd137833 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,5 @@ + + + + + + \ No newline at end of file diff --git a/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte b/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte new file mode 100644 index 0000000000..a7a2927dbc --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte @@ -0,0 +1,5 @@ + +OpenAI icon \ No newline at end of file diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index 246874d0f1..249893520c 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -123,7 +123,7 @@ export interface AIInnerConfig { defaultModel: string } -export interface AIConfig extends Config {} +export interface AIConfig extends Config {} export const isSettingsConfig = (config: Config): config is SettingsConfig => config.type === ConfigType.SETTINGS diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 43aac19b18..e5c142f562 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -28,7 +28,7 @@ import { SSOConfig, SSOConfigType, UserCtx, - OIDCLogosConfig, + OIDCLogosConfig, AIConfig, } from "@budibase/types" import * as pro from "@budibase/pro" @@ -313,6 +313,13 @@ function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) { ) } +function sanitizeAIConfig(aiConfig: AIConfig) { + for (let providerConfig of aiConfig.config) { + delete providerConfig.apiKey + } + return aiConfig +} + export async function find(ctx: UserCtx) { try { // Find the config with the most granular scope based on context @@ -325,8 +332,8 @@ export async function find(ctx: UserCtx) { } if (type === ConfigType.AI) { - // TODO: strip the keys from the configs here // TODO: do the licensing checks here and return the right things based on the license + sanitizeAIConfig(scopedConfig) } ctx.body = scopedConfig } else { diff --git a/packages/worker/src/api/routes/global/configs.ts b/packages/worker/src/api/routes/global/configs.ts index b857647652..417498d829 100644 --- a/packages/worker/src/api/routes/global/configs.ts +++ b/packages/worker/src/api/routes/global/configs.ts @@ -73,7 +73,7 @@ function aiValidation() { isDefault: Joi.boolean().required(), name: Joi.string().required(), active: Joi.boolean().required(), - baseUrl: Joi.string().optional(), + baseUrl: Joi.string().optional().allow("", null), apiKey: Joi.string().required(), // TODO: should be enum defaultModel: Joi.string().optional(), From 43135e42746032672cd59299e86ec9e80f1cf3ac Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 Sep 2024 17:18:46 +0100 Subject: [PATCH 06/36] AI Config CRUD complete --- .../portal/settings/ai/AIConfigTile.svelte | 2 +- .../portal/settings/ai/ConfigModal.svelte | 61 +++++++--------- .../builder/portal/settings/ai/index.svelte | 69 ++++++++++--------- .../src/api/controllers/global/configs.ts | 20 ++++-- .../worker/src/api/routes/global/configs.ts | 26 +++---- 5 files changed, 91 insertions(+), 87 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 12cfa1d174..4b9b4cc506 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte @@ -1,5 +1,5 @@
+
+ + +
-
- - -
- +
- +
- - + + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts index 07e0ea1cb7..9c82f714a4 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts +++ b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts @@ -22,7 +22,7 @@ export const Providers = { TogetherAI: { name: "Together AI", // TODO: too many - probably need to use an autocomplete for this - models: [""] + models: ["whatever"] }, Custom: { name: "Custom", diff --git a/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte b/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte new file mode 100644 index 0000000000..f69c7d8281 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte b/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte new file mode 100644 index 0000000000..1afd5626b1 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + \ No newline at end of file From 378ccb6e70b48695e05490ec7d29fc0c8603253a Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 Sep 2024 18:52:33 +0100 Subject: [PATCH 08/36] switch name and description --- .../src/pages/builder/portal/settings/ai/AIConfigTile.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d02c2c62c3..1b2b4b99a7 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte @@ -25,7 +25,7 @@ {/if}
- {config.name} + {config.provider}
From 0d5e776424b5c12a9588ffbc2f921b33d39e4e8b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 Sep 2024 19:12:13 +0100 Subject: [PATCH 09/36] preserve apikeys on save --- .../portal/settings/ai/ConfigModal.svelte | 3 ++- .../builder/portal/settings/ai/index.svelte | 10 ++++----- packages/types/src/documents/global/config.ts | 22 ++++++++++--------- .../src/api/controllers/global/configs.ts | 11 ++++++---- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 703f1e8129..747a070c6b 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -22,6 +22,7 @@ const {provider, defaultModel, name, apiKey} = config validation = provider && defaultModel && name && apiKey } + $: canEditBaseUrl = config.provider && ConfigMap[config.provider].baseUrl === "" function prefillConfig(evt) { const provider = evt.detail @@ -70,7 +71,7 @@
- +
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 d0ced7041a..57435168ac 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte @@ -60,10 +60,9 @@ } try { - const savedConfig = await API.saveConfig(fullAIConfig) - fullAIConfig._rev = savedConfig._rev - fullAIConfig._id = savedConfig._id + await API.saveConfig(fullAIConfig) notifications.success(`Successfully saved and activated AI Configuration`) + await fetchAIConfig() } catch (error) { notifications.error( `Failed to save AI Configuration, reason: ${error?.message || "Unknown"}` @@ -76,10 +75,9 @@ delete fullAIConfig.config[key] try { - const savedConfig = await API.saveConfig(fullAIConfig) - fullAIConfig._rev = savedConfig._rev - fullAIConfig._id = savedConfig._id + await API.saveConfig(fullAIConfig) notifications.success(`Deleted config`) + await fetchAIConfig() } catch (error) { notifications.error( `Failed to delete config, reason: ${error?.message || "Unknown"}` diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index 249893520c..35caedef63 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -112,18 +112,20 @@ export interface SCIMInnerConfig { export interface SCIMConfig extends Config {} export interface AIInnerConfig { - // TODO: should be enum - provider: string - isDefault: boolean - name: string - active: boolean - baseUrl: string - apiKey: string - // TODO: should be enum - defaultModel: string + [key: string]: { + // TODO: should be enum + provider: string + isDefault: boolean + name: string + active: boolean + baseUrl: string + apiKey: string + // TODO: should be enum + defaultModel: string + } } -export interface AIConfig extends Config {} +export interface AIConfig extends Config {} export const isSettingsConfig = (config: Config): config is SettingsConfig => config.type === ConfigType.SETTINGS diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 0b8e525eb8..1b66289f47 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -200,11 +200,14 @@ async function verifyOIDCConfig(config: OIDCConfigs) { } async function verifyAIConfig(config: AIConfig, existingConfig?: AIConfig) { + if (!existingConfig) return + // ensure that the redacted API keys are not overwritten in the DB - // for (let aiConfig of existingConfig) { - // - // } - return true + for (let uuid in existingConfig.config) { + if (config[uuid]?.apiKey === PASSWORD_REPLACEMENT) { + config[uuid].apiKey = existingConfig.config[uuid].apiKey + } + } } export async function save(ctx: UserCtx) { From be4b6aaceb47a1b6048e9c6b4cd9edf007b090d6 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 Sep 2024 19:19:33 +0100 Subject: [PATCH 10/36] adding config for azure openai and more customisation for custom ai models --- .../builder/portal/settings/ai/ConfigModal.svelte | 14 +++++++++----- .../pages/builder/portal/settings/ai/constants.ts | 11 +++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 747a070c6b..cac8f74786 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -63,11 +63,15 @@
- + {:else} + + {/if}
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts index 9c82f714a4..d0db0d0d9b 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts +++ b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts @@ -22,6 +22,17 @@ export const Providers = { TogetherAI: { name: "Together AI", // TODO: too many - probably need to use an autocomplete for this + models: [ + "gpt-4o-mini", + "gpt-4o", + "gpt-3.5-turbo", + "chatgpt-4o-latest", + "gpt-4-turbo", + "gpt-4", + ] + }, + AzureOpenAI: { + name: "Azure Open AI", models: ["whatever"] }, Custom: { From d3b90a02539c50a1dfb7a97ca6b52d103407bce3 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 3 Sep 2024 19:47:36 +0100 Subject: [PATCH 11/36] initial impl of default Budibase AI config through env vars --- .../portal/settings/ai/AIConfigTile.svelte | 6 +++++- .../portal/settings/ai/ConfigModal.svelte | 10 +++++----- .../builder/portal/settings/ai/constants.ts | 19 +++++++++++++------ packages/types/src/documents/global/config.ts | 10 +++++----- .../src/api/controllers/global/configs.ts | 19 ++++++++++++++++--- packages/worker/src/environment.ts | 3 +++ 6 files changed, 47 insertions(+), 20 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 1b2b4b99a7..39c0972027 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte @@ -1,5 +1,6 @@ - - - export let height - export let width + export let height + export let width -OpenAI icon \ No newline at end of file + + OpenAI icon + + \ No newline at end of file diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts index 85700f167b..748d90fda7 100644 --- a/packages/types/src/sdk/licensing/quota.ts +++ b/packages/types/src/sdk/licensing/quota.ts @@ -17,12 +17,14 @@ export enum StaticQuotaName { CREATORS = "creators", USER_GROUPS = "userGroups", PLUGINS = "plugins", + AI_CUSTOM_CONFIGS = "aiCustomConfigs", } export enum MonthlyQuotaName { QUERIES = "queries", AUTOMATIONS = "automations", DAY_PASSES = "dayPasses", + BUDIBASE_AI_CREDITS = "budibaseAICredits" } export enum ConstantQuotaName { @@ -62,6 +64,7 @@ export type MonthlyQuotas = { [MonthlyQuotaName.QUERIES]: Quota [MonthlyQuotaName.AUTOMATIONS]: Quota [MonthlyQuotaName.DAY_PASSES]: Quota + [MonthlyQuotaName.BUDIBASE_AI_CREDITS]: Quota } export type StaticQuotas = { @@ -71,6 +74,7 @@ export type StaticQuotas = { [StaticQuotaName.CREATORS]: Quota [StaticQuotaName.USER_GROUPS]: Quota [StaticQuotaName.PLUGINS]: Quota + [StaticQuotaName.AI_CUSTOM_CONFIGS]: Quota } export type ConstantQuotas = { From cdb0e2509c2067db0dc8a9f84e3e775c2b76a2ae Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 6 Sep 2024 14:53:26 +0100 Subject: [PATCH 14/36] testing configuration, unit tests for AI config --- .../core/utilities/structures/licenses.ts | 10 + packages/builder/package.json | 1 + .../portal/settings/ai/AISettings.spec.js | 96 ++++ .../builder/portal/settings/ai/ai.spec.ts | 0 .../builder/portal/settings/ai/index.svelte | 5 +- .../{vite.config.js => vite.config.mjs} | 4 +- packages/builder/vitest.setup.js | 5 +- yarn.lock | 476 +++++++++--------- 8 files changed, 357 insertions(+), 240 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js delete mode 100644 packages/builder/src/pages/builder/portal/settings/ai/ai.spec.ts rename packages/builder/{vite.config.js => vite.config.mjs} (98%) diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts index bb452f9ad5..cf422637d6 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -55,6 +55,11 @@ export function quotas(): Quotas { value: 1, triggers: [], }, + budibaseAICredits: { + name: "Budibase AI Credits", + value: 1, + triggers: [], + } }, static: { rows: { @@ -87,6 +92,11 @@ export function quotas(): Quotas { value: 1, triggers: [], }, + aiCustomConfigs: { + name: "Plugins", + value: 1, + triggers: [], + }, }, }, constant: { diff --git a/packages/builder/package.json b/packages/builder/package.json index f44c2ea549..f9e6becbab 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -93,6 +93,7 @@ "identity-obj-proxy": "^3.0.0", "jest": "29.7.0", "jsdom": "^21.1.1", + "resize-observer-polyfill": "^1.5.1", "svelte-jester": "^1.3.2", "vite": "^4.5.0", "vite-plugin-static-copy": "^0.17.0", 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 new file mode 100644 index 0000000000..5ca14c7898 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js @@ -0,0 +1,96 @@ +import { it, expect, describe, vi } from "vitest" +import AISettings from "./index.svelte" +import { render } from "@testing-library/svelte" +import { admin, licensing } from "stores/portal" + +vi.spyOn(notifications, "error").mockImplementation(vi.fn) +vi.spyOn(notifications, "success").mockImplementation(vi.fn) + +const Hosting = { + Cloud: "cloud", + Self: "self", +} + +function setupEnv( + hosting, + features = {}) { + const defaultFeatures = { + budibaseAIEnabled: false, + customAIConfigsEnabled: false, + ...features + } + admin.subscribe = vi.fn().mockImplementation(callback => { + callback({cloud: hosting === Hosting.Cloud}) + return () => { + } + }) + licensing.subscribe = vi.fn().mockImplementation(callback => { + callback(defaultFeatures) + return () => { + } + }) +} + +describe("AISettings", () => { + let instance = null + + afterEach(() => { + vi.restoreAllMocks() + }) + + it("that the AISettings is rendered", () => { + instance = render(AISettings, {}) + expect(instance).toBeDefined() + }) + + describe("Licensing", () => { + it("should show the premium label on self host for custom configs", async () => { + setupEnv(Hosting.Self) + instance = render(AISettings, {}) + const premiumTag = instance.queryByText("Premium") + expect(premiumTag).toBeInTheDocument() + }) + + it("should show the enterprise label on cloud for custom configs", async () => { + setupEnv(Hosting.Cloud) + instance = render(AISettings, {}) + const enterpriseTag = instance.queryByText("Enterprise") + expect(enterpriseTag).toBeInTheDocument() + }) + + it("should show the premium label on cloud when Budibase AI isn't enabled", async () => { + setupEnv(Hosting.Cloud) + instance = render(AISettings, {}) + const premiumTag = instance.queryByText("Premium") + expect(premiumTag).toBeInTheDocument() + }) + + it("should not show the add configuration button if the user doesn't have the correct license on cloud", async () => { + let addConfigurationButton + + setupEnv(Hosting.Cloud) + instance = render(AISettings) + addConfigurationButton = instance.queryByText("Add configuration") + expect(addConfigurationButton).not.toBeInTheDocument() + + setupEnv(Hosting.Cloud, {customAIConfigsEnabled: true}) + instance = render(AISettings) + addConfigurationButton = instance.queryByText("Add configuration") + expect(addConfigurationButton).toBeInTheDocument() + }) + + it("should not show the add configuration button if the user doesn't have the correct license on self host", async () => { + let addConfigurationButton + + setupEnv(Hosting.Self) + instance = render(AISettings) + addConfigurationButton = instance.queryByText("Add configuration") + expect(addConfigurationButton).not.toBeInTheDocument() + + setupEnv(Hosting.Self, {customAIConfigsEnabled: true}) + instance = render(AISettings, {}) + addConfigurationButton = instance.queryByText("Add configuration") + expect(addConfigurationButton).toBeInTheDocument() + }) + }) +}) diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ai.spec.ts b/packages/builder/src/pages/builder/portal/settings/ai/ai.spec.ts deleted file mode 100644 index e69de29bb2..0000000000 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 83b24a5b97..dc7853b398 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte @@ -32,7 +32,6 @@ async function fetchAIConfig() { try { - // Fetch the AI configs const aiDoc = await API.getConfig(ConfigTypes.AI) if (aiDoc._id) { fullAIConfig = aiDoc @@ -105,8 +104,8 @@ modal.show() } - onMount(async () => { - await fetchAIConfig() + onMount(() => { + fetchAIConfig() }) diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.mjs similarity index 98% rename from packages/builder/vite.config.js rename to packages/builder/vite.config.mjs index 995cd36adb..a84fba2dae 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.mjs @@ -35,7 +35,7 @@ export default defineConfig(({ mode }) => { // Copy fonts to an additional path so that svelte's automatic // prefixing of the base URL path can still resolve assets copyFonts("builder/fonts"), - ] +] return { test: { @@ -79,7 +79,7 @@ export default defineConfig(({ mode }) => { "process.env.POSTHOG_TOKEN": JSON.stringify(process.env.POSTHOG_TOKEN), }), copyFonts("fonts"), - ...(isProduction ? [] : devOnlyPlugins), + ...(isProduction ? [] : devOnlyPlugins), ], optimizeDeps: { exclude: ["@roxi/routify", "fsevents"], diff --git a/packages/builder/vitest.setup.js b/packages/builder/vitest.setup.js index 6581df83e1..92df5e9600 100644 --- a/packages/builder/vitest.setup.js +++ b/packages/builder/vitest.setup.js @@ -1,4 +1,7 @@ -import { expect } from "vitest" +import { expect, vi } from "vitest" +import "@testing-library/jest-dom/vitest" + +global.ResizeObserver = require("resize-observer-polyfill") expect.extend({ toBeFunc: received => { diff --git a/yarn.lock b/yarn.lock index 655d7d78fc..4e4e528334 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,9 +8,9 @@ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== "@adobe/css-tools@^4.3.2": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff" - integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ== + version "4.4.0" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63" + integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== "@adobe/spectrum-css-workflow-icons@1.2.1": version "1.2.1" @@ -1995,14 +1995,14 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.10.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== dependencies: regenerator-runtime "^0.14.0" -"@babel/runtime@^7.13.10": +"@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.9.2": version "7.25.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2" integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ== @@ -2053,44 +2053,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.29.24": - version "0.0.0" - dependencies: - "@budibase/nano" "10.1.5" - "@budibase/pouchdb-replication-stream" "1.2.11" - "@budibase/shared-core" "0.0.0" - "@budibase/types" "0.0.0" - aws-cloudfront-sign "3.0.2" - aws-sdk "2.1030.0" - bcrypt "5.1.0" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dd-trace "5.2.0" - dotenv "16.0.1" - ioredis "5.3.2" - joi "17.6.0" - jsonwebtoken "9.0.2" - knex "2.4.2" - koa-passport "^6.0.0" - koa-pino-logger "4.0.0" - lodash "4.17.21" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - pino "8.11.0" - pino-http "8.3.3" - posthog-node "4.0.1" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - rotating-file-stream "3.1.0" - sanitize-s3-objectkey "0.0.1" - semver "^7.5.4" - tar-fs "2.1.1" - uuid "^8.3.2" - "@budibase/handlebars-helpers@^0.13.2": version "0.13.2" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.13.2.tgz#73ab51c464e91fd955b429017648e0257060db77" @@ -2133,44 +2095,6 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@npm:@budibase/pro@latest": - version "2.29.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.29.24.tgz#2dbd4c6c0f757aab7e17c413c6d6e4520086f9ac" - integrity sha512-m1v24UD6O21Vbrfsuo5kC5oeg7FzjWO2w8TQMw1VvPKmdIqqclaKDPTPytxwllTMkapMDRNzM5cQzqnQ3yHf6A== - dependencies: - "@budibase/backend-core" "2.29.24" - "@budibase/shared-core" "2.29.24" - "@budibase/string-templates" "2.29.24" - "@budibase/types" "2.29.24" - "@koa/router" "8.0.8" - bull "4.10.1" - joi "17.6.0" - jsonwebtoken "9.0.2" - lru-cache "^7.14.1" - memorystream "^0.3.1" - node-fetch "2.6.7" - scim-patch "^0.8.1" - scim2-parse-filter "^0.2.8" - -"@budibase/shared-core@2.29.24": - version "0.0.0" - dependencies: - "@budibase/types" "0.0.0" - cron-validate "1.4.5" - -"@budibase/string-templates@2.29.24": - version "0.0.0" - dependencies: - "@budibase/handlebars-helpers" "^0.13.2" - dayjs "^1.10.8" - handlebars "^4.7.8" - lodash.clonedeep "^4.5.0" - -"@budibase/types@2.29.24": - version "0.0.0" - dependencies: - scim-patch "^0.8.1" - "@bull-board/api@5.10.2": version "5.10.2" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-5.10.2.tgz#ae8ff6918b23897bf879a6ead3683f964374c4b3" @@ -5338,9 +5262,9 @@ redent "^3.0.0" "@testing-library/svelte@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@testing-library/svelte/-/svelte-4.1.0.tgz#de6fa34d13d99505e68134ef2acfbafdc03ed39a" - integrity sha512-MJqe7x9WowkiAVdk9mvazEC2ktFZdmK2OqFVoO557PC37aBemQ4ozqdK3yrG34Zg9kuln3qgTVeLSh08e69AMw== + version "4.2.3" + resolved "https://registry.yarnpkg.com/@testing-library/svelte/-/svelte-4.2.3.tgz#bd0fd3dde5c63012da95d58ee640c0b44fd27a04" + integrity sha512-8vM2+JSPc6wZWkO9ICPmHvzacjy8jBw+iVjmNs+0VsPV3AO3v4P8qCLWTaQ9nYW/e+IR1BCy3MM3Uqg21dlBkw== dependencies: "@testing-library/dom" "^9.3.1" @@ -5412,9 +5336,9 @@ "@types/readdir-glob" "*" "@types/aria-query@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" - integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q== + version "5.0.4" + resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708" + integrity sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw== "@types/babel__core@^7.1.14": version "7.20.0" @@ -5485,9 +5409,9 @@ "@types/chai" "*" "@types/chai@*", "@types/chai@^4.3.4": - version "4.3.16" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.16.tgz#b1572967f0b8b60bf3f87fe1d854a5604ea70c82" - integrity sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ== + version "4.3.19" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.19.tgz#14519f437361d41e84102ed3fbc922ddace3e228" + integrity sha512-2hHHvQBVE2FiSK4eN0Br6snX9MtolHaTo/batnLjlGRhoQzlCL61iVpxoqO7SfFyOw+P/pwv+0zNHzKoGWz9Cw== "@types/chance@1.1.3": version "1.1.3" @@ -6922,16 +6846,16 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.11.3, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c" - integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw== - -acorn@^8.12.0, acorn@^8.12.1: +acorn@^8.1.0, acorn@^8.11.3, acorn@^8.12.0, acorn@^8.12.1, acorn@^8.8.1: version "8.12.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== +acorn@^8.10.0, acorn@^8.11.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c" + integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw== + add-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" @@ -7259,7 +7183,7 @@ aria-query@^5.0.0, aria-query@^5.3.0: dependencies: dequal "^2.0.3" -array-buffer-byte-length@^1.0.1: +array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== @@ -7524,7 +7448,30 @@ axios-retry@^3.1.9: "@babel/runtime" "^7.15.4" is-retry-allowed "^2.2.0" -axios@0.24.0, axios@1.1.3, axios@1.6.3, axios@^0.21.1, axios@^1.0.0, axios@^1.1.3, axios@^1.4.0, axios@^1.5.0, axios@^1.6.2: +axios@0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" + integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== + dependencies: + follow-redirects "^1.14.4" + +axios@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" + integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +axios@^0.21.1: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + +axios@^1.0.0, axios@^1.1.3, axios@^1.4.0, axios@^1.5.0, axios@^1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.3.tgz#7f50f23b3aa246eff43c54834272346c396613f4" integrity sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww== @@ -8306,9 +8253,9 @@ caseless@~0.12.0: integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== chai@^4.3.7: - version "4.4.1" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1" - integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g== + version "4.5.0" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.5.0.tgz#707e49923afdd9b13a8b0b47d33d732d13812fd8" + integrity sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw== dependencies: assertion-error "^1.1.0" check-error "^1.0.3" @@ -8316,7 +8263,7 @@ chai@^4.3.7: get-func-name "^2.0.2" loupe "^2.3.6" pathval "^1.1.1" - type-detect "^4.0.8" + type-detect "^4.1.0" chai@^5.1.1: version "5.1.1" @@ -9625,9 +9572,9 @@ dedent@^1.0.0: integrity sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg== deep-eql@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" - integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== + version "4.1.4" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.4.tgz#d0d3912865911bb8fac5afb4e3acfa6a28dc72b7" + integrity sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg== dependencies: type-detect "^4.0.0" @@ -9637,15 +9584,16 @@ deep-eql@^5.0.1: integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q== deep-equal@^2.0.5: - version "2.2.0" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6" - integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw== + version "2.2.3" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1" + integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA== dependencies: - call-bind "^1.0.2" - es-get-iterator "^1.1.2" - get-intrinsic "^1.1.3" + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.5" + es-get-iterator "^1.1.3" + get-intrinsic "^1.2.2" is-arguments "^1.1.1" - is-array-buffer "^3.0.1" + is-array-buffer "^3.0.2" is-date-object "^1.0.5" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" @@ -9653,11 +9601,11 @@ deep-equal@^2.0.5: object-is "^1.1.5" object-keys "^1.1.1" object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" + regexp.prototype.flags "^1.5.1" side-channel "^1.0.4" which-boxed-primitive "^1.0.2" which-collection "^1.0.1" - which-typed-array "^1.1.9" + which-typed-array "^1.1.13" deep-equal@~1.0.1: version "1.0.1" @@ -10619,7 +10567,7 @@ es-errors@^1.2.1, es-errors@^1.3.0: resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-get-iterator@^1.1.2: +es-get-iterator@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== @@ -11633,6 +11581,11 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== +follow-redirects@^1.14.0, follow-redirects@^1.14.4: + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== + follow-redirects@^1.15.0: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" @@ -11936,7 +11889,7 @@ get-func-name@^2.0.1, get-func-name@^2.0.2: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== -get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== @@ -12726,7 +12679,12 @@ http-assert@^1.3.0: deep-equal "~1.0.1" http-errors "~1.8.0" -http-cache-semantics@3.8.1, http-cache-semantics@4.1.1, http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1: +http-cache-semantics@3.8.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== + +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== @@ -13211,7 +13169,7 @@ is-arguments@^1.1.1: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-array-buffer@^3.0.1, is-array-buffer@^3.0.4: +is-array-buffer@^3.0.2, is-array-buffer@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== @@ -13402,10 +13360,10 @@ is-lambda@^1.0.1: resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== -is-map@^2.0.1, is-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== +is-map@^2.0.2, is-map@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" + integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== is-module@^1.0.0: version "1.0.0" @@ -13552,10 +13510,10 @@ is-self-closing@^1.0.1: dependencies: self-closing-tags "^1.0.1" -is-set@^2.0.1, is-set@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== +is-set@^2.0.2, is-set@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" + integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: version "1.0.3" @@ -13653,10 +13611,10 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== +is-weakmap@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" + integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== is-weakref@^1.0.2: version "1.0.2" @@ -13665,13 +13623,13 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== +is-weakset@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" + integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" + call-bind "^1.0.7" + get-intrinsic "^1.2.4" is-whitespace@^0.3.0: version "0.3.0" @@ -13737,11 +13695,6 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -isobject@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" - integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== - isolated-vm@^4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/isolated-vm/-/isolated-vm-4.7.2.tgz#5670d5cce1d92004f9b825bec5b0b11fc7501b65" @@ -14395,9 +14348,9 @@ jsdom@^16.0.1: xml-name-validator "^3.0.0" jsdom@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.1.tgz#ab796361e3f6c01bcfaeda1fea3c06197ac9d8ae" - integrity sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w== + version "21.1.2" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.2.tgz#6433f751b8718248d646af1cdf6662dc8a1ca7f9" + integrity sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ== dependencies: abab "^2.0.6" acorn "^8.8.2" @@ -14412,7 +14365,7 @@ jsdom@^21.1.1: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.2" + nwsapi "^2.2.4" parse5 "^7.1.2" rrweb-cssom "^0.6.0" saxes "^6.0.0" @@ -16191,7 +16144,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mlly@^1.1.0, mlly@^1.7.0: +mlly@^1.1.0, mlly@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.1.tgz#e0336429bb0731b6a8e887b438cbdae522c8f32f" integrity sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA== @@ -16301,7 +16254,7 @@ msgpackr-extract@^3.0.2: "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2" "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2" -msgpackr@1.10.1, msgpackr@^1.5.2: +msgpackr@^1.5.2: version "1.10.1" resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.1.tgz#51953bb4ce4f3494f0c4af3f484f01cfbb306555" integrity sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ== @@ -16495,13 +16448,25 @@ node-domexception@1.0.0: resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== -node-fetch@2.6.0, node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0: +node-fetch@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + +node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" +node-fetch@^2.6.9, node-fetch@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + node-forge@^1.2.1, node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -16849,11 +16814,16 @@ nunjucks@^3.2.3: asap "^2.0.3" commander "^5.1.0" -nwsapi@^2.2.0, nwsapi@^2.2.2: +nwsapi@^2.2.0: version "2.2.4" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== +nwsapi@^2.2.4: + version "2.2.12" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.12.tgz#fb6af5c0ec35b27b4581eb3bbad34ec9e5c696f8" + integrity sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w== + nx-cloud@16.0.5: version "16.0.5" resolved "https://registry.yarnpkg.com/nx-cloud/-/nx-cloud-16.0.5.tgz#fa0b0185d254405ec47fcbcdbbd8b12ff1add096" @@ -16954,12 +16924,12 @@ object-inspect@^1.13.1: integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== object-is@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + version "1.1.6" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07" + integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + call-bind "^1.0.7" + define-properties "^1.2.1" object-keys@^1.1.1: version "1.1.1" @@ -17647,7 +17617,15 @@ passport-strategy@1.x.x, passport-strategy@^1.0.0: resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== -passport@0.6.0, passport@^0.4.0, passport@^0.6.0: +passport@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270" + integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg== + dependencies: + passport-strategy "1.x.x" + pause "0.0.1" + +passport@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/passport/-/passport-0.6.0.tgz#e869579fab465b5c0b291e841e6cc95c005fac9d" integrity sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug== @@ -18024,12 +18002,12 @@ pkg-dir@^4.2.0: find-up "^4.0.0" pkg-types@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.1.1.tgz#07b626880749beb607b0c817af63aac1845a73f2" - integrity sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.2.0.tgz#d0268e894e93acff11a6279de147e83354ebd42d" + integrity sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA== dependencies: confbox "^0.1.7" - mlly "^1.7.0" + mlly "^1.7.1" pathe "^1.1.2" pkginfo@0.4.x: @@ -18920,7 +18898,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== -psl@^1.1.33: +psl@^1.1.28, psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -19396,7 +19374,7 @@ regexp-tree@~0.1.1: resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd" integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA== -regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.2: +regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== @@ -19520,6 +19498,11 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== +resize-observer-polyfill@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + resolve-alpn@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -19987,6 +19970,11 @@ sax@1.2.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA== +sax@>=0.1.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== + sax@>=0.6.0: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -20059,13 +20047,33 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3, semver@~2.3.1: +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + +semver@7.5.3, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3: version "7.5.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== dependencies: lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^7.5.4, semver@^7.6.0, semver@^7.6.3: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== + +semver@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" + integrity sha512-abLdIKCosKfpnmhS52NCTjO4RiLspDfsn37prjzGrp9im5DPJOgh82Os92vtwGh6XdQryKI/7SREZnV+aqiXrA== + seq-queue@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" @@ -20743,16 +20751,7 @@ string-similarity@^4.0.4: resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b" integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -20843,7 +20842,7 @@ stringify-object@^3.2.1: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -20857,13 +20856,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -21523,12 +21515,7 @@ tiny-queue@^0.2.0: resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046" integrity sha512-EijGsv7kzd9I9g0ByCl6h42BWNGUZrlCSejfrb3AKeHC33SGbASu1VDf5O3rRiiUOhAC9CHdZxFPbZu0HmR70A== -tinybench@^2.3.1: - version "2.8.0" - resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.8.0.tgz#30e19ae3a27508ee18273ffed9ac7018949acd7b" - integrity sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw== - -tinybench@^2.8.0: +tinybench@^2.3.1, tinybench@^2.8.0: version "2.9.0" resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b" integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg== @@ -21649,7 +21636,7 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -tough-cookie@4.1.3, "tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@~2.5.0: +"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0, tough-cookie@^4.1.2: version "4.1.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== @@ -21659,6 +21646,14 @@ tough-cookie@4.1.3, "tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0 universalify "^0.2.0" url-parse "^1.5.3" +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + tr46@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" @@ -21873,11 +21868,16 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.8: +type-detect@4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== +type-detect@^4.0.0, type-detect@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c" + integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw== + type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -22042,9 +22042,9 @@ typo-js@*: integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== ufo@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.3.tgz#3325bd3c977b6c6cd3160bf4ff52989adc9d3344" - integrity sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw== + version "1.5.4" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754" + integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ== uglify-js@^3.1.4: version "3.17.4" @@ -22182,14 +22182,6 @@ unpipe@1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -unset-value@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-2.0.1.tgz#57bed0c22d26f28d69acde5df9a11b77c74d2df3" - integrity sha512-2hvrBfjUE00PkqN+q0XP6yRAOGrR06uSiUoIQGZkc7GxvQ9H7v8quUPNtZjMg4uux69i8HWpIjLPUKwCuRGyNg== - dependencies: - has-value "^2.0.2" - isobject "^4.0.0" - untildify@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" @@ -22703,21 +22695,21 @@ which-boxed-primitive@^1.0.2: is-symbol "^1.0.3" which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0" + integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw== dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" + is-map "^2.0.3" + is-set "^2.0.3" + is-weakmap "^2.0.2" + is-weakset "^2.0.3" which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== -which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9: +which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15: version "1.1.15" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== @@ -22749,15 +22741,7 @@ which@^3.0.0: dependencies: isexe "^2.0.0" -why-is-node-running@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.2.2.tgz#4185b2b4699117819e7154594271e7e344c9973e" - integrity sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA== - dependencies: - siginfo "^2.0.0" - stackback "0.0.2" - -why-is-node-running@^2.3.0: +why-is-node-running@^2.2.2, why-is-node-running@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.3.0.tgz#a3f69a97107f494b3cdc3bdddd883a7d65cebf04" integrity sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w== @@ -22832,7 +22816,7 @@ worker-farm@1.7.0: dependencies: errno "~0.1.7" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -22850,15 +22834,6 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -22941,7 +22916,12 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== -ws@^8.13.0, ws@~8.17.1: +ws@^8.13.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== + +ws@~8.17.1: version "8.17.1" resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== @@ -22981,10 +22961,33 @@ xml-parse-from-string@^1.0.0: resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28" integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g== -xml2js@0.1.x, xml2js@0.4.19, xml2js@0.5.0, xml2js@0.6.2, xml2js@^0.4.19, xml2js@^0.4.5: - version "0.6.2" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499" - integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA== +xml2js@0.1.x: + version "0.1.14" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c" + integrity sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA== + dependencies: + sax ">=0.1.1" + +xml2js@0.4.19: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== + dependencies: + sax ">=0.6.0" + xmlbuilder "~9.0.1" + +xml2js@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" + integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + +xml2js@^0.4.19, xml2js@^0.4.5: + version "0.4.23" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== dependencies: sax ">=0.6.0" xmlbuilder "~11.0.0" @@ -22994,6 +22997,11 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" @@ -23172,9 +23180,9 @@ yocto-queue@^0.1.0: integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== yocto-queue@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" - integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== + version "1.1.1" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110" + integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g== yup@0.32.9: version "0.32.9" From 891f73681539239f6930374cfb4fba885683e7ab Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 6 Sep 2024 15:37:09 +0100 Subject: [PATCH 15/36] unit tests for secrets mapping --- packages/builder/vite.config.mjs | 2 +- .../functions/backfill/global/configs.ts | 7 +- .../src/api/controllers/global/configs.ts | 2 +- .../controllers/global/tests/configs.spec.ts | 76 +++++++++++++++++++ 4 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 packages/worker/src/api/controllers/global/tests/configs.spec.ts diff --git a/packages/builder/vite.config.mjs b/packages/builder/vite.config.mjs index a84fba2dae..f5ff388952 100644 --- a/packages/builder/vite.config.mjs +++ b/packages/builder/vite.config.mjs @@ -79,7 +79,7 @@ export default defineConfig(({ mode }) => { "process.env.POSTHOG_TOKEN": JSON.stringify(process.env.POSTHOG_TOKEN), }), copyFonts("fonts"), - ...(isProduction ? [] : devOnlyPlugins), + ...(isProduction ? [] : devOnlyPlugins), ], optimizeDeps: { exclude: ["@roxi/routify", "fsevents"], diff --git a/packages/server/src/migrations/functions/backfill/global/configs.ts b/packages/server/src/migrations/functions/backfill/global/configs.ts index bb0781eba3..04eb9caff2 100644 --- a/packages/server/src/migrations/functions/backfill/global/configs.ts +++ b/packages/server/src/migrations/functions/backfill/global/configs.ts @@ -15,12 +15,11 @@ import { } from "@budibase/types" import env from "./../../../../environment" -export function getConfigParams(type?: ConfigType): DatabaseQueryOpts { - const configType = type || "" +export function getConfigParams(): DatabaseQueryOpts { return { include_docs: true, - startkey: `${DocumentType.CONFIG}${SEPARATOR}${configType}`, - endkey: `${DocumentType.CONFIG}${SEPARATOR}${configType}${UNICODE_MAX}`, + startkey: `${DocumentType.CONFIG}${SEPARATOR}`, + endkey: `${DocumentType.CONFIG}${SEPARATOR}${UNICODE_MAX}`, } } diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 087feede3c..4a19168c4f 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -199,7 +199,7 @@ async function verifyOIDCConfig(config: OIDCConfigs) { await verifySSOConfig(ConfigType.OIDC, config.configs[0]) } -async function verifyAIConfig(config: AIConfig, existingConfig?: AIConfig) { +export async function verifyAIConfig(config: AIConfig, existingConfig?: AIConfig) { if (!existingConfig) return // ensure that the redacted API keys are not overwritten in the DB diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts new file mode 100644 index 0000000000..1a1d78757d --- /dev/null +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -0,0 +1,76 @@ +import { TestConfiguration, structures } from "../../../../tests" +import { constants, configs } from "@budibase/backend-core" +import { AIConfig, UserCtx } from "@budibase/types" +import { find, verifyAIConfig } from "../configs" + +jest.mock("@budibase/backend-core", () => ({ + ...jest.requireActual("@budibase/backend-core"), + configs: { + getConfig: jest.fn(), + save: jest.fn() + }, +})) + +describe("Global configs controller", () => { + it("Should strip secrets when pulling AI config", async () => { + configs.getConfig.mockResolvedValue({ + config: { + ai: { + apiKey: "abc123APIKey", + baseUrl: "https://api.example.com", + } + } + }) + const ctx = { + params: { + type: "ai" + }, + throw: jest.fn() + } as UserCtx + + await find(ctx) + + expect(ctx.body).toEqual({ + config: { + ai: { + apiKey: "--secret-value--", + "baseUrl": "https://api.example.com" + } + } + }) + }) + + it("Should not update existing secrets when updating an existing AI Config", async () => { + const newConfig = { + type: "ai", + config: { + aiconfig: { + provider: "OpenAI", + isDefault: true, + name: "MyConfig", + active: true, + defaultModel: "gpt4", + apiKey: "--secret-value--" + } + } + } + + const existingConfig = { + type: "ai", + config: { + aiconfig: { + provider: "OpenAI", + isDefault: true, + name: "MyConfig", + active: true, + defaultModel: "gpt4", + apiKey: "myapikey" + } + } + } + + await verifyAIConfig(newConfig, existingConfig) + // should be unchanged + expect(newConfig.config.aiconfig.apiKey === "myapikey") + }) +}) From 6bf4f47110fae08a78b1d2413aa11f13a0936d52 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 6 Sep 2024 15:42:37 +0100 Subject: [PATCH 16/36] further tests around default BB AI config --- .../controllers/global/tests/configs.spec.ts | 47 +++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 1a1d78757d..393a11a043 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -1,6 +1,6 @@ -import { TestConfiguration, structures } from "../../../../tests" -import { constants, configs } from "@budibase/backend-core" -import { AIConfig, UserCtx } from "@budibase/types" +import { configs } from "@budibase/backend-core" +import { UserCtx } from "@budibase/types" +import * as pro from "@budibase/pro" import { find, verifyAIConfig } from "../configs" jest.mock("@budibase/backend-core", () => ({ @@ -11,7 +11,12 @@ jest.mock("@budibase/backend-core", () => ({ }, })) + describe("Global configs controller", () => { + afterEach(() => { + jest.resetAllMocks() + }) + it("Should strip secrets when pulling AI config", async () => { configs.getConfig.mockResolvedValue({ config: { @@ -40,6 +45,42 @@ describe("Global configs controller", () => { }) }) + it("Should return the default BB AI config when the feature is turned on", async () => { + pro.features.isBudibaseAIEnabled = jest.fn(() => true) + configs.getConfig.mockResolvedValue({ + config: { + ai: { + apiKey: "abc123APIKey", + baseUrl: "https://api.example.com", + } + } + }) + const ctx = { + params: { + type: "ai" + }, + throw: jest.fn() + } as UserCtx + + await find(ctx) + + expect(ctx.body).toEqual({ + config: { + budibase_ai: { + provider: "OpenAI", + active: true, + isDefault: true, + defaultModel: undefined, + name: "Budibase AI", + }, + ai: { + apiKey: "--secret-value--", + "baseUrl": "https://api.example.com" + } + } + }) + }) + it("Should not update existing secrets when updating an existing AI Config", async () => { const newConfig = { type: "ai", From 073017a0d6bdbb9b84ae762c23905b2ff6bb55c1 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 6 Sep 2024 15:43:34 +0100 Subject: [PATCH 17/36] remove todo comment --- packages/worker/src/api/routes/global/configs.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/worker/src/api/routes/global/configs.ts b/packages/worker/src/api/routes/global/configs.ts index 409e0a7797..471005c2aa 100644 --- a/packages/worker/src/api/routes/global/configs.ts +++ b/packages/worker/src/api/routes/global/configs.ts @@ -76,7 +76,6 @@ function aiValidation() { active: Joi.boolean().required(), baseUrl: Joi.string().optional().allow("", null), apiKey: Joi.string().required(), - // TODO: should be enum defaultModel: Joi.string().optional(), }).required() ) From b9499406534216549593aa555d6b7bddd1b68689 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 6 Sep 2024 15:44:23 +0100 Subject: [PATCH 18/36] remove comments --- packages/backend-core/src/configs/configs.ts | 39 -------------------- 1 file changed, 39 deletions(-) diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 17f4abfe24..1eafd9596e 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -256,42 +256,3 @@ export async function getSCIMConfig(): Promise { const config = await getConfig(ConfigType.SCIM) return config?.config } - - -// AI - -// TODO: Can we assume that you are licensed when you hit this endpoint? -// export async function getAIConfig(): Promise { - // if (!env.SELF_HOSTED) { - // // always use the env vars in cloud - // // TODO: Licensing stuff - make this right - // if (env.OPENAI_API_KEY) { - // return getDefaultBudibaseAIConfig() - // } - // } - - // prefer the config in self-host - // let config = await getConfig(ConfigType.AI) - - // fallback to env vars - // if (!config || !config.activated) { - // config = getDefaultBudibaseAIConfig() - // } - - // return config -// } - -// export function getDefaultBudibaseAIConfig(): AIInnerConfig | undefined { -// if (env.OPENAI_API_KEY) { -// return { -// provider: "", -// isDefault: true, -// name: "Budibase AI", -// active: true, -// baseUrl: "", -// apiKey: env.OPENAI_API_KEY, -// // TODO: should be enum -// defaultModel: "" -// } -// } -// } From 57698170a8d2983b3396919aa6c3266f8835a0e5 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 9 Sep 2024 13:55:26 +0100 Subject: [PATCH 19/36] lint --- packages/backend-core/src/configs/configs.ts | 2 - .../core/utilities/structures/licenses.ts | 2 +- .../portal/settings/ai/AIConfigTile.svelte | 8 +- .../portal/settings/ai/AISettings.spec.js | 18 +- .../portal/settings/ai/ConfigModal.svelte | 27 +-- .../builder/portal/settings/ai/constants.ts | 49 ++-- .../builder/portal/settings/ai/index.svelte | 14 +- .../portal/settings/ai/logos/Anthropic.svelte | 18 +- .../portal/settings/ai/logos/Budibase.svelte | 31 ++- .../portal/settings/ai/logos/OpenAI.svelte | 15 +- .../settings/ai/logos/TogetherAI.svelte | 66 ++++- .../builder/portal/users/users/index.svelte | 2 +- packages/builder/vitest.setup.js | 2 +- packages/types/src/documents/global/config.ts | 2 +- packages/types/src/sdk/licensing/feature.ts | 2 +- packages/types/src/sdk/licensing/quota.ts | 2 +- .../src/api/controllers/global/configs.ts | 5 +- .../controllers/global/tests/configs.spec.ts | 44 ++-- yarn.lock | 228 ++++++++---------- 19 files changed, 293 insertions(+), 244 deletions(-) diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 1eafd9596e..0d189e3f7d 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -1,6 +1,4 @@ import { - AIConfig, - AIInnerConfig, Config, ConfigType, GoogleConfig, diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts index cf422637d6..b4d209a7ee 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -59,7 +59,7 @@ export function quotas(): Quotas { name: "Budibase AI Credits", value: 1, triggers: [], - } + }, }, static: { rows: { 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 0b7a006312..d4d5279d3e 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte @@ -18,13 +18,13 @@
{#if config.name === "Budibase AI"} - + {:else if config.provider === Providers.OpenAI.name} - + {:else if config.provider === Providers.Anthropic.name} - + {:else if config.provider === Providers.TogetherAI.name} - + {/if}
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 5ca14c7898..805739957b 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 @@ -11,23 +11,19 @@ const Hosting = { Self: "self", } -function setupEnv( - hosting, - features = {}) { +function setupEnv(hosting, features = {}) { const defaultFeatures = { budibaseAIEnabled: false, customAIConfigsEnabled: false, - ...features + ...features, } admin.subscribe = vi.fn().mockImplementation(callback => { - callback({cloud: hosting === Hosting.Cloud}) - return () => { - } + callback({ cloud: hosting === Hosting.Cloud }) + return () => {} }) licensing.subscribe = vi.fn().mockImplementation(callback => { callback(defaultFeatures) - return () => { - } + return () => {} }) } @@ -73,7 +69,7 @@ describe("AISettings", () => { addConfigurationButton = instance.queryByText("Add configuration") expect(addConfigurationButton).not.toBeInTheDocument() - setupEnv(Hosting.Cloud, {customAIConfigsEnabled: true}) + setupEnv(Hosting.Cloud, { customAIConfigsEnabled: true }) instance = render(AISettings) addConfigurationButton = instance.queryByText("Add configuration") expect(addConfigurationButton).toBeInTheDocument() @@ -87,7 +83,7 @@ describe("AISettings", () => { addConfigurationButton = instance.queryByText("Add configuration") expect(addConfigurationButton).not.toBeInTheDocument() - setupEnv(Hosting.Self, {customAIConfigsEnabled: true}) + setupEnv(Hosting.Self, { customAIConfigsEnabled: true }) instance = render(AISettings, {}) addConfigurationButton = instance.queryByText("Add configuration") expect(addConfigurationButton).toBeInTheDocument() diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 99f3aa8e7b..2f7486d087 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -1,12 +1,6 @@ - + + - - \ No newline at end of file + + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte b/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte index f69c7d8281..dc19facb1a 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/logos/Budibase.svelte @@ -2,16 +2,35 @@ export let width export let height - + + - - - - + + + + - + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte b/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte index fa60b33cfd..a049cd537f 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/logos/OpenAI.svelte @@ -2,8 +2,17 @@ export let height export let width - + + OpenAI icon - \ No newline at end of file + d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z" + /> + diff --git a/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte b/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte index 1afd5626b1..b81450f768 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/logos/TogetherAI.svelte @@ -2,16 +2,56 @@ export let height export let width - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index b91b2129e6..91d9c99af6 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -127,7 +127,7 @@ name: user.firstName ? user.firstName + " " + user.lastName : "", userGroups, __selectable: - role.value === Constants.BudibaseRoles.Owner ? false : undefined, + role?.value === Constants.BudibaseRoles.Owner ? false : undefined, apps: [...new Set(Object.keys(user.roles))], access: role.sortOrder, } diff --git a/packages/builder/vitest.setup.js b/packages/builder/vitest.setup.js index 92df5e9600..0204a1a772 100644 --- a/packages/builder/vitest.setup.js +++ b/packages/builder/vitest.setup.js @@ -1,4 +1,4 @@ -import { expect, vi } from "vitest" +import { expect } from "vitest" import "@testing-library/jest-dom/vitest" global.ResizeObserver = require("resize-observer-polyfill") diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index 2b0b97ccc0..6e9c29af97 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -153,5 +153,5 @@ export enum ConfigType { OIDC = "oidc", OIDC_LOGOS = "logos_oidc", SCIM = "scim", - AI = "ai" + AI = "ai", } diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts index bf2bcb72b6..cbcb16f7b6 100644 --- a/packages/types/src/sdk/licensing/feature.ts +++ b/packages/types/src/sdk/licensing/feature.ts @@ -16,7 +16,7 @@ export enum Feature { VIEW_PERMISSIONS = "viewPermissions", VIEW_READONLY_COLUMNS = "viewReadonlyColumns", BUDIBASE_AI = "budibaseAI", - AI_CUSTOM_CONFIGS = "customAIConfigs" + AI_CUSTOM_CONFIGS = "customAIConfigs", } export type PlanFeatures = { [key in PlanType]: Feature[] | undefined } diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts index 748d90fda7..75fc18e8e6 100644 --- a/packages/types/src/sdk/licensing/quota.ts +++ b/packages/types/src/sdk/licensing/quota.ts @@ -24,7 +24,7 @@ export enum MonthlyQuotaName { QUERIES = "queries", AUTOMATIONS = "automations", DAY_PASSES = "dayPasses", - BUDIBASE_AI_CREDITS = "budibaseAICredits" + BUDIBASE_AI_CREDITS = "budibaseAICredits", } export enum ConstantQuotaName { diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 4a19168c4f..d3eef71240 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -199,7 +199,10 @@ async function verifyOIDCConfig(config: OIDCConfigs) { await verifySSOConfig(ConfigType.OIDC, config.configs[0]) } -export async function verifyAIConfig(config: AIConfig, existingConfig?: AIConfig) { +export async function verifyAIConfig( + config: AIConfig, + existingConfig?: AIConfig +) { if (!existingConfig) return // ensure that the redacted API keys are not overwritten in the DB diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 393a11a043..2ef00252ff 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -1,3 +1,4 @@ +import { expect } from "vitest" import { configs } from "@budibase/backend-core" import { UserCtx } from "@budibase/types" import * as pro from "@budibase/pro" @@ -7,11 +8,10 @@ jest.mock("@budibase/backend-core", () => ({ ...jest.requireActual("@budibase/backend-core"), configs: { getConfig: jest.fn(), - save: jest.fn() + save: jest.fn(), }, })) - describe("Global configs controller", () => { afterEach(() => { jest.resetAllMocks() @@ -23,14 +23,14 @@ describe("Global configs controller", () => { ai: { apiKey: "abc123APIKey", baseUrl: "https://api.example.com", - } - } + }, + }, }) const ctx = { params: { - type: "ai" + type: "ai", }, - throw: jest.fn() + throw: jest.fn(), } as UserCtx await find(ctx) @@ -39,9 +39,9 @@ describe("Global configs controller", () => { config: { ai: { apiKey: "--secret-value--", - "baseUrl": "https://api.example.com" - } - } + baseUrl: "https://api.example.com", + }, + }, }) }) @@ -52,14 +52,14 @@ describe("Global configs controller", () => { ai: { apiKey: "abc123APIKey", baseUrl: "https://api.example.com", - } - } + }, + }, }) const ctx = { params: { - type: "ai" + type: "ai", }, - throw: jest.fn() + throw: jest.fn(), } as UserCtx await find(ctx) @@ -75,9 +75,9 @@ describe("Global configs controller", () => { }, ai: { apiKey: "--secret-value--", - "baseUrl": "https://api.example.com" - } - } + baseUrl: "https://api.example.com", + }, + }, }) }) @@ -91,9 +91,9 @@ describe("Global configs controller", () => { name: "MyConfig", active: true, defaultModel: "gpt4", - apiKey: "--secret-value--" - } - } + apiKey: "--secret-value--", + }, + }, } const existingConfig = { @@ -105,9 +105,9 @@ describe("Global configs controller", () => { name: "MyConfig", active: true, defaultModel: "gpt4", - apiKey: "myapikey" - } - } + apiKey: "myapikey", + }, + }, } await verifyAIConfig(newConfig, existingConfig) diff --git a/yarn.lock b/yarn.lock index 4e4e528334..146fa74d5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2053,6 +2053,44 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.31.8": + version "0.0.0" + dependencies: + "@budibase/nano" "10.1.5" + "@budibase/pouchdb-replication-stream" "1.2.11" + "@budibase/shared-core" "0.0.0" + "@budibase/types" "0.0.0" + aws-cloudfront-sign "3.0.2" + aws-sdk "2.1030.0" + bcrypt "5.1.0" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dd-trace "5.2.0" + dotenv "16.0.1" + ioredis "5.3.2" + joi "17.6.0" + jsonwebtoken "9.0.2" + knex "2.4.2" + koa-passport "^6.0.0" + koa-pino-logger "4.0.0" + lodash "4.17.21" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + pino "8.11.0" + pino-http "8.3.3" + posthog-node "4.0.1" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + rotating-file-stream "3.1.0" + sanitize-s3-objectkey "0.0.1" + semver "^7.5.4" + tar-fs "2.1.1" + uuid "^8.3.2" + "@budibase/handlebars-helpers@^0.13.2": version "0.13.2" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.13.2.tgz#73ab51c464e91fd955b429017648e0257060db77" @@ -2095,6 +2133,45 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" +"@budibase/pro@npm:@budibase/pro@latest": + version "2.31.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.31.8.tgz#92b27f99f815f5d20bf58bfae916760b14a036da" + integrity sha512-nmNKVoMdUVqEIq6xqoBq0gVBCLkoPMszmn0Zu0SJ/Dc2SpsXhPz9S3n9xXfAA+FHUg9LgUAS+eKPCKPWZXtDHQ== + dependencies: + "@budibase/backend-core" "2.31.8" + "@budibase/shared-core" "2.31.8" + "@budibase/string-templates" "2.31.8" + "@budibase/types" "2.31.8" + "@koa/router" "8.0.8" + bull "4.10.1" + dd-trace "5.2.0" + joi "17.6.0" + jsonwebtoken "9.0.2" + lru-cache "^7.14.1" + memorystream "^0.3.1" + node-fetch "2.6.7" + scim-patch "^0.8.1" + scim2-parse-filter "^0.2.8" + +"@budibase/shared-core@2.31.8": + version "0.0.0" + dependencies: + "@budibase/types" "0.0.0" + cron-validate "1.4.5" + +"@budibase/string-templates@2.31.8": + version "0.0.0" + dependencies: + "@budibase/handlebars-helpers" "^0.13.2" + dayjs "^1.10.8" + handlebars "^4.7.8" + lodash.clonedeep "^4.5.0" + +"@budibase/types@2.31.8": + version "0.0.0" + dependencies: + scim-patch "^0.8.1" + "@bull-board/api@5.10.2": version "5.10.2" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-5.10.2.tgz#ae8ff6918b23897bf879a6ead3683f964374c4b3" @@ -7448,30 +7525,7 @@ axios-retry@^3.1.9: "@babel/runtime" "^7.15.4" is-retry-allowed "^2.2.0" -axios@0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" - integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== - dependencies: - follow-redirects "^1.14.4" - -axios@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== - dependencies: - follow-redirects "^1.15.0" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - -axios@^1.0.0, axios@^1.1.3, axios@^1.4.0, axios@^1.5.0, axios@^1.6.2: +axios@0.24.0, axios@1.1.3, axios@1.6.3, axios@^0.21.1, axios@^1.0.0, axios@^1.1.3, axios@^1.4.0, axios@^1.5.0, axios@^1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.3.tgz#7f50f23b3aa246eff43c54834272346c396613f4" integrity sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww== @@ -11581,11 +11635,6 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.14.0, follow-redirects@^1.14.4: - version "1.15.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" - integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== - follow-redirects@^1.15.0: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" @@ -12679,12 +12728,7 @@ http-assert@^1.3.0: deep-equal "~1.0.1" http-errors "~1.8.0" -http-cache-semantics@3.8.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" - integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== - -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1: +http-cache-semantics@3.8.1, http-cache-semantics@4.1.1, http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== @@ -13695,6 +13739,11 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== +isobject@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" + integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== + isolated-vm@^4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/isolated-vm/-/isolated-vm-4.7.2.tgz#5670d5cce1d92004f9b825bec5b0b11fc7501b65" @@ -16254,7 +16303,7 @@ msgpackr-extract@^3.0.2: "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2" "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2" -msgpackr@^1.5.2: +msgpackr@1.10.1, msgpackr@^1.5.2: version "1.10.1" resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.1.tgz#51953bb4ce4f3494f0c4af3f484f01cfbb306555" integrity sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ== @@ -16448,25 +16497,13 @@ node-domexception@1.0.0: resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== -node-fetch@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== - -node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: +node-fetch@2.6.0, node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" -node-fetch@^2.6.9, node-fetch@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - node-forge@^1.2.1, node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -17617,15 +17654,7 @@ passport-strategy@1.x.x, passport-strategy@^1.0.0: resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== -passport@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270" - integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg== - dependencies: - passport-strategy "1.x.x" - pause "0.0.1" - -passport@^0.6.0: +passport@0.6.0, passport@^0.4.0, passport@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/passport/-/passport-0.6.0.tgz#e869579fab465b5c0b291e841e6cc95c005fac9d" integrity sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug== @@ -18898,7 +18927,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== -psl@^1.1.28, psl@^1.1.33: +psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -19970,11 +19999,6 @@ sax@1.2.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA== -sax@>=0.1.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" - integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== - sax@>=0.6.0: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -20047,33 +20071,13 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: - version "5.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" - integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== - -semver@7.5.3, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3: +"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3, semver@~2.3.1: version "7.5.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^7.5.4, semver@^7.6.0, semver@^7.6.3: - version "7.6.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" - integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== - -semver@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" - integrity sha512-abLdIKCosKfpnmhS52NCTjO4RiLspDfsn37prjzGrp9im5DPJOgh82Os92vtwGh6XdQryKI/7SREZnV+aqiXrA== - seq-queue@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" @@ -21636,7 +21640,7 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0, tough-cookie@^4.1.2: +tough-cookie@4.1.3, "tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@~2.5.0: version "4.1.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== @@ -21646,14 +21650,6 @@ touch@^3.1.0: universalify "^0.2.0" url-parse "^1.5.3" -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - tr46@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" @@ -22182,6 +22178,14 @@ unpipe@1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== +unset-value@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-2.0.1.tgz#57bed0c22d26f28d69acde5df9a11b77c74d2df3" + integrity sha512-2hvrBfjUE00PkqN+q0XP6yRAOGrR06uSiUoIQGZkc7GxvQ9H7v8quUPNtZjMg4uux69i8HWpIjLPUKwCuRGyNg== + dependencies: + has-value "^2.0.2" + isobject "^4.0.0" + untildify@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" @@ -22961,33 +22965,10 @@ xml-parse-from-string@^1.0.0: resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28" integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g== -xml2js@0.1.x: - version "0.1.14" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c" - integrity sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA== - dependencies: - sax ">=0.1.1" - -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== - dependencies: - sax ">=0.6.0" - xmlbuilder "~9.0.1" - -xml2js@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" - integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== - dependencies: - sax ">=0.6.0" - xmlbuilder "~11.0.0" - -xml2js@^0.4.19, xml2js@^0.4.5: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== +xml2js@0.1.x, xml2js@0.4.19, xml2js@0.5.0, xml2js@0.6.2, xml2js@^0.4.19, xml2js@^0.4.5: + version "0.6.2" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499" + integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA== dependencies: sax ">=0.6.0" xmlbuilder "~11.0.0" @@ -22997,11 +22978,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== - xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" From b4a4f81308fd6c6cccb91abaaee45a58828a5d48 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 9 Sep 2024 16:52:56 +0100 Subject: [PATCH 20/36] linting --- packages/account-portal | 2 +- .../backend-core/src/events/publishers/ai.ts | 21 +++++++++++++++++++ .../src/events/publishers/index.ts | 1 + .../portal/settings/ai/ConfigModal.svelte | 6 +++++- packages/pro | 2 +- packages/types/src/documents/global/quotas.ts | 2 ++ packages/types/src/sdk/events/ai.ts | 5 +++++ packages/types/src/sdk/events/event.ts | 8 +++++++ packages/types/src/sdk/events/index.ts | 1 + .../src/api/controllers/global/configs.ts | 11 ++++++++++ 10 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 packages/backend-core/src/events/publishers/ai.ts create mode 100644 packages/types/src/sdk/events/ai.ts diff --git a/packages/account-portal b/packages/account-portal index c24374879d..ce60bf9231 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit c24374879d2b61516fabc24d7404e7da235be05e +Subproject commit ce60bf923115855a9cd0bb991297cccd308eae13 diff --git a/packages/backend-core/src/events/publishers/ai.ts b/packages/backend-core/src/events/publishers/ai.ts new file mode 100644 index 0000000000..168ac9f796 --- /dev/null +++ b/packages/backend-core/src/events/publishers/ai.ts @@ -0,0 +1,21 @@ +import { publishEvent } from "../events" +import { + Event, + AIConfigCreatedEvent, + AIConfigUpdatedEvent, +} from "@budibase/types" + +async function AIConfigCreated(timestamp?: string | number) { + const properties: AIConfigCreatedEvent = {} + await publishEvent(Event.AI_CONFIG_CREATED, properties, timestamp) +} + +async function AIConfigUpdated() { + const properties: AIConfigUpdatedEvent = {} + await publishEvent(Event.AI_CONFIG_UPDATED, properties) +} + +export default { + AIConfigCreated, + AIConfigUpdated, +} diff --git a/packages/backend-core/src/events/publishers/index.ts b/packages/backend-core/src/events/publishers/index.ts index 87a34bf3f1..9c92b80499 100644 --- a/packages/backend-core/src/events/publishers/index.ts +++ b/packages/backend-core/src/events/publishers/index.ts @@ -4,6 +4,7 @@ export { default as auth } from "./auth" export { default as automation } from "./automation" export { default as datasource } from "./datasource" export { default as email } from "./email" +export { default as ai } from "./ai" export { default as license } from "./license" export { default as layout } from "./layout" export { default as org } from "./org" diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte index 2f7486d087..d480689028 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte @@ -54,7 +54,11 @@
- +
diff --git a/packages/pro b/packages/pro index a4d1d15d9c..62586bc47b 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit a4d1d15d9ce6ac3deedb2e42625c90ba32756758 +Subproject commit 62586bc47bf2af507356b0e1e64df8b0ae9fad43 diff --git a/packages/types/src/documents/global/quotas.ts b/packages/types/src/documents/global/quotas.ts index 4eb1168f7d..4726dabf0d 100644 --- a/packages/types/src/documents/global/quotas.ts +++ b/packages/types/src/documents/global/quotas.ts @@ -35,6 +35,7 @@ export interface StaticUsage { [StaticQuotaName.CREATORS]: number [StaticQuotaName.USER_GROUPS]: number [StaticQuotaName.ROWS]: number + [StaticQuotaName.AI_CUSTOM_CONFIGS]: number triggers: { [key in StaticQuotaName]?: QuotaTriggers } @@ -44,6 +45,7 @@ export interface MonthlyUsage { [MonthlyQuotaName.QUERIES]: number [MonthlyQuotaName.AUTOMATIONS]: number [MonthlyQuotaName.DAY_PASSES]: number + [MonthlyQuotaName.BUDIBASE_AI_CREDITS]: number triggers: { [key in MonthlyQuotaName]?: QuotaTriggers } diff --git a/packages/types/src/sdk/events/ai.ts b/packages/types/src/sdk/events/ai.ts new file mode 100644 index 0000000000..740c59d5f9 --- /dev/null +++ b/packages/types/src/sdk/events/ai.ts @@ -0,0 +1,5 @@ +import { BaseEvent } from "./event" + +export interface AIConfigCreatedEvent extends BaseEvent {} + +export interface AIConfigUpdatedEvent extends BaseEvent {} diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index 05f4fe4be9..242b182dec 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -33,6 +33,10 @@ export enum Event { EMAIL_SMTP_CREATED = "email:smtp:created", EMAIL_SMTP_UPDATED = "email:smtp:updated", + // AI + AI_CONFIG_CREATED = "ai:config:created", + AI_CONFIG_UPDATED = "ai:config:updated", + // AUTH AUTH_SSO_CREATED = "auth:sso:created", AUTH_SSO_UPDATED = "auth:sso:updated", @@ -243,6 +247,10 @@ export const AuditedEventFriendlyName: Record = { [Event.EMAIL_SMTP_CREATED]: `Email configuration created`, [Event.EMAIL_SMTP_UPDATED]: `Email configuration updated`, + // AI + [Event.AI_CONFIG_CREATED]: `AI configuration created`, + [Event.AI_CONFIG_UPDATED]: `AI configuration updated`, + // AUTH [Event.AUTH_SSO_CREATED]: `SSO configuration created`, [Event.AUTH_SSO_UPDATED]: `SSO configuration updated`, diff --git a/packages/types/src/sdk/events/index.ts b/packages/types/src/sdk/events/index.ts index 745f84d2a3..043e62faa4 100644 --- a/packages/types/src/sdk/events/index.ts +++ b/packages/types/src/sdk/events/index.ts @@ -2,6 +2,7 @@ export * from "./app" export * from "./auth" export * from "./automation" export * from "./email" +export * from "./ai" export * from "./datasource" export * from "./event" export * from "./layout" diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index d3eef71240..b8feb6158f 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -31,6 +31,7 @@ import { OIDCLogosConfig, AIConfig, PASSWORD_REPLACEMENT, + isAIConfig, } from "@budibase/types" import * as pro from "@budibase/pro" @@ -40,6 +41,11 @@ 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) + fns.push(() => + pro.quotas.updateCustomAIConfigCount(Object.keys(config.config).length) + ) } else if (isGoogleConfig(config)) { fns.push(() => events.auth.SSOCreated(ConfigType.GOOGLE)) if (config.config.activated) { @@ -76,6 +82,11 @@ 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) + fns.push(() => + pro.quotas.updateCustomAIConfigCount(Object.keys(config.config).length) + ) } else if (isGoogleConfig(config)) { fns.push(() => events.auth.SSOUpdated(ConfigType.GOOGLE)) if (!existing.config.activated && config.config.activated) { From 96fbc8fff093fb5d49e6fa5a99441246c45b389e Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 9 Sep 2024 18:07:47 +0100 Subject: [PATCH 21/36] feature flag support --- packages/backend-core/src/features/index.ts | 1 + .../tests/core/utilities/structures/quotas.ts | 4 +++ .../builder/portal/settings/ai/index.svelte | 4 ++- packages/builder/src/stores/portal/menu.js | 15 ++++++--- packages/types/src/sdk/featureFlag.ts | 1 + .../src/api/controllers/global/configs.ts | 4 +-- .../controllers/global/tests/configs.spec.ts | 31 ++++++++++++++++++- 7 files changed, 52 insertions(+), 8 deletions(-) diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts index b84237b1f0..f855daf8a5 100644 --- a/packages/backend-core/src/features/index.ts +++ b/packages/backend-core/src/features/index.ts @@ -268,4 +268,5 @@ export class FlagSet, T extends { [key: string]: V }> { export const flags = new FlagSet({ DEFAULT_VALUES: Flag.boolean(env.isDev()), SQS: Flag.boolean(env.isDev()), + AI_CUSTOM_CONFIGS: Flag.boolean(env.isDev()), }) diff --git a/packages/backend-core/tests/core/utilities/structures/quotas.ts b/packages/backend-core/tests/core/utilities/structures/quotas.ts index 8d0b05fe1e..58817e4831 100644 --- a/packages/backend-core/tests/core/utilities/structures/quotas.ts +++ b/packages/backend-core/tests/core/utilities/structures/quotas.ts @@ -17,6 +17,7 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => { automations: 0, dayPasses: 0, queries: 0, + budibaseAICredits: 0, triggers: {}, breakdown: { rowQueries: { @@ -46,12 +47,14 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => { automations: 0, dayPasses: 0, queries: 0, + budibaseAICredits: 0, triggers: {}, }, current: { automations: 0, dayPasses: 0, queries: 0, + budibaseAICredits: 0, triggers: {}, }, }, @@ -62,6 +65,7 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => { creators, userGroups: 0, rows: 0, + aiCustomConfigs: 0, triggers: {}, }, } 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 77d6aa952a..c4403e5045 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte @@ -80,7 +80,9 @@ } async function deleteConfig(key) { - // Delete a configuration + // We don't store the default BB AI config in the DB + delete fullAIConfig.config.budibase_ai + // Delete the configuration delete fullAIConfig.config[key] try { diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js index ec40f6d4ee..1e6282894e 100644 --- a/packages/builder/src/stores/portal/menu.js +++ b/packages/builder/src/stores/portal/menu.js @@ -1,7 +1,9 @@ import { derived } from "svelte/store" import { admin } from "./admin" import { auth } from "./auth" +import { isEnabled } from "helpers/featureFlags" import { sdk } from "@budibase/shared-core" +import { FeatureFlag } from "@budibase/types"; export const menu = derived([admin, auth], ([$admin, $auth]) => { const user = $auth?.user @@ -45,10 +47,6 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { title: "Auth", href: "/builder/portal/settings/auth", }, - { - title: "AI", - href: "/builder/portal/settings/ai", - }, { title: "Email", href: "/builder/portal/settings/email", @@ -66,6 +64,15 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { href: "/builder/portal/settings/environment", }, ] + if (isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) { + settingsSubPages.push( + { + title: "AI", + href: "/builder/portal/settings/ai", + } + ) + } + if (!cloud) { settingsSubPages.push({ title: "Version", diff --git a/packages/types/src/sdk/featureFlag.ts b/packages/types/src/sdk/featureFlag.ts index 257b4ee576..69b2a3b1b2 100644 --- a/packages/types/src/sdk/featureFlag.ts +++ b/packages/types/src/sdk/featureFlag.ts @@ -1,6 +1,7 @@ export enum FeatureFlag { PER_CREATOR_PER_USER_PRICE = "PER_CREATOR_PER_USER_PRICE", PER_CREATOR_PER_USER_PRICE_ALERT = "PER_CREATOR_PER_USER_PRICE_ALERT", + AI_CUSTOM_CONFIGS = "AI_CUSTOM_CONFIGS", } export interface TenantFeatureFlags { diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index b8feb6158f..ffe7a1c717 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -135,7 +135,6 @@ const getEventFns = async (config: Config, existing?: Config) => { } } } - return fns } @@ -344,11 +343,12 @@ async function enrichAIConfig(aiConfig: AIConfig) { // Return the Budibase AI data source as part of the response if licensing allows const budibaseAIEnabled = await pro.features.isBudibaseAIEnabled() + const defaultConfigExists = Object.keys(aiConfig.config).some(key => aiConfig.config[key].isDefault) if (budibaseAIEnabled) { aiConfig.config["budibase_ai"] = { provider: "OpenAI", active: true, - isDefault: true, + isDefault: !defaultConfigExists, defaultModel: env.BUDIBASE_AI_DEFAULT_MODEL, name: "Budibase AI", } diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 2ef00252ff..4bb3d598a6 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -1,4 +1,3 @@ -import { expect } from "vitest" import { configs } from "@budibase/backend-core" import { UserCtx } from "@budibase/types" import * as pro from "@budibase/pro" @@ -81,6 +80,35 @@ describe("Global configs controller", () => { }) }) + it("Should not not return the default Budibase AI config when on self host", async () => { + pro.features.isBudibaseAIEnabled = jest.fn(() => false) + configs.getConfig.mockResolvedValue({ + config: { + ai: { + apiKey: "abc123APIKey", + baseUrl: "https://api.example.com", + }, + }, + }) + const ctx = { + params: { + type: "ai", + }, + throw: jest.fn(), + } as UserCtx + + await find(ctx) + + expect(ctx.body).toEqual({ + config: { + ai: { + apiKey: "--secret-value--", + baseUrl: "https://api.example.com", + }, + }, + }) + }) + it("Should not update existing secrets when updating an existing AI Config", async () => { const newConfig = { type: "ai", @@ -114,4 +142,5 @@ describe("Global configs controller", () => { // should be unchanged expect(newConfig.config.aiconfig.apiKey === "myapikey") }) + }) From 8b26ab422f91de19bdc57f5ff5976b9db02d0d38 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 9 Sep 2024 18:19:10 +0100 Subject: [PATCH 22/36] remove conditional chain --- .../builder/src/pages/builder/portal/users/users/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 91d9c99af6..b91b2129e6 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -127,7 +127,7 @@ name: user.firstName ? user.firstName + " " + user.lastName : "", userGroups, __selectable: - role?.value === Constants.BudibaseRoles.Owner ? false : undefined, + role.value === Constants.BudibaseRoles.Owner ? false : undefined, apps: [...new Set(Object.keys(user.roles))], access: role.sortOrder, } From 7a376d96295b1fd3d8d0367e2faf7d898c0dce53 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 10:26:18 +0100 Subject: [PATCH 23/36] Update packages/worker/src/api/controllers/global/configs.ts Co-authored-by: Sam Rose --- packages/worker/src/api/controllers/global/configs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index ffe7a1c717..5345c25bc2 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -335,7 +335,7 @@ function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) { async function enrichAIConfig(aiConfig: AIConfig) { // Strip out the API Keys from the response so they don't show in the UI - for (let key in aiConfig.config) { + for (const key in aiConfig.config) { if (aiConfig.config[key].apiKey) { aiConfig.config[key].apiKey = PASSWORD_REPLACEMENT } From 4fed5787ac1a11d47ebd82fa3c69c7accc3cec47 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 10:54:50 +0100 Subject: [PATCH 24/36] review comments --- .../portal/settings/ai/AIConfigTile.svelte | 17 ++++++++--------- .../builder/portal/settings/ai/index.svelte | 6 ++++-- .../src/api/controllers/global/configs.ts | 8 ++++---- .../controllers/global/tests/configs.spec.ts | 4 ++-- 4 files changed, 18 insertions(+), 17 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 d4d5279d3e..693fbe7431 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte @@ -6,6 +6,13 @@ import TogetherAILogo from "./logos/TogetherAI.svelte" import { Providers } from "./constants" + const logos = { + ["Budibase AI"]: BudibaseLogo, + [Providers.OpenAI.name]: OpenAILogo, + [Providers.Anthropic.name]: AnthropicLogo, + [Providers.TogetherAI.name]: TogetherAILogo, + } + export let config export let disabled @@ -17,15 +24,7 @@
- {#if config.name === "Budibase AI"} - - {:else if config.provider === Providers.OpenAI.name} - - {:else if config.provider === Providers.Anthropic.name} - - {:else if config.provider === Providers.TogetherAI.name} - - {/if} +
{config.provider} 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 c4403e5045..2ac1609e7c 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte @@ -69,13 +69,14 @@ try { await API.saveConfig(fullAIConfig) notifications.success(`Successfully saved and activated AI Configuration`) - await fetchAIConfig() } catch (error) { notifications.error( `Failed to save AI Configuration, reason: ${ error?.message || "Unknown" }` ) + } finally { + await fetchAIConfig() } } @@ -88,11 +89,12 @@ try { await API.saveConfig(fullAIConfig) notifications.success(`Deleted config`) - await fetchAIConfig() } catch (error) { notifications.error( `Failed to delete config, reason: ${error?.message || "Unknown"}` ) + } finally { + await fetchAIConfig() } } diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index ffe7a1c717..95e0ba471f 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -211,10 +211,8 @@ async function verifyOIDCConfig(config: OIDCConfigs) { export async function verifyAIConfig( config: AIConfig, - existingConfig?: AIConfig + existingConfig: AIConfig ) { - if (!existingConfig) return - // ensure that the redacted API keys are not overwritten in the DB for (let uuid in existingConfig.config) { if (config[uuid]?.apiKey === PASSWORD_REPLACEMENT) { @@ -251,7 +249,9 @@ export async function save(ctx: UserCtx) { await verifyOIDCConfig(config) break case ConfigType.AI: - await verifyAIConfig(config, existingConfig) + if (existingConfig) { + await verifyAIConfig(config, existingConfig) + } break } } catch (err: any) { diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 4bb3d598a6..8b859dcb89 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -45,7 +45,7 @@ describe("Global configs controller", () => { }) it("Should return the default BB AI config when the feature is turned on", async () => { - pro.features.isBudibaseAIEnabled = jest.fn(() => true) + jest.spyOn(pro.features, "isBudibaseAIEnabled").mockImplementation(() => true) configs.getConfig.mockResolvedValue({ config: { ai: { @@ -81,7 +81,7 @@ describe("Global configs controller", () => { }) it("Should not not return the default Budibase AI config when on self host", async () => { - pro.features.isBudibaseAIEnabled = jest.fn(() => false) + jest.spyOn(pro.features, "isBudibaseAIEnabled").mockImplementation(() => false) configs.getConfig.mockResolvedValue({ config: { ai: { From 933ca952d2e26ade754c9973099b676265774ec1 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 14:50:17 +0100 Subject: [PATCH 25/36] lint --- .../builder/portal/settings/ai/AIConfigTile.svelte | 6 +++++- packages/builder/src/stores/portal/menu.js | 12 +++++------- .../worker/src/api/controllers/global/configs.ts | 4 +++- .../src/api/controllers/global/tests/configs.spec.ts | 11 +++++++---- 4 files changed, 20 insertions(+), 13 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 693fbe7431..2907919ce7 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte +++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte @@ -24,7 +24,11 @@
- +
{config.provider} diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js index 1e6282894e..a572539863 100644 --- a/packages/builder/src/stores/portal/menu.js +++ b/packages/builder/src/stores/portal/menu.js @@ -3,7 +3,7 @@ import { admin } from "./admin" import { auth } from "./auth" import { isEnabled } from "helpers/featureFlags" import { sdk } from "@budibase/shared-core" -import { FeatureFlag } from "@budibase/types"; +import { FeatureFlag } from "@budibase/types" export const menu = derived([admin, auth], ([$admin, $auth]) => { const user = $auth?.user @@ -65,12 +65,10 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { }, ] if (isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) { - settingsSubPages.push( - { - title: "AI", - href: "/builder/portal/settings/ai", - } - ) + settingsSubPages.push({ + title: "AI", + href: "/builder/portal/settings/ai", + }) } if (!cloud) { diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index a8dfbe6360..d51ae65c51 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -343,7 +343,9 @@ async function enrichAIConfig(aiConfig: AIConfig) { // Return the Budibase AI data source as part of the response if licensing allows const budibaseAIEnabled = await pro.features.isBudibaseAIEnabled() - const defaultConfigExists = Object.keys(aiConfig.config).some(key => aiConfig.config[key].isDefault) + const defaultConfigExists = Object.keys(aiConfig.config).some( + key => aiConfig.config[key].isDefault + ) if (budibaseAIEnabled) { aiConfig.config["budibase_ai"] = { provider: "OpenAI", diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 8b859dcb89..419c12ccb0 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -45,7 +45,9 @@ describe("Global configs controller", () => { }) it("Should return the default BB AI config when the feature is turned on", async () => { - jest.spyOn(pro.features, "isBudibaseAIEnabled").mockImplementation(() => true) + jest + .spyOn(pro.features, "isBudibaseAIEnabled") + .mockImplementation(() => true) configs.getConfig.mockResolvedValue({ config: { ai: { @@ -81,7 +83,9 @@ describe("Global configs controller", () => { }) it("Should not not return the default Budibase AI config when on self host", async () => { - jest.spyOn(pro.features, "isBudibaseAIEnabled").mockImplementation(() => false) + jest + .spyOn(pro.features, "isBudibaseAIEnabled") + .mockImplementation(() => false) configs.getConfig.mockResolvedValue({ config: { ai: { @@ -140,7 +144,6 @@ describe("Global configs controller", () => { await verifyAIConfig(newConfig, existingConfig) // should be unchanged - expect(newConfig.config.aiconfig.apiKey === "myapikey") + expect(newConfig.config.aiconfig.apiKey).toEqual("myapikey") }) - }) From 44a76d67309a64dd88d657731915e44dc133e7fd Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 15:12:15 +0100 Subject: [PATCH 26/36] add anthropic baseURL --- .../builder/portal/settings/ai/{constants.ts => constants.js} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename packages/builder/src/pages/builder/portal/settings/ai/{constants.ts => constants.js} (97%) diff --git a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts b/packages/builder/src/pages/builder/portal/settings/ai/constants.js similarity index 97% rename from packages/builder/src/pages/builder/portal/settings/ai/constants.ts rename to packages/builder/src/pages/builder/portal/settings/ai/constants.js index 7ff43582e0..deb647f90a 100644 --- a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts +++ b/packages/builder/src/pages/builder/portal/settings/ai/constants.js @@ -44,7 +44,7 @@ export const ConfigMap = { }, Anthropic: { name: "Anthropic", - baseUrl: "", + baseUrl: "https://api.anthropic.com/v1", }, TogetherAI: { name: "TogetherAI", From 2eb53c018ae1bd19c397a52a758e4713ab160f24 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 15:19:41 +0100 Subject: [PATCH 27/36] sort settings pages --- packages/builder/src/stores/portal/menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js index a572539863..19b190fd24 100644 --- a/packages/builder/src/stores/portal/menu.js +++ b/packages/builder/src/stores/portal/menu.js @@ -84,7 +84,7 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { menu.push({ title: "Settings", href: "/builder/portal/settings", - subPages: settingsSubPages, + subPages: [...settingsSubPages].sort((a, b) => a.title.localeCompare(b.title)), }) } From 1ee8a12e290505ad5664823d388b6783005b04a8 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 16:01:00 +0100 Subject: [PATCH 28/36] use real data instead of mocks --- .../controllers/global/tests/configs.spec.ts | 159 +++++++----------- packages/worker/src/tests/api/configs.ts | 9 + .../worker/src/tests/structures/configs.ts | 19 ++- 3 files changed, 86 insertions(+), 101 deletions(-) diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 419c12ccb0..1a6e6b7075 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -1,46 +1,36 @@ -import { configs } from "@budibase/backend-core" -import { UserCtx } from "@budibase/types" import * as pro from "@budibase/pro" -import { find, verifyAIConfig } from "../configs" - -jest.mock("@budibase/backend-core", () => ({ - ...jest.requireActual("@budibase/backend-core"), - configs: { - getConfig: jest.fn(), - save: jest.fn(), - }, -})) +import { verifyAIConfig } from "../configs" +import { TestConfiguration, structures } from "../../../../tests" describe("Global configs controller", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + afterEach(() => { jest.resetAllMocks() }) it("Should strip secrets when pulling AI config", async () => { - configs.getConfig.mockResolvedValue({ - config: { - ai: { - apiKey: "abc123APIKey", - baseUrl: "https://api.example.com", - }, - }, - }) - const ctx = { - params: { - type: "ai", - }, - throw: jest.fn(), - } as UserCtx - - await find(ctx) - - expect(ctx.body).toEqual({ - config: { - ai: { - apiKey: "--secret-value--", - baseUrl: "https://api.example.com", - }, - }, + const data = structures.configs.ai() + await config.api.configs.saveConfig(data) + const response = await config.api.configs.getAIConfig() + expect(response.body.config).toEqual({ + ai: { + active: true, + apiKey: "--secret-value--", + baseUrl: "https://api.example.com", + defaultModel: "gpt4", + isDefault: false, + name: "Test", + provider: "OpenAI" + } }) }) @@ -48,36 +38,25 @@ describe("Global configs controller", () => { jest .spyOn(pro.features, "isBudibaseAIEnabled") .mockImplementation(() => true) - configs.getConfig.mockResolvedValue({ - config: { - ai: { - apiKey: "abc123APIKey", - baseUrl: "https://api.example.com", - }, - }, - }) - const ctx = { - params: { - type: "ai", - }, - throw: jest.fn(), - } as UserCtx + const data = structures.configs.ai() + await config.api.configs.saveConfig(data) + const response = await config.api.configs.getAIConfig() - await find(ctx) - - expect(ctx.body).toEqual({ - config: { - budibase_ai: { - provider: "OpenAI", - active: true, - isDefault: true, - defaultModel: undefined, - name: "Budibase AI", - }, - ai: { - apiKey: "--secret-value--", - baseUrl: "https://api.example.com", - }, + expect(response.body.config).toEqual({ + budibase_ai: { + provider: "OpenAI", + active: true, + isDefault: true, + name: "Budibase AI", + }, + ai: { + active: true, + apiKey: "--secret-value--", + baseUrl: "https://api.example.com", + defaultModel: "gpt4", + isDefault: false, + name: "Test", + provider: "OpenAI" }, }) }) @@ -86,49 +65,29 @@ describe("Global configs controller", () => { jest .spyOn(pro.features, "isBudibaseAIEnabled") .mockImplementation(() => false) - configs.getConfig.mockResolvedValue({ - config: { - ai: { - apiKey: "abc123APIKey", - baseUrl: "https://api.example.com", - }, - }, - }) - const ctx = { - params: { - type: "ai", - }, - throw: jest.fn(), - } as UserCtx + const data = structures.configs.ai() + await config.api.configs.saveConfig(data) + const response = await config.api.configs.getAIConfig() - await find(ctx) - - expect(ctx.body).toEqual({ - config: { - ai: { - apiKey: "--secret-value--", - baseUrl: "https://api.example.com", - }, + expect(response.body.config).toEqual({ + ai: { + active: true, + apiKey: "--secret-value--", + baseUrl: "https://api.example.com", + defaultModel: "gpt4", + isDefault: false, + name: "Test", + provider: "OpenAI" }, }) }) it("Should not update existing secrets when updating an existing AI Config", async () => { - const newConfig = { - type: "ai", - config: { - aiconfig: { - provider: "OpenAI", - isDefault: true, - name: "MyConfig", - active: true, - defaultModel: "gpt4", - apiKey: "--secret-value--", - }, - }, - } + const data = structures.configs.ai() + await config.api.configs.saveConfig(data) + const existingConfig = await config.api.configs.getAIConfig() - const existingConfig = { + const newConfig = { type: "ai", config: { aiconfig: { diff --git a/packages/worker/src/tests/api/configs.ts b/packages/worker/src/tests/api/configs.ts index 86fe0830ca..c64419b490 100644 --- a/packages/worker/src/tests/api/configs.ts +++ b/packages/worker/src/tests/api/configs.ts @@ -22,6 +22,15 @@ export class ConfigAPI extends TestAPI { .expect("Content-Type", /json/) } + getAIConfig = () => { + return this.request + .get(`/api/global/configs/ai`) + .set(this.config.defaultHeaders()) + .expect(200) + .expect("Content-Type", /json/) + } + + saveConfig = (data: any) => { return this.request .post(`/api/global/configs`) diff --git a/packages/worker/src/tests/structures/configs.ts b/packages/worker/src/tests/structures/configs.ts index bac94a4154..e1fd835d41 100644 --- a/packages/worker/src/tests/structures/configs.ts +++ b/packages/worker/src/tests/structures/configs.ts @@ -4,7 +4,7 @@ import { ConfigType, SMTPConfig, GoogleConfig, - OIDCConfig, + OIDCConfig, AIConfig, } from "@budibase/types" export function oidc(conf?: any): OIDCConfig { @@ -81,3 +81,20 @@ export function settings(conf?: any): SettingsConfig { }, } } + +export function ai(): AIConfig { + return { + type: ConfigType.AI, + config: { + ai: { + provider: "OpenAI", + isDefault: false, + name: "Test", + active: true, + defaultModel: "gpt4", + apiKey: "abc123APIKey", + baseUrl: "https://api.example.com", + }, + } + } +} From c6907eb09e325b167dd83db93cf7fdb12ea1602d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 16:41:44 +0100 Subject: [PATCH 29/36] fix types --- packages/builder/src/stores/portal/menu.js | 4 ++- packages/types/src/documents/global/config.ts | 2 +- .../src/api/controllers/global/configs.ts | 9 +++--- .../controllers/global/tests/configs.spec.ts | 31 +++++++++---------- packages/worker/src/tests/api/configs.ts | 1 - .../worker/src/tests/structures/configs.ts | 5 +-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js index 19b190fd24..a1b5450ea4 100644 --- a/packages/builder/src/stores/portal/menu.js +++ b/packages/builder/src/stores/portal/menu.js @@ -84,7 +84,9 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { menu.push({ title: "Settings", href: "/builder/portal/settings", - subPages: [...settingsSubPages].sort((a, b) => a.title.localeCompare(b.title)), + subPages: [...settingsSubPages].sort((a, b) => + a.title.localeCompare(b.title) + ), }) } diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index 6e9c29af97..8d64b49ee9 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -121,7 +121,7 @@ export interface AIInnerConfig { active: boolean baseUrl?: string apiKey?: string - defaultModel: string + defaultModel?: string } } diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index d51ae65c51..0760a6c692 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -32,6 +32,7 @@ import { AIConfig, PASSWORD_REPLACEMENT, isAIConfig, + AIInnerConfig, } from "@budibase/types" import * as pro from "@budibase/pro" @@ -210,13 +211,13 @@ async function verifyOIDCConfig(config: OIDCConfigs) { } export async function verifyAIConfig( - config: AIConfig, + configToSave: AIInnerConfig, existingConfig: AIConfig ) { // ensure that the redacted API keys are not overwritten in the DB for (let uuid in existingConfig.config) { - if (config[uuid]?.apiKey === PASSWORD_REPLACEMENT) { - config[uuid].apiKey = existingConfig.config[uuid].apiKey + if (configToSave[uuid]?.apiKey === PASSWORD_REPLACEMENT) { + configToSave[uuid].apiKey = existingConfig.config[uuid].apiKey } } } @@ -351,7 +352,7 @@ async function enrichAIConfig(aiConfig: AIConfig) { provider: "OpenAI", active: true, isDefault: !defaultConfigExists, - defaultModel: env.BUDIBASE_AI_DEFAULT_MODEL, + defaultModel: env.BUDIBASE_AI_DEFAULT_MODEL || "", name: "Budibase AI", } } diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 1a6e6b7075..06d1ad0b2f 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -1,6 +1,7 @@ import * as pro from "@budibase/pro" import { verifyAIConfig } from "../configs" import { TestConfiguration, structures } from "../../../../tests" +import { AIInnerConfig } from "@budibase/types" describe("Global configs controller", () => { const config = new TestConfiguration() @@ -29,8 +30,8 @@ describe("Global configs controller", () => { defaultModel: "gpt4", isDefault: false, name: "Test", - provider: "OpenAI" - } + provider: "OpenAI", + }, }) }) @@ -56,7 +57,7 @@ describe("Global configs controller", () => { defaultModel: "gpt4", isDefault: false, name: "Test", - provider: "OpenAI" + provider: "OpenAI", }, }) }) @@ -77,7 +78,7 @@ describe("Global configs controller", () => { defaultModel: "gpt4", isDefault: false, name: "Test", - provider: "OpenAI" + provider: "OpenAI", }, }) }) @@ -87,22 +88,18 @@ describe("Global configs controller", () => { await config.api.configs.saveConfig(data) const existingConfig = await config.api.configs.getAIConfig() - const newConfig = { - type: "ai", - config: { - aiconfig: { - provider: "OpenAI", - isDefault: true, - name: "MyConfig", - active: true, - defaultModel: "gpt4", - apiKey: "myapikey", - }, + const newConfig: AIInnerConfig = { + aiconfig: { + provider: "OpenAI", + isDefault: true, + name: "MyConfig", + active: true, + defaultModel: "gpt4", }, } - await verifyAIConfig(newConfig, existingConfig) + await verifyAIConfig(newConfig, existingConfig.body) // should be unchanged - expect(newConfig.config.aiconfig.apiKey).toEqual("myapikey") + expect(newConfig.aiconfig.apiKey).toEqual("myapikey") }) }) diff --git a/packages/worker/src/tests/api/configs.ts b/packages/worker/src/tests/api/configs.ts index c64419b490..e0c1c806af 100644 --- a/packages/worker/src/tests/api/configs.ts +++ b/packages/worker/src/tests/api/configs.ts @@ -30,7 +30,6 @@ export class ConfigAPI extends TestAPI { .expect("Content-Type", /json/) } - saveConfig = (data: any) => { return this.request .post(`/api/global/configs`) diff --git a/packages/worker/src/tests/structures/configs.ts b/packages/worker/src/tests/structures/configs.ts index e1fd835d41..9257e813cb 100644 --- a/packages/worker/src/tests/structures/configs.ts +++ b/packages/worker/src/tests/structures/configs.ts @@ -4,7 +4,8 @@ import { ConfigType, SMTPConfig, GoogleConfig, - OIDCConfig, AIConfig, + OIDCConfig, + AIConfig, } from "@budibase/types" export function oidc(conf?: any): OIDCConfig { @@ -95,6 +96,6 @@ export function ai(): AIConfig { apiKey: "abc123APIKey", baseUrl: "https://api.example.com", }, - } + }, } } From 87adb99073e31cc4fdca7149cd07d9b7c74285e2 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 16:42:56 +0100 Subject: [PATCH 30/36] update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 62586bc47b..ec1d2bda75 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 62586bc47bf2af507356b0e1e64df8b0ae9fad43 +Subproject commit ec1d2bda756f02c6b4efdee086e4c59b0c2a1b0c From 304b2a5c61853e4e71f0216a086d1344688408bb Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 16:45:32 +0100 Subject: [PATCH 31/36] Update packages/worker/src/api/controllers/global/configs.ts Co-authored-by: Sam Rose --- packages/worker/src/api/controllers/global/configs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 0760a6c692..70b2279f6c 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -215,7 +215,7 @@ export async function verifyAIConfig( existingConfig: AIConfig ) { // ensure that the redacted API keys are not overwritten in the DB - for (let uuid in existingConfig.config) { + for (const uuid in existingConfig.config) { if (configToSave[uuid]?.apiKey === PASSWORD_REPLACEMENT) { configToSave[uuid].apiKey = existingConfig.config[uuid].apiKey } From 5c9f88de59c8d84aaf90be316d7a0446eaecd698 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 16:51:22 +0100 Subject: [PATCH 32/36] account portal ref --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index ce60bf9231..4bef13d035 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit ce60bf923115855a9cd0bb991297cccd308eae13 +Subproject commit 4bef13d035217b65c7f2107e1f8dfc04e7a56787 From 38fc65c5419082dd106c8fab764f9f6a5de61842 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 22:25:47 +0100 Subject: [PATCH 33/36] fix tests --- .../src/api/controllers/global/tests/configs.spec.ts | 9 +++++---- packages/worker/src/tests/structures/configs.ts | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index 06d1ad0b2f..ad9efc4398 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -49,6 +49,7 @@ describe("Global configs controller", () => { active: true, isDefault: true, name: "Budibase AI", + defaultModel: "", }, ai: { active: true, @@ -86,20 +87,20 @@ describe("Global configs controller", () => { it("Should not update existing secrets when updating an existing AI Config", async () => { const data = structures.configs.ai() await config.api.configs.saveConfig(data) - const existingConfig = await config.api.configs.getAIConfig() const newConfig: AIInnerConfig = { - aiconfig: { + ai: { provider: "OpenAI", isDefault: true, + apiKey: "--secret-value--", name: "MyConfig", active: true, defaultModel: "gpt4", }, } - await verifyAIConfig(newConfig, existingConfig.body) + await verifyAIConfig(newConfig, data) // should be unchanged - expect(newConfig.aiconfig.apiKey).toEqual("myapikey") + expect(newConfig.ai.apiKey).toEqual("myapikey") }) }) diff --git a/packages/worker/src/tests/structures/configs.ts b/packages/worker/src/tests/structures/configs.ts index 9257e813cb..5aa073408c 100644 --- a/packages/worker/src/tests/structures/configs.ts +++ b/packages/worker/src/tests/structures/configs.ts @@ -93,7 +93,7 @@ export function ai(): AIConfig { name: "Test", active: true, defaultModel: "gpt4", - apiKey: "abc123APIKey", + apiKey: "myapikey", baseUrl: "https://api.example.com", }, }, From a27be54b691336f7edcd128fc2b2e7466f2035ef Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 22:38:45 +0100 Subject: [PATCH 34/36] make mocks async --- .../worker/src/api/controllers/global/tests/configs.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/controllers/global/tests/configs.spec.ts b/packages/worker/src/api/controllers/global/tests/configs.spec.ts index ad9efc4398..3ff6a5298c 100644 --- a/packages/worker/src/api/controllers/global/tests/configs.spec.ts +++ b/packages/worker/src/api/controllers/global/tests/configs.spec.ts @@ -38,7 +38,7 @@ describe("Global configs controller", () => { it("Should return the default BB AI config when the feature is turned on", async () => { jest .spyOn(pro.features, "isBudibaseAIEnabled") - .mockImplementation(() => true) + .mockImplementation(() => Promise.resolve(true)) const data = structures.configs.ai() await config.api.configs.saveConfig(data) const response = await config.api.configs.getAIConfig() @@ -66,7 +66,7 @@ describe("Global configs controller", () => { it("Should not not return the default Budibase AI config when on self host", async () => { jest .spyOn(pro.features, "isBudibaseAIEnabled") - .mockImplementation(() => false) + .mockImplementation(() => Promise.resolve(false)) const data = structures.configs.ai() await config.api.configs.saveConfig(data) const response = await config.api.configs.getAIConfig() From a5ff0d5ddc9c597bc8bb32fbe03c2c50cd799666 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 10 Sep 2024 22:55:14 +0100 Subject: [PATCH 35/36] update acct portal ref --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index 4bef13d035..c587ebc17a 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 4bef13d035217b65c7f2107e1f8dfc04e7a56787 +Subproject commit c587ebc17adf778bb02a77732cc0b2cc63399a93 From fcc03814744fcb55ac261de41f29697309f40f38 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 11 Sep 2024 09:42:29 +0100 Subject: [PATCH 36/36] update account portal ref --- packages/account-portal | 2 +- packages/types/src/sdk/licensing/feature.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/account-portal b/packages/account-portal index c587ebc17a..048c37ecd9 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit c587ebc17adf778bb02a77732cc0b2cc63399a93 +Subproject commit 048c37ecd921340614bf61a76a774aaa46176569 diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts index cbcb16f7b6..9d09f1d14f 100644 --- a/packages/types/src/sdk/licensing/feature.ts +++ b/packages/types/src/sdk/licensing/feature.ts @@ -16,7 +16,7 @@ export enum Feature { VIEW_PERMISSIONS = "viewPermissions", VIEW_READONLY_COLUMNS = "viewReadonlyColumns", BUDIBASE_AI = "budibaseAI", - AI_CUSTOM_CONFIGS = "customAIConfigs", + AI_CUSTOM_CONFIGS = "aiCustomConfigs", } export type PlanFeatures = { [key in PlanType]: Feature[] | undefined }