Merge branch 'master' of github.com:Budibase/budibase into fix/all-feature-flag-enum

This commit is contained in:
mike12345567 2024-10-18 18:24:02 +01:00
commit 24dbb0cef9
13 changed files with 131 additions and 6 deletions

View File

@ -17,7 +17,7 @@ import SchemaBuilder = Knex.SchemaBuilder
import CreateTableBuilder = Knex.CreateTableBuilder import CreateTableBuilder = Knex.CreateTableBuilder
function isIgnoredType(type: FieldType) { function isIgnoredType(type: FieldType) {
const ignored = [FieldType.LINK, FieldType.FORMULA] const ignored = [FieldType.LINK, FieldType.FORMULA, FieldType.AI]
return ignored.indexOf(type) !== -1 return ignored.indexOf(type) !== -1
} }
@ -144,6 +144,9 @@ function generateSchema(
case FieldType.FORMULA: case FieldType.FORMULA:
// This is allowed, but nothing to do on the external datasource // This is allowed, but nothing to do on the external datasource
break break
case FieldType.AI:
// This is allowed, but nothing to do on the external datasource
break
case FieldType.ATTACHMENTS: case FieldType.ATTACHMENTS:
case FieldType.ATTACHMENT_SINGLE: case FieldType.ATTACHMENT_SINGLE:
case FieldType.SIGNATURE_SINGLE: case FieldType.SIGNATURE_SINGLE:

View File

@ -2074,6 +2074,7 @@ describe.each([
) )
tableId = table._id! tableId = table._id!
// @ts-ignore - until AI implemented
const rowValues: Record<keyof typeof fullSchema, any> = { const rowValues: Record<keyof typeof fullSchema, any> = {
[FieldType.STRING]: generator.guid(), [FieldType.STRING]: generator.guid(),
[FieldType.LONGFORM]: generator.paragraph(), [FieldType.LONGFORM]: generator.paragraph(),

View File

@ -206,7 +206,7 @@ describe.each([
visible: false, visible: false,
icon: "ic", icon: "ic",
}, },
} as Record<string, FieldSchema>, } as ViewV2Schema,
} }
const createdView = await config.api.viewV2.create(newView) const createdView = await config.api.viewV2.create(newView)
@ -250,7 +250,7 @@ describe.each([
name: "Category", name: "Category",
type: FieldType.STRING, type: FieldType.STRING,
}, },
} as Record<string, FieldSchema>, } as ViewV2Schema,
} }
await config.api.viewV2.create(newView, { await config.api.viewV2.create(newView, {
@ -1044,7 +1044,7 @@ describe.each([
visible: false, visible: false,
icon: "ic", icon: "ic",
}, },
} as Record<string, FieldSchema>, } as ViewV2Schema,
}) })
expect(updatedView).toEqual({ expect(updatedView).toEqual({
@ -1078,7 +1078,7 @@ describe.each([
name: "Category", name: "Category",
type: FieldType.STRING, type: FieldType.STRING,
}, },
} as Record<string, FieldSchema>, } as ViewV2Schema,
}, },
{ {
status: 200, status: 200,

View File

@ -56,6 +56,7 @@ interface AuthTokenResponse {
const isTypeAllowed: Record<FieldType, boolean> = { const isTypeAllowed: Record<FieldType, boolean> = {
[FieldType.STRING]: true, [FieldType.STRING]: true,
[FieldType.FORMULA]: true, [FieldType.FORMULA]: true,
[FieldType.AI]: true,
[FieldType.NUMBER]: true, [FieldType.NUMBER]: true,
[FieldType.LONGFORM]: true, [FieldType.LONGFORM]: true,
[FieldType.DATETIME]: true, [FieldType.DATETIME]: true,
@ -490,7 +491,8 @@ export class GoogleSheetsIntegration implements DatasourcePlus {
} }
if ( if (
!sheet.headerValues.includes(key) && !sheet.headerValues.includes(key) &&
column.type !== FieldType.FORMULA column.type !== FieldType.FORMULA &&
column.type !== FieldType.AI
) { ) {
updatedHeaderValues.push(key) updatedHeaderValues.push(key)
} }

View File

@ -242,6 +242,7 @@ function copyExistingPropsOver(
let shouldKeepSchema = false let shouldKeepSchema = false
switch (existingColumnType) { switch (existingColumnType) {
case FieldType.FORMULA: case FieldType.FORMULA:
case FieldType.AI:
case FieldType.AUTO: case FieldType.AUTO:
case FieldType.INTERNAL: case FieldType.INTERNAL:
shouldKeepSchema = true shouldKeepSchema = true

View File

@ -19,6 +19,7 @@ const FieldTypeMap: Record<FieldType, SQLiteType> = {
[FieldType.BOOLEAN]: SQLiteType.NUMERIC, [FieldType.BOOLEAN]: SQLiteType.NUMERIC,
[FieldType.DATETIME]: SQLiteType.TEXT, [FieldType.DATETIME]: SQLiteType.TEXT,
[FieldType.FORMULA]: SQLiteType.TEXT, [FieldType.FORMULA]: SQLiteType.TEXT,
[FieldType.AI]: SQLiteType.TEXT,
[FieldType.LONGFORM]: SQLiteType.TEXT, [FieldType.LONGFORM]: SQLiteType.TEXT,
[FieldType.NUMBER]: SQLiteType.REAL, [FieldType.NUMBER]: SQLiteType.REAL,
[FieldType.STRING]: SQLiteType.TEXT, [FieldType.STRING]: SQLiteType.TEXT,

View File

@ -605,6 +605,7 @@ export function fullSchemaWithoutLinks({
}): { }): {
[type in Exclude<FieldType, FieldType.LINK>]: FieldSchema & { type: type } [type in Exclude<FieldType, FieldType.LINK>]: FieldSchema & { type: type }
} { } {
// @ts-ignore - until AI implemented
return { return {
[FieldType.STRING]: { [FieldType.STRING]: {
name: "string", name: "string",

View File

@ -8,6 +8,7 @@ const allowDisplayColumnByType: Record<FieldType, boolean> = {
[FieldType.NUMBER]: true, [FieldType.NUMBER]: true,
[FieldType.DATETIME]: true, [FieldType.DATETIME]: true,
[FieldType.FORMULA]: true, [FieldType.FORMULA]: true,
[FieldType.AI]: true,
[FieldType.AUTO]: true, [FieldType.AUTO]: true,
[FieldType.INTERNAL]: true, [FieldType.INTERNAL]: true,
[FieldType.BARCODEQR]: true, [FieldType.BARCODEQR]: true,
@ -38,6 +39,7 @@ const allowSortColumnByType: Record<FieldType, boolean> = {
[FieldType.JSON]: true, [FieldType.JSON]: true,
[FieldType.FORMULA]: false, [FieldType.FORMULA]: false,
[FieldType.AI]: false,
[FieldType.ATTACHMENTS]: false, [FieldType.ATTACHMENTS]: false,
[FieldType.ATTACHMENT_SINGLE]: false, [FieldType.ATTACHMENT_SINGLE]: false,
[FieldType.SIGNATURE_SINGLE]: false, [FieldType.SIGNATURE_SINGLE]: false,
@ -62,6 +64,7 @@ const allowDefaultColumnByType: Record<FieldType, boolean> = {
[FieldType.BIGINT]: false, [FieldType.BIGINT]: false,
[FieldType.BOOLEAN]: false, [FieldType.BOOLEAN]: false,
[FieldType.FORMULA]: false, [FieldType.FORMULA]: false,
[FieldType.AI]: false,
[FieldType.ATTACHMENTS]: false, [FieldType.ATTACHMENTS]: false,
[FieldType.ATTACHMENT_SINGLE]: false, [FieldType.ATTACHMENT_SINGLE]: false,
[FieldType.SIGNATURE_SINGLE]: false, [FieldType.SIGNATURE_SINGLE]: false,

View File

@ -76,6 +76,13 @@ export enum FieldType {
* that is part of the initial formula definition, the formula will be live evaluated in the browser. * that is part of the initial formula definition, the formula will be live evaluated in the browser.
*/ */
AUTO = "auto", AUTO = "auto",
/**
* A complex type, called an AI column within Budibase. This type is only supported against internal tables
* and calculates the output based on a chosen operation (summarise text, translation etc) which passes to
* the configured Budibase Large Language Model to retrieve the output and write it back into the row.
* AI fields function in a similar fashion to static formulas, and possess many of the same characteristics.
*/
AI = "ai",
/** /**
* a JSON type, called JSON within Budibase. This type allows any arbitrary JSON to be input to this column * a JSON type, called JSON within Budibase. This type allows any arbitrary JSON to be input to this column
* type, which will be represented as a JSON object in the row. This type depends on a schema being * type, which will be represented as a JSON object in the row. This type depends on a schema being

View File

@ -30,6 +30,7 @@ export enum JsonFieldSubType {
export enum FormulaType { export enum FormulaType {
STATIC = "static", STATIC = "static",
DYNAMIC = "dynamic", DYNAMIC = "dynamic",
AI = "ai",
} }
export enum BBReferenceFieldSubType { export enum BBReferenceFieldSubType {

View File

@ -9,6 +9,7 @@ import {
JsonFieldSubType, JsonFieldSubType,
RelationshipType, RelationshipType,
} from "./constants" } from "./constants"
import { AIOperationEnum } from "../../../sdk/ai"
export interface UIFieldMetadata { export interface UIFieldMetadata {
order?: number order?: number
@ -116,6 +117,16 @@ export interface FormulaFieldMetadata extends BaseFieldSchema {
formulaType?: FormulaType formulaType?: FormulaType
} }
export interface AIFieldMetadata extends BaseFieldSchema {
type: FieldType.AI
operation: AIOperationEnum
columns?: string[]
column?: string
categories?: string[]
prompt?: string
language?: string
}
export interface BBReferenceFieldMetadata export interface BBReferenceFieldMetadata
extends Omit<BaseFieldSchema, "subtype"> { extends Omit<BaseFieldSchema, "subtype"> {
type: FieldType.BB_REFERENCE type: FieldType.BB_REFERENCE
@ -194,6 +205,7 @@ interface OtherFieldMetadata extends BaseFieldSchema {
| FieldType.LINK | FieldType.LINK
| FieldType.AUTO | FieldType.AUTO
| FieldType.FORMULA | FieldType.FORMULA
| FieldType.AI
| FieldType.NUMBER | FieldType.NUMBER
| FieldType.LONGFORM | FieldType.LONGFORM
| FieldType.BB_REFERENCE | FieldType.BB_REFERENCE
@ -211,6 +223,7 @@ export type FieldSchema =
| RelationshipFieldMetadata | RelationshipFieldMetadata
| AutoColumnFieldMetadata | AutoColumnFieldMetadata
| FormulaFieldMetadata | FormulaFieldMetadata
| AIFieldMetadata
| NumberFieldMetadata | NumberFieldMetadata
| LongFormFieldMetadata | LongFormFieldMetadata
| StringFieldMetadata | StringFieldMetadata

View File

@ -0,0 +1,91 @@
export enum AIOperationEnum {
SUMMARISE_TEXT = "SUMMARISE_TEXT",
CLEAN_DATA = "CLEAN_DATA",
TRANSLATE = "TRANSLATE",
CATEGORISE_TEXT = "CATEGORISE_TEXT",
SENTIMENT_ANALYSIS = "SENTIMENT_ANALYSIS",
PROMPT = "PROMPT",
SEARCH_WEB = "SEARCH_WEB",
}
export enum OperationFieldTypeEnum {
MULTI_COLUMN = "columns",
COLUMN = "column",
BINDABLE_TEXT = "prompt",
}
export type OperationFieldsType = {
[AIOperationEnum.SUMMARISE_TEXT]: {
columns: OperationFieldTypeEnum.MULTI_COLUMN
}
[AIOperationEnum.CLEAN_DATA]: {
column: OperationFieldTypeEnum.COLUMN
}
[AIOperationEnum.TRANSLATE]: {
column: OperationFieldTypeEnum.COLUMN
language: OperationFieldTypeEnum.BINDABLE_TEXT
}
[AIOperationEnum.CATEGORISE_TEXT]: {
columns: OperationFieldTypeEnum.MULTI_COLUMN
categories: OperationFieldTypeEnum.BINDABLE_TEXT
}
[AIOperationEnum.SENTIMENT_ANALYSIS]: {
column: OperationFieldTypeEnum.COLUMN
}
[AIOperationEnum.PROMPT]: {
prompt: OperationFieldTypeEnum.BINDABLE_TEXT
}
[AIOperationEnum.SEARCH_WEB]: {
columns: OperationFieldTypeEnum.MULTI_COLUMN
}
}
type BaseSchema = {
operation: AIOperationEnum
}
type SummariseTextSchema = BaseSchema & {
operation: AIOperationEnum.SUMMARISE_TEXT
columns: string[]
}
type CleanDataSchema = BaseSchema & {
operation: AIOperationEnum.CLEAN_DATA
column: string
}
type TranslateSchema = BaseSchema & {
operation: AIOperationEnum.TRANSLATE
column: string
language: string
}
type CategoriseTextSchema = BaseSchema & {
operation: AIOperationEnum.CATEGORISE_TEXT
columns: string[]
categories: string[]
}
type SentimentAnalysisSchema = BaseSchema & {
operation: AIOperationEnum.SENTIMENT_ANALYSIS
column: string
}
type PromptSchema = BaseSchema & {
operation: AIOperationEnum.PROMPT
prompt: string
}
type SearchWebSchema = BaseSchema & {
operation: AIOperationEnum.SEARCH_WEB
columns: string[]
}
export type AIColumnSchema =
| SummariseTextSchema
| CleanDataSchema
| TranslateSchema
| CategoriseTextSchema
| SentimentAnalysisSchema
| PromptSchema
| SearchWebSchema

View File

@ -1,3 +1,4 @@
export * from "./ai"
export * from "./automations" export * from "./automations"
export * from "./hosting" export * from "./hosting"
export * from "./context" export * from "./context"