weaviate-ruby 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1944f940c8677b6293af834af96e6b2c3635475703bffb96a123bfc7e164a4d
-  data.tar.gz: c4b719e54d31ae823054bd40d1a450efd7c5d7738bca23fb8187366ee4e9e140
+  metadata.gz: e3fbf2a33be8c215b77162ae797f54be34962fa8f26b9c47880b6e80028997da
+  data.tar.gz: 6e3cd21e2c087e180afa031366d4284b9c5a65cd98a4162e6cbf23049164fb0a
 SHA512:
-  metadata.gz: 4e81d9d0960153df197c746b120408f74a08da2c6336665e73756243e6ba2d84354b8ef6770998cae8d0411904a988fa0ec82f2ccba1d69ec4da6765b2da65c8
-  data.tar.gz: 62751834232ad87ef75aa115c55781dd9d9aec47ecddea7c9b21a035c91ebf8824dad0a506c7c8d44fa56ac8f16bb2f5295f5b7fdebf198ab5dc6c6d480392dd
+  metadata.gz: 182607f0a3efbdfbd473289c005218ef2987100f2eac33b22c1d01cdc38a39183ce589943232e61a504b17831722875546c56780caa96b33086adb1d031edf86
+  data.tar.gz: 9b3b1b947bc19268e11f53a3df2988bec3c3f124a3c8144b1ecb5b69c5220f2eb3c2158cde198fbeab43f3f73ff2f5f19feb9241b12c43d55d77980ec8bd84b2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.8.0] - 2023-04-18
+
+### Breaking
+- Initializing the weaviate client requires the single `url:` key instead of separate `host:` and `schema:`
+
 ## [0.1.0] - 2023-03-24
 
 - Initial release

data/Gemfile.lock

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

data/README.md

@@ -28,8 +28,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 require 'weaviate'
 
 client = Weaviate::Client.new(
-    scheme: 'https',
-    host: 'some-endpoint.weaviate.network',  # Replace with your endpoint
+    url: 'https://some-endpoint.weaviate.network',  # Replace with your endpoint
     api_key: '', # Weaviate API key
     model_service: :openai, # Service that will be used to generate vectors. Possible values: :openai, :cohere, :huggingface
     model_service_api_key: 'xxxxxxx' # Either OpenAI, Cohere or Hugging Face API key
@@ -181,7 +180,7 @@ client.query.get(
     offset: "1",
     after: "id",
     sort: sort_obj,
-    where_obj: where_obj,
+    where: where_obj,
 
     # To use this parameter you must have created your schema by setting the `vectorizer:` property to
     # either 'text2vec-transformers', 'text2vec-contextionary', 'text2vec-openai', 'multi2vec-clip', 'text2vec-huggingface' or 'text2vec-cohere'

data/lib/weaviate/client.rb

@@ -5,8 +5,7 @@ require "graphlient"
 
 module Weaviate
   class Client
-    attr_reader :scheme, :host, :api_key, :model_service, :model_service_api_key, :adapter,
-      :username, :password
+    attr_reader :url, :api_key, :model_service, :model_service_api_key, :adapter
 
     API_VERSION = "v1"
 
@@ -17,25 +16,19 @@ module Weaviate
     }
 
     def initialize(
-      scheme:,
-      host:,
+      url:,
       api_key: nil,
       model_service: nil,
       model_service_api_key: nil,
-      adapter: Faraday.default_adapter,
-      username: nil,
-      password: nil
+      adapter: Faraday.default_adapter
     )
       validate_model_service!(model_service) unless model_service.nil?
 
-      @scheme = scheme
-      @host = host
+      @url = url
       @api_key = api_key
       @model_service = model_service
       @model_service_api_key = model_service_api_key
       @adapter = adapter
-      @username = username
-      @password = password
     end
 
     def oidc
@@ -82,10 +75,6 @@ module Weaviate
       @query ||= Weaviate::Query.new(client: self)
     end
 
-    def clusters
-      @clusters ||= Weaviate::Clusters.new(client: self)
-    end
-
     def graphql
       headers = {}
 
@@ -98,7 +87,7 @@ module Weaviate
       end
 
       @graphql ||= Graphlient::Client.new(
-        "#{scheme}://#{host}/#{API_VERSION}/graphql",
+        "#{url}/#{API_VERSION}/graphql",
         headers: headers,
         http_options: {
           read_timeout: 20,
@@ -107,23 +96,8 @@ 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|
+      @connection ||= Faraday.new(url: "#{url}/#{API_VERSION}/") do |faraday|
         if api_key
           faraday.request :authorization, :Bearer, api_key
         end

data/lib/weaviate/query.rb

@@ -12,6 +12,7 @@ module Weaviate
       where: nil,
       near_text: nil,
       near_vector: nil,
+      near_image: nil,
       near_object: nil,
       with_hybrid: nil,
       bm25: nil,
@@ -25,6 +26,7 @@ module Weaviate
           where: where,
           near_text: near_text,
           near_vector: near_vector,
+          near_image: near_image,
           near_object: near_object,
           with_hybrid: with_hybrid,
           bm25: bm25,
@@ -45,6 +47,7 @@ module Weaviate
       object_limit: nil,
       near_text: nil,
       near_vector: nil,
+      near_image: nil,
       near_object: nil,
       group_by: nil
     )
@@ -54,6 +57,7 @@ module Weaviate
           fields: fields,
           near_text: near_text,
           near_vector: near_vector,
+          near_image: near_image,
           near_object: near_object
         ),
         group_by: group_by,
@@ -73,6 +77,7 @@ module Weaviate
       where: nil,
       near_text: nil,
       near_vector: nil,
+      near_image: nil,
       near_object: nil
     )
       response = client.graphql.execute(
@@ -80,6 +85,7 @@ module Weaviate
           fields: fields,
           near_text: near_text,
           near_vector: near_vector,
+          near_image: near_image,
           near_object: near_object
         ),
         after: after,
@@ -98,6 +104,7 @@ module Weaviate
       where: nil,
       near_text: nil,
       near_vector: nil,
+      near_image: nil,
       near_object: nil,
       sort: nil
     )
@@ -111,6 +118,7 @@ module Weaviate
             offset: $offset,
             #{near_text.present? ? "nearText: #{near_text}" : ""},
             #{near_vector.present? ? "nearVector: #{near_vector}" : ""},
+            #{near_image.present? ? "nearImage: #{near_image}" : ""},
             #{near_object.present? ? "nearObject: #{near_object}" : ""}
             #{where.present? ? "where: #{where}" : ""},
             #{sort.present? ? "sort: #{sort}" : ""}
@@ -127,6 +135,7 @@ module Weaviate
       where: nil,
       near_text: nil,
       near_vector: nil,
+      near_image: nil,
       near_object: nil,
       with_hybrid: nil,
       bm25: nil,
@@ -146,6 +155,7 @@ module Weaviate
               offset: $offset,
               #{near_text.present? ? "nearText: #{near_text}" : ""},
               #{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}" : ""},
@@ -165,6 +175,7 @@ module Weaviate
       fields:,
       near_text: nil,
       near_vector: nil,
+      near_image: nil,
       near_object: nil
     )
       client.graphql.parse <<~GRAPHQL
@@ -178,6 +189,7 @@ module Weaviate
               groupBy: $group_by,
               #{near_text.present? ? "nearText: #{near_text}" : ""},
               #{near_vector.present? ? "nearVector: #{near_vector}" : ""},
+              #{near_image.present? ? "nearImage: #{near_image}" : ""},
               #{near_object.present? ? "nearObject: #{near_object}" : ""}
             ) {
               #{fields}

data/lib/weaviate/version.rb

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

data/lib/weaviate.rb

@@ -5,7 +5,6 @@ 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.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday