weaviate-ruby 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eec9c4e909fa4b73ed59023c291cbc0171c72fcc2aeeef2773b6744b2de6144c
-  data.tar.gz: b66b81b77feb0b5777a15ef833eea0ebdd7f1660208c5f53893887c95aa56201
+  metadata.gz: f1944f940c8677b6293af834af96e6b2c3635475703bffb96a123bfc7e164a4d
+  data.tar.gz: c4b719e54d31ae823054bd40d1a450efd7c5d7738bca23fb8187366ee4e9e140
 SHA512:
-  metadata.gz: 2b32d7546e9dc5484b63abe834667e03733e694b1fd6d7c10306cc09cb96ecbb8e63f84aaa682452ae881de79cf3f6f2c49dccf744761e6c95a7539e3feef068
-  data.tar.gz: 1a3774e88f29d0de254bd06b912bbcf4b4fa33cfa2b0ac87a60c38e340503c9119fdc6556bc5d7ff77c06097519e9f9122d2ef6cc8ca1541c245091c4bef0115
+  metadata.gz: 4e81d9d0960153df197c746b120408f74a08da2c6336665e73756243e6ba2d84354b8ef6770998cae8d0411904a988fa0ec82f2ccba1d69ec4da6765b2da65c8
+  data.tar.gz: 62751834232ad87ef75aa115c55781dd9d9aec47ecddea7c9b21a035c91ebf8824dad0a506c7c8d44fa56ac8f16bb2f5295f5b7fdebf198ab5dc6c6d480392dd

data/Gemfile.lock

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

data/README.md

@@ -3,12 +3,12 @@
 <p>
     <img alt='Weaviate logo' src='https://weaviate.io/img/site/weaviate-logo-light.png' height='50' />
     +&nbsp;&nbsp;
-    <img alt='Weaviate logo' src='https://user-images.githubusercontent.com/541665/230231593-43861278-4550-421d-a543-fd3553aac4f6.png' height='40' />
+    <img alt='Ruby logo' src='https://user-images.githubusercontent.com/541665/230231593-43861278-4550-421d-a543-fd3553aac4f6.png' height='40' />
 </p>
 
 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,10 +172,11 @@ 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',
-    fields: 'question answer category',
+    fields: "question answer category _additional { answer { result hasAnswer property startPosition endPosition } }",
     limit: "1",
     offset: "1",
     after: "id",
@@ -187,13 +188,15 @@ 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?" }'
 )
 
 # Example queries:

data/lib/weaviate/client.rb

@@ -5,7 +5,8 @@ require "graphlient"
 
 module Weaviate
   class Client
-    attr_reader :scheme, :host, :api_key, :model_service, :model_service_api_key, :adapter
+    attr_reader :scheme, :host, :api_key, :model_service, :model_service_api_key, :adapter,
+      :username, :password
 
     API_VERSION = "v1"
 
@@ -21,7 +22,9 @@ module Weaviate
       api_key: nil,
       model_service: nil,
       model_service_api_key: nil,
-      adapter: Faraday.default_adapter
+      adapter: Faraday.default_adapter,
+      username: nil,
+      password: nil
     )
       validate_model_service!(model_service) unless model_service.nil?
 
@@ -31,6 +34,8 @@ module Weaviate
       @model_service = model_service
       @model_service_api_key = model_service_api_key
       @adapter = adapter
+      @username = username
+      @password = password
     end
 
     def oidc
@@ -77,12 +82,21 @@ module Weaviate
       @query ||= Weaviate::Query.new(client: self)
     end
 
+    def clusters
+      @clusters ||= Weaviate::Clusters.new(client: self)
+    end
+
     def graphql
       headers = {}
+
       if model_service && model_service_api_key
         headers[API_KEY_HEADERS[model_service]] = model_service_api_key
       end
 
+      if api_key
+        headers["Authorization"] = "Bearer #{api_key}"
+      end
+
       @graphql ||= Graphlient::Client.new(
         "#{scheme}://#{host}/#{API_VERSION}/graphql",
         headers: headers,
@@ -93,6 +107,21 @@ module Weaviate
       )
     end
 
+    def wsc
+      @wsc ||= Faraday.new(url: "https://wcs.api.semi.technology/v1") do |faraday|
+        # if api_key
+        #   faraday.request :authorization, :Bearer, api_key
+        if password && username
+        #   faraday.request :authorization, :Basic, Base64.encode64("#{username}:#{password}")
+        end
+
+
+        faraday.request :json
+        faraday.response :json, content_type: /\bjson$/
+        faraday.adapter adapter
+      end
+    end
+
     def connection
       @connection ||= Faraday.new(url: "#{scheme}://#{host}/#{API_VERSION}/") do |faraday|
         if api_key

data/lib/weaviate/query.rb

@@ -12,7 +12,10 @@ module Weaviate
       where: nil,
       near_text: nil,
       near_vector: nil,
-      near_object: nil
+      near_object: nil,
+      with_hybrid: nil,
+      bm25: nil,
+      ask: nil
     )
       response = client.graphql.execute(
         get_query(
@@ -22,7 +25,10 @@ module Weaviate
           where: where,
           near_text: near_text,
           near_vector: near_vector,
-          near_object: near_object
+          near_object: near_object,
+          with_hybrid: with_hybrid,
+          bm25: bm25,
+          ask: ask
         ),
         after: after,
         limit: limit,
@@ -122,6 +128,9 @@ module Weaviate
       near_text: nil,
       near_vector: nil,
       near_object: nil,
+      with_hybrid: nil,
+      bm25: nil,
+      ask: nil,
       sort: nil
     )
       client.graphql.parse <<~GRAPHQL
@@ -138,6 +147,9 @@ module Weaviate
               #{near_text.present? ? "nearText: #{near_text}" : ""},
               #{near_vector.present? ? "nearVector: #{near_vector}" : ""},
               #{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}" : ""}
             ) {

data/lib/weaviate/schema.rb

@@ -46,8 +46,6 @@ module Weaviate
         req.body["replicationConfig"] = replication_config unless replication_config.nil?
       end
 
-      if response.success?
-      end
       response.body
     end
 

data/lib/weaviate/version.rb

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

data/lib/weaviate.rb

@@ -5,6 +5,7 @@ require_relative "weaviate/version"
 module Weaviate
   autoload :Base, "weaviate/base"
   autoload :Client, "weaviate/client"
+  autoload :Clusters, "weaviate/clusters"
   autoload :Error, "weaviate/error"
   autoload :Schema, "weaviate/schema"
   autoload :Meta, "weaviate/meta"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weaviate-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday