From 272fd914bd1dc826ad6abeb32df37407db3cb659 Mon Sep 17 00:00:00 2001
From: Henry Heng <henryheng@flowiseai.com>
Date: Mon, 3 Jun 2024 13:09:59 +0100
Subject: [PATCH] Bugfix/supabase upsert ids (#2561)

* fix upserting same id with supabase

* remove dedicated addvectors logic for ids

* Update pnpm-lock.yaml

* add fix for null id column
---
 .../nodes/vectorstores/Supabase/Supabase.ts   | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/packages/components/nodes/vectorstores/Supabase/Supabase.ts b/packages/components/nodes/vectorstores/Supabase/Supabase.ts
index f0ba0773c53..dca321efbaa 100644
--- a/packages/components/nodes/vectorstores/Supabase/Supabase.ts
+++ b/packages/components/nodes/vectorstores/Supabase/Supabase.ts
@@ -1,4 +1,5 @@
 import { flatten } from 'lodash'
+import { v4 as uuidv4 } from 'uuid'
 import { createClient } from '@supabase/supabase-js'
 import { Document } from '@langchain/core/documents'
 import { Embeddings } from '@langchain/core/embeddings'
@@ -213,7 +214,7 @@ class Supabase_VectorStores implements INode {
 }
 
 class SupabaseUpsertVectorStore extends SupabaseVectorStore {
-    async addVectors(vectors: number[][], documents: Document[]): Promise<string[]> {
+    async addVectors(vectors: number[][], documents: Document[], options?: { ids?: string[] | number[] }): Promise<string[]> {
         if (vectors.length === 0) {
             return []
         }
@@ -223,23 +224,36 @@ class SupabaseUpsertVectorStore extends SupabaseVectorStore {
             metadata: documents[idx].metadata
         }))
 
-        let idx = 0
-        const { count } = await this.client.from(this.tableName).select('*', { count: 'exact', head: true })
-        if (count) {
-            idx = count
-        }
-
         let returnedIds: string[] = []
         for (let i = 0; i < rows.length; i += this.upsertBatchSize) {
-            const chunk = rows.slice(i, i + this.upsertBatchSize).map((row) => {
-                idx = idx += 1
-                return { id: idx, ...row }
+            const chunk = rows.slice(i, i + this.upsertBatchSize).map((row, j) => {
+                if (options?.ids) {
+                    return { id: options.ids[i + j], ...row }
+                }
+                return row
             })
 
-            const res = await this.client.from(this.tableName).upsert(chunk).select()
+            let res = await this.client.from(this.tableName).upsert(chunk).select()
+
             if (res.error) {
-                throw new Error(`Error inserting: ${res.error.message} ${res.status} ${res.statusText}`)
+                // If the error is due to null value in column "id", we will generate a new id for the row
+                if (res.error.message.includes(`null value in column "id"`)) {
+                    const chunk = rows.slice(i, i + this.upsertBatchSize).map((row, y) => {
+                        if (options?.ids) {
+                            return { id: options.ids[i + y], ...row }
+                        }
+                        return { id: uuidv4(), ...row }
+                    })
+                    res = await this.client.from(this.tableName).upsert(chunk).select()
+
+                    if (res.error) {
+                        throw new Error(`Error inserting: ${res.error.message} ${res.status} ${res.statusText}`)
+                    }
+                } else {
+                    throw new Error(`Error inserting: ${res.error.message} ${res.status} ${res.statusText}`)
+                }
             }
+
             if (res.data) {
                 returnedIds = returnedIds.concat(res.data.map((row) => row.id))
             }