The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Update vector bucket SQL queries for wrappers ext 0.5.7 (#42274)
Joshen Lim9aa6e167c9d3
diff --git a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsxindex 5aafee8260e..1d4bcacf00d 100644--- a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx+++ b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx@@ -1,8 +1,4 @@import type { PostgresExtension } from '@supabase/postgres-meta'-import { Database, ExternalLinkIcon, Plus } from 'lucide-react'-import { useEffect, useState } from 'react'-import { toast } from 'sonner'-import { DocsButton } from 'components/ui/DocsButton'import { useDatabaseExtensionEnableMutation } from 'data/database-extensions/database-extension-enable-mutation'import { useSchemasQuery } from 'data/database/schemas-query'@@ -10,6 +6,9 @@ import { executeSql } from 'data/sql/execute-sql-query'import { useIsOrioleDb, useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { useProtectedSchemas } from 'hooks/useProtectedSchemas'import { DOCS_URL } from 'lib/constants'+import { Database, ExternalLinkIcon, Plus } from 'lucide-react'+import { useEffect, useState } from 'react'+import { toast } from 'sonner'import {AlertDescription_Shadcn_,AlertTitle_Shadcn_,@@ -108,6 +107,8 @@ const EnableExtensionModal = ({ visible, extension, onCancel }: EnableExtensionMreturn undefined}+ const isLoading = fetchingSchemaInfo || isSchemasLoading+const validate = (values: any) => {const errors: any = {}if (values.schema === 'custom' && !values.name) errors.name = 'Required field'@@ -170,7 +171,7 @@ const EnableExtensionModal = ({ visible, extension, onCancel }: EnableExtensionM</Admonition>)}- {fetchingSchemaInfo || isSchemasLoading ? (+ {isLoading ? (<div className="space-y-2"><ShimmeringLoader /><div className="w-3/4">@@ -269,7 +270,7 @@ const EnableExtensionModal = ({ visible, extension, onCancel }: EnableExtensionM<Button type="default" disabled={isEnabling} onClick={() => onCancel()}>Cancel</Button>- <Button htmlType="submit" disabled={isEnabling} loading={isEnabling}>+ <Button htmlType="submit" disabled={isEnabling || isLoading} loading={isEnabling}>Enable extension</Button></Modal.Content>diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsxindex bb79a037b79..03f2f808e53 100644--- a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsx+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsx@@ -1,10 +1,4 @@import { zodResolver } from '@hookform/resolvers/zod'-import { parseAsBoolean, useQueryState } from 'nuqs'-import { useState } from 'react'-import { SubmitHandler, useForm } from 'react-hook-form'-import { toast } from 'sonner'-import z from 'zod'-import { useQueryClient } from '@tanstack/react-query'import { useParams } from 'common'import { formatWrapperTables } from 'components/interfaces/Integrations/Wrappers/Wrappers.utils'@@ -16,6 +10,10 @@ import { useFDWUpdateMutation } from 'data/fdw/fdw-update-mutation'import { fdwKeys } from 'data/fdw/keys'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { DOCS_URL } from 'lib/constants'+import { parseAsBoolean, useQueryState } from 'nuqs'+import { useState } from 'react'+import { SubmitHandler, useForm } from 'react-hook-form'+import { toast } from 'sonner'import {Button,Dialog,@@ -26,13 +24,17 @@ import {DialogSectionSeparator,DialogTitle,DialogTrigger,- Form_Shadcn_,FormField_Shadcn_,+ Form_Shadcn_,Input_Shadcn_,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import z from 'zod'+import { getDecryptedParameters } from '../../Storage.utils'+import { useS3VectorsWrapperExtension } from '../useS3VectorsWrapper'import { useS3VectorsWrapperInstance } from '../useS3VectorsWrapperInstance'+import { isGreaterThanOrEqual } from '@/lib/semver'// Create foreign tables for vector bucketexport const InitializeForeignSchemaDialog = () => {@@ -45,6 +47,10 @@ export const InitializeForeignSchemaDialog = () => {const [isCreating, setIsCreating] = useState(false)const { data: wrapperInstance, meta: wrapperMeta } = useS3VectorsWrapperInstance({ bucketId })+ const { extension: wrappersExtension } = useS3VectorsWrapperExtension()+ const updatedImportForeignSchemaSyntax = !!wrappersExtension?.installed_version+ ? isGreaterThanOrEqual(wrappersExtension.installed_version, '0.5.7')+ : falseconst FormSchema = z.object({schema: z@@ -107,9 +113,9 @@ export const InitializeForeignSchemaDialog = () => {projectRef,connectionString: project?.connectionString,serverName: wrapperInstance.server_name,- sourceSchema: values.schema,+ sourceSchema: updatedImportForeignSchemaSyntax ? bucketId : values.schema,targetSchema: values.schema,- schemaOptions: [`bucket_name '${bucketId}'`],+ schemaOptions: updatedImportForeignSchemaSyntax ? undefined : [`bucket_name '${bucketId}'`],})toast.success(diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsxindex 9ececaf5dff..1b57d52ebc1 100644--- a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx@@ -1,8 +1,3 @@-import { ChevronDown, ListPlus } from 'lucide-react'-import Link from 'next/link'-import { parseAsBoolean, useQueryState } from 'nuqs'-import { useState } from 'react'-import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import { DocsButton } from 'components/ui/DocsButton'@@ -11,26 +6,33 @@ import { VectorBucketIndex } from 'data/storage/vector-buckets-indexes-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { SqlEditor } from 'icons'import { DOCS_URL } from 'lib/constants'+import { ChevronDown, ListPlus } from 'lucide-react'+import Link from 'next/link'+import { parseAsBoolean, useQueryState } from 'nuqs'+import { useState } from 'react'import {Button,- cn,CodeBlock,- Command_Shadcn_,CommandGroup_Shadcn_,CommandItem_Shadcn_,CommandList_Shadcn_,- Popover_Shadcn_,+ Command_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,+ Popover_Shadcn_,Sheet,SheetContent,SheetHeader,SheetSection,SheetTitle,SheetTrigger,+ cn,} from 'ui'import { Admonition } from 'ui-patterns'++import { useS3VectorsWrapperExtension } from '../useS3VectorsWrapper'import { useS3VectorsWrapperInstance } from '../useS3VectorsWrapperInstance'+import { isGreaterThanOrEqual } from '@/lib/semver'interface VectorBucketTableExamplesSheetProps {index: VectorBucketIndex@@ -147,6 +149,11 @@ function VectorBucketIndexExamples({const { data: wrapperInstance } = useS3VectorsWrapperInstance({ bucketId })const foreignTable = wrapperInstance?.tables?.find((x) => x.name === indexName)+ const { extension: wrappersExtension } = useS3VectorsWrapperExtension()+ const updatedImportForeignSchemaSyntax = !!wrappersExtension?.installed_version+ ? isGreaterThanOrEqual(wrappersExtension.installed_version, '0.5.7')+ : false+const dimensionLabel = `Data should match ${dimension} dimension${dimension > 1 ? 's' : ''}`const startValue = 0.1const dimensionComment = generateDimensionComment(dimension)@@ -159,12 +166,12 @@ insert intovalues('doc-1',- '[${dimensionExample}]'::embd${sqlComment},+ '[${dimensionExample}]'${updatedImportForeignSchemaSyntax ? '::s3vec' : '::embd'}${sqlComment},'{${metadataKeys.map((key) => `"${key}": "${key} value"`).join(', ')}}'::jsonb),('doc-2',- '[${dimensionExample}]'::embd${sqlComment},+ '[${dimensionExample}]'${updatedImportForeignSchemaSyntax ? '::s3vec' : '::embd'}${sqlComment},'{${metadataKeys.map((key) => `"${key}": "${key} value"`).join(', ')}}'::jsonb);`diff --git a/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts b/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.tsindex 95801c43452..fd3f3262fe9 100644--- a/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts+++ b/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts@@ -1,12 +1,12 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { toast } from 'sonner'-import { entityTypeKeys } from 'data/entity-types/keys'import { foreignTableKeys } from 'data/foreign-tables/keys'import { executeSql } from 'data/sql/execute-sql-query'import { wrapWithTransaction } from 'data/sql/utils/transaction'import { vaultSecretsKeys } from 'data/vault/keys'+import { toast } from 'sonner'import type { ResponseError, UseCustomMutationOptions } from 'types'+import { fdwKeys } from './keys'export type FDWImportForeignSchemaVariables = {diff --git a/apps/studio/pages/project/[ref]/storage/vectors/buckets/[bucketId].tsx b/apps/studio/pages/project/[ref]/storage/vectors/buckets/[bucketId].tsxindex 08c21d744c7..4c5f2200cfb 100644--- a/apps/studio/pages/project/[ref]/storage/vectors/buckets/[bucketId].tsx+++ b/apps/studio/pages/project/[ref]/storage/vectors/buckets/[bucketId].tsx@@ -1,27 +1,24 @@-import { useRouter } from 'next/router'-import { useEffect } from 'react'-import { toast } from 'sonner'-import { useParams } from 'common'import { BUCKET_TYPES } from 'components/interfaces/Storage/Storage.constants'-import { useSelectedVectorBucket } from 'components/interfaces/Storage/VectorBuckets/useSelectedVectorBuckets'import { VectorBucketDetails } from 'components/interfaces/Storage/VectorBuckets/VectorBucketDetails'+import { useSelectedVectorBucket } from 'components/interfaces/Storage/VectorBuckets/useSelectedVectorBuckets'import { DefaultLayout } from 'components/layouts/DefaultLayout'import { PageLayout } from 'components/layouts/PageLayout/PageLayout'import StorageLayout from 'components/layouts/StorageLayout/StorageLayout'import { DocsButton } from 'components/ui/DocsButton'import { VectorBucket as VectorBucketIcon } from 'icons'-import { useStorageExplorerStateSnapshot } from 'state/storage-explorer'+import { useRouter } from 'next/router'+import { useEffect } from 'react'+import { toast } from 'sonner'import type { NextPageWithLayout } from 'types'const VectorsBucketPage: NextPageWithLayout = () => {- const config = BUCKET_TYPES['vectors']const router = useRouter()const { ref, bucketId } = useParams()- const { projectRef } = useStorageExplorerStateSnapshot()-const { data: bucket, isSuccess } = useSelectedVectorBucket()+ const config = BUCKET_TYPES['vectors']+useEffect(() => {if (isSuccess && !bucket) {toast.info(`Bucket "${bucketId}" does not exist in your project`)@@ -39,7 +36,7 @@ const VectorsBucketPage: NextPageWithLayout = () => {</div>}breadcrumbs={[- { label: 'Vectors', href: `/project/${projectRef}/storage/vectors` },+ { label: 'Vectors', href: `/project/${ref}/storage/vectors` },{label: 'Buckets',},