add properties field to hybrid filter (#55)

Author: parkerduckworth

ci/docker-compose-azure-cc.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     ports:
       - 8081:8081
     restart: on-failure:0

ci/docker-compose-cluster.yml

@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   weaviate-node-1:
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     restart: on-failure:0
     ports:
       - "8087:8080"
@@ -25,7 +25,7 @@ services:
     - '8080'
     - --scheme
     - http
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     ports:
     - 8088:8080
     - 6061:6060

ci/docker-compose-okta-cc.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     ports:
       - 8082:8082
     restart: on-failure:0

ci/docker-compose-okta-users.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     ports:
       - 8083:8083
     restart: on-failure:0

ci/docker-compose-openai.yml

@@ -9,7 +9,7 @@ services:
       - '8086'
       - --scheme
       - http
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     ports:
       - 8086:8086
     restart: on-failure:0

ci/docker-compose-wcs.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     ports:
       - 8085:8085
     restart: on-failure:0

ci/docker-compose.yml

@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   weaviate:
-    image: semitechnologies/weaviate:1.19.0
+    image: semitechnologies/weaviate:1.19.2
     restart: on-failure:0
     ports:
       - "8080:8080"

src/cluster/journey.test.ts

@@ -7,8 +7,8 @@ const {
   SOUP_CLASS_NAME,
 } = require('../utils/testData');
 
-const EXPECTED_WEAVIATE_VERSION = '1.19.0';
-const EXPECTED_WEAVIATE_GIT_HASH = '48456a1';
+const EXPECTED_WEAVIATE_VERSION = '1.19.2';
+const EXPECTED_WEAVIATE_GIT_HASH = '44d10b2';
 
 describe('cluster nodes endpoint', () => {
   const client = weaviate.client({

src/graphql/getter.test.ts

@@ -1230,6 +1230,18 @@ describe('hybrid valid searchers', () => {
 
     expect(mockClient.query).toHaveBeenCalledWith(expectedQuery);
   });
+
+  test('queries and properties', () => {
+    const expectedQuery = `{Get{Person(hybrid:{query:"accountant",properties:["name","employer"]}){name}}}`;
+
+    new Getter(mockClient)
+      .withClassName('Person')
+      .withFields('name')
+      .withHybrid({ query: 'accountant', properties: ['name', 'employer'] })
+      .do();
+
+    expect(mockClient.query).toHaveBeenCalledWith(expectedQuery);
+  });
 });
 
 describe('generative search', () => {

src/graphql/hybrid.ts

@@ -2,17 +2,20 @@ export interface HybridArgs {
   alpha?: number;
   query: string;
   vector?: number[];
+  properties?: string[];
 }
 
 export default class GraphQLHybrid {
   private alpha?: number;
   private query: string;
   private vector?: number[];
+  private properties?: string[];
 
   constructor(args: HybridArgs) {
     this.alpha = args.alpha;
     this.query = args.query;
     this.vector = args.vector;
+    this.properties = args.properties;
   }
 
   toString() {
@@ -26,6 +29,11 @@ export default class GraphQLHybrid {
       args = [...args, `vector:${JSON.stringify(this.vector)}`];
     }
 
+    if (this.properties && this.properties.length > 0) {
+      const props = this.properties.join('","');
+      args = [...args, `properties:["${props}"]`];
+    }
+
     return `{${args.join(',')}}`;
   }
 }