From 0d1f9c3e015ff271123c05408dda5e4a7443db9b Mon Sep 17 00:00:00 2001 From: Daniel Madalitso Phiri Date: Wed, 9 Apr 2025 14:41:37 +0200 Subject: [PATCH] new weaviate version --- .gitignore | 1 + backend/package.json | 2 +- backend/src/multimodal/multimodal-setup.service.ts | 4 ++-- backend/src/multimodal/multimodal.service.ts | 8 ++++---- backend/src/search/search.service.ts | 8 ++++---- backend/src/setup/setup.service.ts | 6 +++--- 6 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..496ee2c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index 472f59f..8816996 100644 --- a/backend/package.json +++ b/backend/package.json @@ -51,7 +51,7 @@ "ts-node": "^10.9.1", "tsconfig-paths": "^4.2.0", "typescript": "^5.1.3", - "weaviate-client": "~3.2.2" + "weaviate-client": "~3.5.1" }, "jest": { "moduleFileExtensions": [ diff --git a/backend/src/multimodal/multimodal-setup.service.ts b/backend/src/multimodal/multimodal-setup.service.ts index a5882f8..b2f6d64 100644 --- a/backend/src/multimodal/multimodal-setup.service.ts +++ b/backend/src/multimodal/multimodal-setup.service.ts @@ -95,7 +95,7 @@ export class MultimodalSetupService { const client = await this.getClient() const myMedia = client.collections.get('MyMedia') - let objectsToInsert = [] + let objectsToInsert = .collections.use for (let imgfile of imageFiles) { // construct image objects to insert @@ -128,7 +128,7 @@ export class MultimodalSetupService { const client = this.getClient() const myMedia = (await client).collections.get('MyMedia') - for (let file of videoFiles) { + for (let file of videoFiles) {.collections.use // construct image objects to insert const itemToInsert = { name: file.name, diff --git a/backend/src/multimodal/multimodal.service.ts b/backend/src/multimodal/multimodal.service.ts index b78abc4..8ab8ee9 100644 --- a/backend/src/multimodal/multimodal.service.ts +++ b/backend/src/multimodal/multimodal.service.ts @@ -53,7 +53,7 @@ export class MultimodalService { async searchWithText(query: string) { const client = await this.getClient() - // get collection 'MyMedia' + // get collection 'MyM.collections.use const gallery = client.collections.get('MyMedia') // nearText search @@ -64,7 +64,7 @@ export class MultimodalService { } - async searchWithImage(b64Image: string) { + async searchWithImage(b64I.collections.use const client = await this.getClient() const gallery = client.collections.get('MyMedia') @@ -74,7 +74,7 @@ export class MultimodalService { }) } - async searchWithVideo(b64Video: string) { + async searchWithVideo(b64V.collections.use const client = await this.getClient() const gallery = client.collections.get('MyMedia') @@ -84,7 +84,7 @@ export class MultimodalService { returnMetadata: ['distance'], }) } - +.collections.use async searchWithVideoFile(file: any) { const client = await this.getClient() diff --git a/backend/src/search/search.service.ts b/backend/src/search/search.service.ts index db13f9e..c3652e0 100644 --- a/backend/src/search/search.service.ts +++ b/backend/src/search/search.service.ts @@ -47,7 +47,7 @@ export class WeaviateSearchService { async semanticSearch(query) { const client = await this.getClient(); - const wiki = client.collections.get('Wikipedia') + const wiki = client.collections.use('Wikipedia') // return wiki.query.nearText(query, { limit: 5 }) return wiki.query.nearText(query, { limit: 5, returnMetadata: [ 'distance' ] }) @@ -55,7 +55,7 @@ export class WeaviateSearchService { async hybridSearch(query) { const client = await this.getClient(); - const wiki = client.collections.get('Wikipedia') + const wiki = client.collections.use('Wikipedia') return wiki.query.hybrid(query, { alpha: 0.7, @@ -66,7 +66,7 @@ export class WeaviateSearchService { async rag(query) { const client = await this.getClient(); - const wiki = client.collections.get('Wikipedia') + const wiki = client.collections.use('Wikipedia') const prompts = { singlePrompt: 'translate {title} to German', @@ -82,7 +82,7 @@ export class WeaviateSearchService { async ragDynamic(query, singlePrompt, groupedTask) { const client = await this.getClient(); - const wiki = client.collections.get('Wikipedia') + const wiki = client.collections.use('Wikipedia') let prompts = {}; if(singlePrompt) diff --git a/backend/src/setup/setup.service.ts b/backend/src/setup/setup.service.ts index 07090e6..9c0d3db 100644 --- a/backend/src/setup/setup.service.ts +++ b/backend/src/setup/setup.service.ts @@ -87,7 +87,7 @@ export class WeaviateSetupService { const filePath = join(process.cwd(), `./files/${fileName}`) const file = readline.createInterface({ input: fs.createReadStream(filePath), output: process.stdout, terminal: false }); - const wiki = client.collections.get(collectionName) + const wiki = client.collections.use(collectionName) let itemsToInsert = [] let counter = 0; @@ -143,7 +143,7 @@ export class WeaviateSetupService { let itemsToInsert = [] let counter = 0; - const wiki = client.collections.get(collectionName) + const wiki = client.collections.use(collectionName) for await (const line of file) { counter++; if(counter % 1000 == 0) @@ -195,7 +195,7 @@ export class WeaviateSetupService { public async getCollectionCount(collectionName) { const client = await this.getClient(); - const wiki = client.collections.get(collectionName) + const wiki = client.collections.use(collectionName) return wiki.aggregate.overAll() }