✨ Managed DB + embeddings

panoratech · Sep 16, 2024 · 99a5877 · 99a5877
1 parent 1842fcc
commit 99a5877
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/apps/webapp/src/components/Configuration/Connector/ConnectorDisplay.tsx b/apps/webapp/src/components/Configuration/Connector/ConnectorDisplay.tsx
@@ -58,8 +58,8 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
   });
 
   const mappingConnectionStrategies = connectionStrategies?.filter(
-    (cs) => extractVertical(cs.type).toLowerCase() === item?.vertical && 
-    extractProvider(cs.type).toLowerCase() === item?.name
+    (cs) => extractVertical(cs.type)?.toLowerCase() === item?.vertical?.toLowerCase() && 
+    extractProvider(cs.type)?.toLowerCase() === item?.name?.toLowerCase()
   );
 
   const oauthAttributes = CONNECTORS_METADATA[item?.vertical!]?.[item?.name!]?.options?.oauth_attributes || [];

diff --git a/packages/api/src/@core/rag/embedding/embedding.credentials.service.ts b/packages/api/src/@core/rag/embedding/embedding.credentials.service.ts
@@ -35,7 +35,7 @@ export class EmbeddingCredentialsService {
     return this.connectionsStrategiesService.getConnectionStrategyData(
       projectId,
       type,
-      ['api_key'],
+      ['embeddingApiKey'],
     );
   }
 

diff --git a/packages/api/src/@core/rag/embedding/embedding.service.ts b/packages/api/src/@core/rag/embedding/embedding.service.ts
@@ -111,7 +111,7 @@ export class EmbeddingService implements OnModuleInit {
   }
 
   async embedQuery(query: string, projectId?: string) {
-    // await this.initializeEmbeddings(projectId);
+    await this.initializeEmbeddings(projectId);
     return this.embeddings.embedQuery(query);
   }
 }
diff --git a/packages/api/src/@core/rag/rag.controller.ts b/packages/api/src/@core/rag/rag.controller.ts
@@ -32,6 +32,7 @@ export class RagController {
       body.query,
       body.topK,
       linkedUserId,
+      projectId,
     );
   }
 

diff --git a/packages/api/src/@core/rag/rag.service.ts b/packages/api/src/@core/rag/rag.service.ts
@@ -14,12 +14,21 @@ export class RagService {
     private s3Service: S3Service,
   ) {}
 
-  async queryEmbeddings(query: string, topK = 5, linkedUserId: string) {
-    const queryEmbedding = await this.embeddingService.embedQuery(query);
+  async queryEmbeddings(
+    query: string,
+    topK = 5,
+    linkedUserId: string,
+    projectId: string,
+  ) {
+    const queryEmbedding = await this.embeddingService.embedQuery(
+      query,
+      projectId,
+    );
     const results = await this.vectorDatabaseService.queryEmbeddings(
       queryEmbedding,
       topK,
       linkedUserId,
+      projectId,
     );
     return results.map((match: any) => ({
       chunk: match.metadata.text,

diff --git a/packages/api/src/@core/rag/vecdb/pinecone/pinecone.service.ts b/packages/api/src/@core/rag/vecdb/pinecone/pinecone.service.ts
@@ -18,6 +18,7 @@ export class PineconeService {
     fileId: string,
     chunks: ProcessedChunk[],
     embeddings: number[][],
+    projectId: string,
     linkedUserId: string,
   ) {
     const index = this.client.Index(this.indexName);

diff --git a/packages/api/src/@core/rag/vecdb/vecdb.service.ts b/packages/api/src/@core/rag/vecdb/vecdb.service.ts
@@ -114,7 +114,9 @@ export class VectorDatabaseService implements OnModuleInit {
     queryEmbedding: number[],
     topK: number,
     linkedUserId: string,
+    projectId: string,
   ) {
+    await this.init(projectId);
     return this.vectorDb.queryEmbeddings(queryEmbedding, topK, linkedUserId);
   }
 }