From 04f450af4c7ed3d1b946df49ee824af889fb4b1d Mon Sep 17 00:00:00 2001 From: kgricour Date: Fri, 19 Jul 2024 10:37:13 +0200 Subject: [PATCH 1/7] =?UTF-8?q?=E2=9C=A8=20Add=20metadatas=20to=20embeddin?= =?UTF-8?q?gs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/embeddings.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/embeddings.ts b/lib/embeddings.ts index fa28a82..a57f4bf 100644 --- a/lib/embeddings.ts +++ b/lib/embeddings.ts @@ -92,7 +92,7 @@ async function searchEmbeddings( id: string, input: string, clientOptions: InputClientOptions = {}, -): Promise<{ id: string; content: string; similarity: number }[]> { +): Promise<{ id: string; content: string; similarity: number; metadatas: Record }[]> { const { token, endpoint } = await defaultOptions(clientOptions); try { @@ -166,7 +166,11 @@ class Embeddings { return this.memoryId; } - async search(input: string): Promise<{ id: string; content: string; similarity: number }[]> { + async search( + input: string, + ): Promise< + { id: string; content: string; similarity: number; metadatas: Record }[] + > { const id = await this.memoryId; return searchEmbeddings(id, input, await this.clientOptions); } From f683717063ea5857f9c1d215f2ab74caaccf3157 Mon Sep 17 00:00:00 2001 From: kgricour Date: Fri, 19 Jul 2024 10:40:22 +0200 Subject: [PATCH 2/7] fix any in Record --- lib/embeddings.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/embeddings.ts b/lib/embeddings.ts index a57f4bf..866c465 100644 --- a/lib/embeddings.ts +++ b/lib/embeddings.ts @@ -92,7 +92,9 @@ async function searchEmbeddings( id: string, input: string, clientOptions: InputClientOptions = {}, -): Promise<{ id: string; content: string; similarity: number; metadatas: Record }[]> { +): Promise< + { id: string; content: string; similarity: number; metadatas: Record }[] +> { const { token, endpoint } = await defaultOptions(clientOptions); try { @@ -169,7 +171,7 @@ class Embeddings { async search( input: string, ): Promise< - { id: string; content: string; similarity: number; metadatas: Record }[] + { id: string; content: string; similarity: number; metadatas: Record }[] > { const id = await this.memoryId; return searchEmbeddings(id, input, await this.clientOptions); From 71dfb423d08d102c8f36b4497d1abd7b39ee0bfc Mon Sep 17 00:00:00 2001 From: kgricour Date: Fri, 19 Jul 2024 10:55:33 +0200 Subject: [PATCH 3/7] add missing metadatas in Ressources type --- lib/generate.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/generate.ts b/lib/generate.ts index ab23592..18979ee 100644 --- a/lib/generate.ts +++ b/lib/generate.ts @@ -110,6 +110,7 @@ export type Ressource = { similarity: number; id: string; content: string; + metadatas?: Record; }; export type GenerationResult = { From e1a2a390a727bab7a82d0b01f12af7d173380888 Mon Sep 17 00:00:00 2001 From: kgricour Date: Fri, 19 Jul 2024 10:58:49 +0200 Subject: [PATCH 4/7] change one test to use gpt-4o because gpt-3.5 is now dumb --- tests/generation.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/generation.test.js b/tests/generation.test.js index cfa5152..569ea06 100644 --- a/tests/generation.test.js +++ b/tests/generation.test.js @@ -92,6 +92,7 @@ test( temperature: 0, cache: false, embeddings, + model: "gpt-4o", }); expect(message).toBe("banana42"); From 6aa7350c1d271799aa8d8990ac3a2169d57d4e99 Mon Sep 17 00:00:00 2001 From: Lancelot Owczarczak Date: Fri, 19 Jul 2024 18:32:34 +0900 Subject: [PATCH 5/7] :white_check_mark: tests: Fix memory test to await embedding --- tests/generation.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/generation.test.js b/tests/generation.test.js index 569ea06..cc6d583 100644 --- a/tests/generation.test.js +++ b/tests/generation.test.js @@ -86,13 +86,13 @@ test( const embeddings = Embeddings(); - embeddings.add('The word you have to remember is "banana42"'); + await embeddings.add('The word you have to remember is "banana42"'); const message = await generate("Just answer with the word you have to remember", { temperature: 0, cache: false, embeddings, - model: "gpt-4o", + model: "gpt-3.5", }); expect(message).toBe("banana42"); From c69132faded2b646d55bb245f250989e2e057f13 Mon Sep 17 00:00:00 2001 From: Lancelot Owczarczak Date: Fri, 19 Jul 2024 18:35:47 +0900 Subject: [PATCH 6/7] :white_check_mark: tests: Oopsie --- tests/generation.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/generation.test.js b/tests/generation.test.js index cc6d583..2590d89 100644 --- a/tests/generation.test.js +++ b/tests/generation.test.js @@ -92,7 +92,7 @@ test( temperature: 0, cache: false, embeddings, - model: "gpt-3.5", + model: "gpt-3.5-turbo", }); expect(message).toBe("banana42"); From e0a0e22b2e5d864757ed7918eec08f537da656c6 Mon Sep 17 00:00:00 2001 From: kgricour Date: Fri, 19 Jul 2024 12:29:41 +0200 Subject: [PATCH 7/7] up patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e24ad0f..4ce24c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "polyfire-js", - "version": "0.2.59", + "version": "0.2.60", "main": "index.js", "types": "index.d.ts", "author": "Lancelot Owczarczak ",