Fixs to new vector store setup

Author: Veikkosuhonen

src/client/components/ChatV2/ChatV2.tsx

@@ -228,7 +228,7 @@ export const ChatV2 = () => {
       const { tokenUsageAnalysis, stream } = await getCompletionStream({
         assistantInstructions: assistantInstructions.content,
         messages: newMessages,
-        ragIndexId: ragIndexId ?? undefined,
+        ragIndexId,
         model: activeModel.name,
         formData,
         modelTemperature: modelTemperature.value,

src/server/routes/openai.ts

@@ -137,36 +137,38 @@ openaiRouter.post('/stream/v2', upload.single('file'), async (r, res) => {
   }
 
   // Check rag index
-  let vectorStoreId: string | undefined
   let instructions: string | undefined = options.assistantInstructions
+  let ragIndex: RagIndex | undefined
 
   if (ragIndexId) {
     if (!courseId && !user.isAdmin) {
       logger.error('User is not admin and trying to access non-course rag')
       throw ApplicationError.Forbidden('User is not admin and trying to access non-course rag')
     }
 
-    const ragIndex = await RagIndex.findByPk(ragIndexId, {
-      include: {
-        model: ChatInstance,
-        as: 'chatInstances',
-        where: courseId ? { courseId } : {},
-      },
-    })
+    ragIndex =
+      (await RagIndex.findByPk(ragIndexId, {
+        include: {
+          model: ChatInstance,
+          as: 'chatInstances',
+          where: courseId ? { courseId } : {},
+        },
+      })) ?? undefined
     if (ragIndex) {
-      vectorStoreId = ragIndex.metadata.azureVectorStoreId
       instructions = `${instructions} ${ragIndex.metadata.instructions ?? DEFAULT_RAG_SYSTEM_PROMPT}`
-    } else {
+    }
+    if (!ragIndex) {
       logger.error('RagIndex not found', { ragIndexId })
       res.status(404).send('RagIndex not found')
       return
     }
   }
 
+  console.log('ragIndex', ragIndexId, ragIndex)
+
   const responsesClient = new ResponsesClient({
     model: options.model,
-    vectorStoreId,
-    ragIndexId,
+    ragIndex,
     instructions,
     temperature: options.modelTemperature,
     user,

src/server/routes/rag/rag.ts

@@ -8,6 +8,7 @@ import { getAzureOpenAIClient } from '../../util/azure/client'
 import { TEST_COURSES } from '../../util/config'
 import ragIndexRouter, { ragIndexMiddleware } from './ragIndex'
 import { getPrimaryVectorStoreId } from '../../services/azureFileSearch/vectorStore'
+import { randomUUID } from 'node:crypto'
 
 const router = Router()
 
@@ -60,6 +61,7 @@ router.post('/indices', async (req, res) => {
       name,
       dim,
       azureVectorStoreId: vectorStoreId,
+      ragIndexFilterValue: randomUUID(),
     },
   })
 

src/server/routes/rag/ragIndex.ts

@@ -237,12 +237,12 @@ ragIndexRouter.post('/upload', [indexUploadDirMiddleware, uploadMiddleware], asy
 
       const uploadedFile = await client.files.create({
         file: stream,
-        purpose: 'user_data',
+        purpose: 'assistants',
       })
       const vectorStoreFile = await client.vectorStores.files.create(ragIndex.metadata.azureVectorStoreId, {
         file_id: uploadedFile.id,
         attributes: {
-          ragIndexId: ragIndex.id,
+          ragIndexFilter: ragIndex.metadata.ragIndexFilterValue,
         },
       })
 

src/server/util/azure/ResponsesAPI.ts

@@ -11,6 +11,7 @@ import { createMockStream } from './mocks/MockStream'
 import { createFileSearchTool } from './util'
 import { FileSearchResultsStore } from '../../services/azureFileSearch/fileSearchResultsStore'
 import { getAzureOpenAIClient } from './client'
+import { RagIndex } from '../../db/models'
 
 const client = getAzureOpenAIClient(process.env.GPT_4O_MINI ?? '')
 
@@ -27,43 +28,40 @@ export class ResponsesClient {
   temperature: number
   tools: FileSearchTool[]
   user: User
-  ragIndexId?: number
+  ragIndex?: RagIndex
 
   constructor({
     model,
     temperature,
-    vectorStoreId,
     instructions,
     user,
-    ragIndexId,
+    ragIndex,
   }: {
     model: string
     temperature: number
-    vectorStoreId?: string
     instructions?: string
     user: User
-    ragIndexId?: number
+    ragIndex?: RagIndex
   }) {
     const selectedModel = validModels.find((m) => m.name === model)?.deployment
 
     if (!selectedModel) throw new Error(`Invalid model: ${model}, not one of ${validModels.map((m) => m.name).join(', ')}`)
 
-    const fileSearchTool =
-      vectorStoreId && ragIndexId
-        ? [
-            createFileSearchTool({
-              vectorStoreId,
-              filters: { key: 'ragIndexId', value: ragIndexId, type: 'eq' },
-            }),
-          ]
-        : [] // needs to retrun empty array for null
+    const fileSearchTool = ragIndex
+      ? [
+          createFileSearchTool({
+            vectorStoreId: ragIndex.metadata.azureVectorStoreId,
+            filters: { key: 'ragIndexFilterValue', value: ragIndex.metadata.ragIndexFilterValue, type: 'eq' },
+          }),
+        ]
+      : [] // needs to retrun empty array for null
 
     this.model = selectedModel
     this.temperature = temperature
     this.instructions = instructions ?? ''
     this.tools = fileSearchTool
     this.user = user
-    this.ragIndexId = ragIndexId
+    this.ragIndex = ragIndex
   }
 
   async createResponse({
@@ -145,7 +143,7 @@ export class ResponsesClient {
 
         case 'response.output_item.done': {
           if (event.item.type === 'file_search_call') {
-            if (!this.ragIndexId) throw new Error('how is this possible. you managed to invoke file search without ragIndexId')
+            if (!this.ragIndex) throw new Error('how is this possible. you managed to invoke file search without ragIndexId')
 
             if (event.item.results) {
               await FileSearchResultsStore.saveResults(event.item.id, event.item.results, this.user)
@@ -159,7 +157,7 @@ export class ResponsesClient {
                   queries: event.item.queries,
                   status: event.item.status,
                   type: event.item.type,
-                  ragIndexId: this.ragIndexId,
+                  ragIndexId: this.ragIndex.id,
                 },
               },
               res,

src/shared/types.ts

@@ -6,6 +6,7 @@ export type RagIndexMetadata = {
   name: string
   dim?: number
   azureVectorStoreId: string
+  ragIndexFilterValue: string
   instructions?: string
 }