Merge branch 'master' into add-near_image-option

Author: andreibondarev

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    weaviate-ruby (0.7.1)
+    weaviate-ruby (0.7.2)
       faraday (~> 2.7)
       graphlient (~> 0.7.0)
 

README.md

@@ -8,7 +8,7 @@
 
 Ruby wrapper for the Weaviate.io API
 
-![Tests status](https://github.com/andreibondarev/weaviate-ruby/actions/workflows/ci.yml/badge.svg)
+![Tests status](https://github.com/andreibondarev/weaviate-ruby/actions/workflows/ci.yml/badge.svg) [![Gem Version](https://badge.fury.io/rb/weaviate-ruby.svg)](https://badge.fury.io/rb/weaviate-ruby)
 
 ## Installation
 
@@ -172,6 +172,7 @@ client.objects.batch_delete(
 near_text = '{ concepts: ["biology"] }'
 sort_obj = '{ path: ["category"], order: desc }'
 where_obj = '{ path: ["id"], operator: Equal, valueString: "..." }'
+with_hybrid = '{ query: "Sweets", alpha: 0.5 }'
 
 client.query.get(
     class_name: 'Question',
@@ -187,13 +188,13 @@ client.query.get(
     near_text: near_text,
 
     # To use this parameter you must have created your schema by setting the `vectorizer:` property to 'multi2vec-clip' or 'img2vec-neural'
-    # near_image: ...,
+    near_image: near_image,
 
-    # hybrid: ...,
+    with_hybrid: with_hybrid,
 
-    # bm25: ...,
+    bm25: bm25,
 
-    # near_object: ...,
+    near_object: near_object,
 
     ask: '{ question: "your-question?" }'
 )

lib/weaviate/query.rb

@@ -14,6 +14,8 @@ def get(
       near_vector: nil,
       near_image: nil,
       near_object: nil,
+      with_hybrid: nil,
+      bm25: nil,
       ask: nil
     )
       response = client.graphql.execute(
@@ -26,6 +28,8 @@ def get(
           near_vector: near_vector,
           near_image: near_image,
           near_object: near_object,
+          with_hybrid: with_hybrid,
+          bm25: bm25,
           ask: ask
         ),
         after: after,
@@ -133,6 +137,8 @@ def get_query(
       near_vector: nil,
       near_image: nil,
       near_object: nil,
+      with_hybrid: nil,
+      bm25: nil,
       ask: nil,
       sort: nil
     )
@@ -151,6 +157,8 @@ def get_query(
               #{near_vector.present? ? "nearVector: #{near_vector}" : ""},
               #{near_image.present? ? "nearImage: #{near_image}" : ""},
               #{near_object.present? ? "nearObject: #{near_object}" : ""},
+              #{with_hybrid.present? ? "hybrid: #{with_hybrid}" : ""},
+              #{bm25.present? ? "bm25: #{bm25}" : ""},
               #{ask.present? ? "ask: #{ask}" : ""},
               #{where.present? ? "where: #{where}" : ""},
               #{sort.present? ? "sort: #{sort}" : ""}

lib/weaviate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Weaviate
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end