pinecone 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1df7356e27643581b1acd0417647d0e83cb53d3268357b083c13188f96ee0377
-  data.tar.gz: 561f46ebf941d8f8652787b2034038bbab21303080f5a6f281463f9f1a2669aa
+  metadata.gz: e278d71fc695cd9e6f0297cc0dd5e8fb6ec144cd1e599d394bb34f25dbcb4783
+  data.tar.gz: ecb5b591b5a8b3564c5b2790fbadf99f253925d60e25934f9fbcfec67a09b919
 SHA512:
-  metadata.gz: fa0470d86d105b2f33e16d0d5a5376cb5e09641ec825faddd9d9cc5b39426b15fcc0d382b3586625e26032d4a48593179f706e7e9276918fa666f5739c35a6c6
-  data.tar.gz: a06fddd61f295a1ba89c55180487ed89f9142fce8161f41c5aa5861190611c93303b581e971cfaae45f877060c2ab72b12e147eddc7d49329d2038fd7e1cb3bf
+  metadata.gz: 9b09cd21a242d82794ed5f6af15f9bd0f190d872f48a9ddce66e80eea9c9bdce191c09185d6e9d62058ca01d4ee32a98b2c4ee10460a4e726261eec1093d9da6
+  data.tar.gz: c3254d2c223308f0a0c56bb0c4b4f08fae0a807682f1ab502b7a622ebdea63a2cd719a691a1589d61888485938e5750fd4ea7d9b4e003d95d2115e9543e97a6d

data/lib/pinecone/vector/filter.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "dry-struct"
+require "dry-validation"
+
+module Types
+  include Dry.Types()
+
+  StringOrNumberOrBoolean = Dry::Types['string'] | Dry::Types['integer'] | Dry::Types['float'] | Dry::Types['bool']
+  StringOrNumber = Dry::Types['string'] | Dry::Types['integer'] | Dry::Types['float']
+  Number = Dry::Types['integer'] | Dry::Types['float']
+end
+
+module Pinecone
+  class Vector
+    class Filter < Dry::Struct
+      class FilterContract < Dry::Validation::Contract
+        schema do
+          optional(:$and).filled(:array)
+          optional(:$or).filled(:array)
+          optional(:$eq).filled(Types::StringOrNumberOrBoolean)
+          optional(:$ne).filled(Types::StringOrNumberOrBoolean)
+          optional(:$gt).filled(Types::Number)
+          optional(:$gte).filled(Types::Number)
+          optional(:$lt).filled(Types::Number)
+          optional(:$lte).filled(Types::Number)
+          optional(:$in).filled(:array).each(Types::StringOrNumber)
+          optional(:$nin).filled(:array).each(Types::StringOrNumber)
+        end
+
+        rule(:$and) do
+          if key?
+            key(:$and).failure("'$any' must be an array") unless value.is_a?(Array)
+
+            value.each do |v|
+              key(:$and).failure("'$any' must be an array of filters") unless v.is_a?(Filter) || to_filter(v).is_a?(Filter)
+            end
+          end
+        end
+
+        rule(:$or) do
+          if key?
+            key(:$or).failure("'$or' must be an array") unless value.is_a?(Array)
+
+            value.each do |v|
+              key(:$or).failure("'$or' must be an array of filters") unless v.is_a?(Filter) || to_filter(v).is_a?(Filter)
+            end
+          end
+        end
+
+        def to_filter(input)
+          return false unless input.is_a?(Hash)
+          return Filter.new(input)
+        end
+      end
+
+      def self.new(input)
+        validation = FilterContract.new.call(input)
+        if validation.success?
+          super(input)
+        else
+          raise ArgumentError.new(validation.errors.to_h.inspect)
+        end
+      end
+
+      def self.default?
+        nil
+      end
+    end
+  end
+end

data/lib/pinecone/vector/query.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "dry-struct"
+require "dry-validation"
+
+require "pinecone/vector/filter"
+require "pinecone/vector/sparse_vector"
+
+module Types
+  include Dry.Types()
+end
+
+module Pinecone
+  class Vector
+    class Query < Dry::Struct
+      class QueryContract < Dry::Validation::Contract
+        params do
+          optional(:vector).filled(:array)
+          optional(:id).filled(:string)
+        end
+
+        rule(:vector, :id) do
+          if !values[:vector].nil? && !values[:id].nil?
+            key(:vector).failure("Only one of vector or id can be specified")
+            key(:id).failure("Only one of vector or id can be specified")
+          end
+        end
+      end
+
+      schema schema.strict
+
+      attribute :namespace, Dry::Types['string'].default("")
+      attribute :include_values, Dry::Types['bool'].default(false)
+      attribute :include_metadata, Dry::Types['bool'].default(true)
+      attribute :top_k, Dry::Types['integer'].default(10)
+      attribute? :vector, Dry::Types['array'].of(Dry::Types['float'] | Dry::Types['integer'])
+      # Disabled contract since it wasn't carrying forward attributes to to_json
+      # See failing test in query_spec.rb
+      # attribute? :filter, Filter 
+      attribute? :filter, Dry::Types['hash']
+      attribute? :sparse_vector, SparseVector
+      attribute? :id, Dry::Types['string']
+
+      def self.new(input)
+        validation = QueryContract.new.call(input)
+        if validation.success?
+          super(input)
+        else
+          raise ArgumentError.new(validation.errors.to_h.inspect)
+        end
+      end
+
+      def to_json
+        to_h.map do |key, value|
+          [key.to_s.split("_").map.with_index do |word, index|
+            index == 0 ? word : word.capitalize
+          end.join.to_sym, value]
+        end.to_h.to_json
+      end
+    end
+  end
+end

data/lib/pinecone/vector/sparse_vector.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "dry-struct"
+require "dry-validation"
+
+module Types
+  include Dry.Types()
+end
+
+module Pinecone
+  class Vector
+    class SparseVector < Dry::Struct
+      class SparseVectorContract < Dry::Validation::Contract
+        params do
+          required(:indices).filled(:array)
+          required(:values).filled(:array)
+        end
+
+        rule(:indices, :values) do
+          unless values[:indices].size === values[:values].size
+            key(:indices).failure("Indices and values must be the same size")
+            key(:values).failure("Indices and values must be the same size")
+          end
+        end
+      end
+
+      attribute :indices, Dry::Types['array'].of(Dry::Types['integer'])
+      attribute :values, Dry::Types['array'].of(Dry::Types['float'] | Dry::Types['integer'])
+
+      def self.new(input)
+        validation = SparseVectorContract.new.call(input)
+        if validation.success?
+          super(input)
+        else
+          raise ArgumentError.new(validation.errors.to_h.inspect)
+        end
+      end
+    end
+  end
+end

data/lib/pinecone/version.rb

@@ -1,3 +1,3 @@
 module Pinecone
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinecone
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Scott Carleton
@@ -162,6 +162,9 @@ files:
 - lib/pinecone/collection.rb
 - lib/pinecone/index.rb
 - lib/pinecone/vector.rb
+- lib/pinecone/vector/filter.rb
+- lib/pinecone/vector/query.rb
+- lib/pinecone/vector/sparse_vector.rb
 - lib/pinecone/version.rb
 homepage: https://rubygems.org/gems/pinecone
 licenses: