Merge branch 'master' of github.com:Budibase/budibase into chore/api-typing-3

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.2.22",
+  "version": "3.2.24",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

packages/builder/src/components/common/bindings/SnippetDrawer.svelte

@@ -63,7 +63,7 @@
     if (!name?.length) {
       return "Name is required"
     }
-    if (snippets.some(snippet => snippet.name === name)) {
+    if (!snippet?.name && snippets.some(snippet => snippet.name === name)) {
       return "That name is already in use"
     }
     if (firstCharNumberRegex.test(name)) {
@@ -106,11 +106,7 @@
         Delete
       </Button>
     {/if}
-    <Button
+    <Button cta on:click={saveSnippet} disabled={!code || loading || nameError}>
-      cta
-      on:click={saveSnippet}
-      disabled={!snippet && (loading || nameError)}
-    >
       Save
     </Button>
   </svelte:fragment>

packages/builder/src/components/common/bindings/SnippetSidePanel.svelte

@@ -186,7 +186,7 @@
   <div class="snippet-popover">
     {#key hoveredSnippet}
       <CodeEditor
-        value={hoveredSnippet.code.trim()}
+        value={hoveredSnippet.code?.trim()}
         mode={EditorModes.JS}
         readonly
       />

packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte

@@ -52,9 +52,16 @@
   let modal
 
   $: text = value?.label ?? "Choose an option"
-  $: tables = $tablesStore.list.map(table =>
+  $: tables = $tablesStore.list
-    format.table(table, $datasources.list)
+    .map(table => format.table(table, $datasources.list))
-  )
+    .sort((a, b) => {
+      // sort tables alphabetically, grouped by datasource
+      const dsComparison = a.datasourceName.localeCompare(b.datasourceName)
+      if (dsComparison !== 0) {
+        return dsComparison
+      }
+      return a.label.localeCompare(b.label)
+    })
   $: viewsV1 = $viewsStore.list.map(view => ({
     ...view,
     label: view.name,

packages/pro

@@ -1 +1 @@
-Subproject commit e60f4b1b364fd49d2bb082f298757f83cb2032f0
+Subproject commit 7b8789efd940d9f8e5be9927243b19f07361c445

packages/server/src/api/controllers/integration.ts

@@ -26,7 +26,7 @@ export async function find(ctx: UserCtx<void, FindIntegrationResponse>) {
   }
   const integration = await getDefinition(ctx.params.type)
   if (!integration) {
-    ctx.throw(400, "Integration not found")
+    ctx.throw(404, "Integration not found")
   }
   ctx.body = integration
 }

packages/server/src/api/controllers/layout.ts

@@ -2,7 +2,6 @@ import { EMPTY_LAYOUT } from "../../constants/layouts"
 import { generateLayoutID, getScreenParams } from "../../db/utils"
 import { events, context } from "@budibase/backend-core"
 import {
-  BBContext,
   DeleteLayoutResponse,
   Layout,
   SaveLayoutRequest,

packages/server/src/api/controllers/plugin/file.ts

@@ -3,9 +3,9 @@ import {
   getPluginMetadata,
   extractTarball,
 } from "../../../utilities/fileSystem"
-import { FileType } from "@budibase/types"
+import { KoaFile } from "@budibase/types"
 
-export async function fileUpload(file: FileType) {
+export async function fileUpload(file: KoaFile) {
   if (!file.name || !file.path) {
     throw new Error("File is not valid - cannot upload.")
   }

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

@@ -48,7 +48,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: async () => ({
-        initialised: true,
+        llm: {},
         run: jest.fn(() => `Mock LLM Response`),
         buildPromptFromAIOperation: jest.fn(),
       }),

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

@@ -52,7 +52,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: async () => ({
-        initialised: true,
+        llm: {},
         run: jest.fn(() => `Mock LLM Response`),
         buildPromptFromAIOperation: jest.fn(),
       }),

packages/server/src/automations/steps/executeQuery.ts

@@ -12,7 +12,6 @@ import {
   ExecuteQueryStepInputs,
   ExecuteQueryStepOutputs,
 } from "@budibase/types"
-import { executeV2AsAutomation } from "../../api/controllers/query"
 
 export const definition: AutomationStepDefinition = {
   name: "External Data Connector",

packages/server/src/automations/steps/openai.ts

@@ -106,13 +106,15 @@ export async function run({
       (await features.flags.isEnabled(FeatureFlag.BUDIBASE_AI)) &&
       (await pro.features.isBudibaseAIEnabled())
 
-    let llm
+    let llmWrapper
     if (budibaseAIEnabled || customConfigsEnabled) {
-      llm = await pro.ai.LargeLanguageModel.forCurrentTenant(inputs.model)
+      llmWrapper = await pro.ai.LargeLanguageModel.forCurrentTenant(
+        inputs.model
+      )
     }
 
-    response = llm?.initialised
+    response = llmWrapper?.llm
-      ? await llm.run(inputs.prompt)
+      ? await llmWrapper.run(inputs.prompt)
       : await legacyOpenAIPrompt(inputs)
 
     return {

packages/server/src/automations/tests/openai.spec.ts

@@ -27,7 +27,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: jest.fn().mockImplementation(() => ({
-        initialised: true,
+        llm: {},
         init: jest.fn(),
         run: jest.fn(),
       })),

packages/server/src/sdk/plugins/plugins.ts

@@ -1,4 +1,4 @@
-import { FileType, Plugin, PluginSource, PluginType } from "@budibase/types"
+import { KoaFile, Plugin, PluginSource, PluginType } from "@budibase/types"
 import {
   db as dbCore,
   objectStore,
@@ -26,7 +26,7 @@ export async function fetch(type?: PluginType): Promise<Plugin[]> {
   }
 }
 
-export async function processUploaded(plugin: FileType, source?: PluginSource) {
+export async function processUploaded(plugin: KoaFile, source?: PluginSource) {
   const { metadata, directory } = await fileUpload(plugin)
   pluginCore.validate(metadata?.schema)
 

packages/server/src/utilities/rowProcessor/tests/utils.spec.ts

@@ -18,7 +18,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: async () => ({
-        initialised: true,
+        llm: {},
         run: jest.fn(() => "response from LLM"),
         buildPromptFromAIOperation: buildPromptMock,
       }),

packages/server/src/utilities/rowProcessor/utils.ts

@@ -126,8 +126,10 @@ export async function processAIColumns<T extends Row | Row[]>(
     const numRows = Array.isArray(inputRows) ? inputRows.length : 1
     span?.addTags({ table_id: table._id, numRows })
     const rows = Array.isArray(inputRows) ? inputRows : [inputRows]
-    const llm = await pro.ai.LargeLanguageModel.forCurrentTenant("gpt-4o-mini")
+    const llmWrapper = await pro.ai.LargeLanguageModel.forCurrentTenant(
-    if (rows && llm.initialised) {
+      "gpt-4o-mini"
+    )
+    if (rows && llmWrapper.llm) {
       // Ensure we have snippet context
       await context.ensureSnippetContext()
 
@@ -151,14 +153,14 @@ export async function processAIColumns<T extends Row | Row[]>(
             }
           }
 
-          const prompt = llm.buildPromptFromAIOperation({
+          const prompt = llmWrapper.buildPromptFromAIOperation({
             schema: aiSchema,
             row,
           })
 
           return tracer.trace("processAIColumn", {}, async span => {
             span?.addTags({ table_id: table._id, column })
-            const llmResponse = await llm.run(prompt!)
+            const llmResponse = await llmWrapper.run(prompt!)
             return {
               ...row,
               [column]: llmResponse,

packages/types/src/documents/global/plugin.ts

@@ -12,7 +12,7 @@ export enum PluginSource {
   URL = "URL",
   FILE = "File Upload",
 }
-export interface FileType {
+export interface KoaFile {
   path: string | null
   name: string | null
 }