pinecone 0.1.6 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e278d71fc695cd9e6f0297cc0dd5e8fb6ec144cd1e599d394bb34f25dbcb4783
-  data.tar.gz: ecb5b591b5a8b3564c5b2790fbadf99f253925d60e25934f9fbcfec67a09b919
+  metadata.gz: ab3d946459844e4448d5d9ef3ec0856db62ce97c4e1201013ba33c046cc9d200
+  data.tar.gz: 419f33cf6d1c4876eb882b9109356bfc25f5d74fff52244f2b962c691d162301
 SHA512:
-  metadata.gz: 9b09cd21a242d82794ed5f6af15f9bd0f190d872f48a9ddce66e80eea9c9bdce191c09185d6e9d62058ca01d4ee32a98b2c4ee10460a4e726261eec1093d9da6
-  data.tar.gz: c3254d2c223308f0a0c56bb0c4b4f08fae0a807682f1ab502b7a622ebdea63a2cd719a691a1589d61888485938e5750fd4ea7d9b4e003d95d2115e9543e97a6d
+  metadata.gz: e552468414c4b38a77694e40b8cfd2782d0b48609b138e4e2559333b6ec1b31eef71274eb09db5bd15821a5e3419cfceb95bbdd67f5550066cebad14531e4fa3
+  data.tar.gz: fe81f10ec021bd54e9d5243e67446e69423d0e0845cfaa3f72cd06ab1a3c381136728b2eed9423fcb9305c9c8973101cef6588568ad7575c0be6dc40528e86f8

data/lib/pinecone/client.rb

@@ -39,8 +39,9 @@ module Pinecone
     end
 
     # This is a very confusing naming convention
+    # Pinecone's reference now delineates between 'control plane' and 'data plane' which we'll reflect eventually
     def index(index_name)
-      @index ||= Pinecone::Vector.new(index_name)
+      Pinecone::Vector.new(index_name)
     end
   end
-end
+end

data/lib/pinecone/collection.rb

@@ -1,19 +1,20 @@
 module Pinecone
   class Collection
     include HTTParty
+    parser Pinecone::ResponseParser
 
     def initialize
-      self.class.base_uri "https://controller.#{Pinecone.configuration.environment}.pinecone.io"
+      self.class.base_uri "https://api.pinecone.io"
 
       @headers = {
         "Content-Type" => "application/json",
         "Accept" => "application/json",
-        "Api-Key" => Pinecone.configuration.api_key,
+        "Api-Key" => Pinecone.configuration.api_key
       }
     end
 
     def list
-      self.class.get('/collections', options)
+      self.class.get("/collections", options)
     end
 
     def describe(collection_name)
@@ -22,7 +23,7 @@ module Pinecone
 
     def create(body)
       payload = options.merge(body: body.to_json)
-      self.class.post('/collections', payload)
+      self.class.post("/collections", payload)
     end
 
     def delete(collection_name)
@@ -31,8 +32,8 @@ module Pinecone
 
     def options
       {
-        headers: @headers,
+        headers: @headers
       }
     end
   end
-end
+end

data/lib/pinecone/index.rb

@@ -1,42 +1,43 @@
 module Pinecone
   class Index
     include HTTParty
+    parser Pinecone::ResponseParser
 
     def initialize
-      self.class.base_uri "https://controller.#{Pinecone.configuration.environment}.pinecone.io"
+      self.class.base_uri "https://api.pinecone.io"
       @headers = {
         "Content-Type" => "application/json",
         "Accept" => "application/json",
-        "Api-Key" => Pinecone.configuration.api_key,
+        "Api-Key" => Pinecone.configuration.api_key
       }
     end
 
     def list
-      self.class.get('/databases', options)
+      self.class.get("/indexes", options)
     end
 
     def describe(index_name)
-      self.class.get("/databases/#{index_name}", options)
+      self.class.get("/indexes/#{index_name}", options)
     end
-    
+
     def create(body)
       payload = options.merge(body: body.to_json)
-      self.class.post('/databases', payload)
+      self.class.post("/indexes", payload)
     end
 
     def delete(index_name)
-      self.class.delete("/databases/#{index_name}", options)
+      self.class.delete("/indexes/#{index_name}", options)
     end
 
     def configure(index_name, body)
       payload = options.merge(body: body.to_json)
-      self.class.patch("/databases/#{index_name}", payload)
+      self.class.patch("/indexes/#{index_name}", payload)
     end
 
     def options
       {
-        headers: @headers,
+        headers: @headers
       }
     end
   end
-end
+end

data/lib/pinecone/response_parser.rb

@@ -0,0 +1,16 @@
+module Pinecone
+  class ResponseParser < HTTParty::Parser
+    # standard:disable Naming/ConstantName
+    SupportedFormats = {
+      "application/json" => :json,
+      "text/plain" => :json
+    }
+    # standard:enable Naming/ConstantName
+
+    def json
+      JSON.parse(body)
+    rescue
+      body
+    end
+  end
+end

data/lib/pinecone/vector/filter.rb

@@ -6,9 +6,9 @@ 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']
+  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
@@ -50,7 +50,7 @@ module Pinecone
 
         def to_filter(input)
           return false unless input.is_a?(Hash)
-          return Filter.new(input)
+          Filter.new(input)
         end
       end
 
@@ -68,4 +68,4 @@ module Pinecone
       end
     end
   end
-end
+end

data/lib/pinecone/vector/query.rb

@@ -29,17 +29,17 @@ module Pinecone
 
       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'])
+      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? :filter, Filter
+      attribute? :filter, Dry::Types["hash"]
       attribute? :sparse_vector, SparseVector
-      attribute? :id, Dry::Types['string']
+      attribute? :id, Dry::Types["string"]
 
       def self.new(input)
         validation = QueryContract.new.call(input)
@@ -53,10 +53,10 @@ module Pinecone
       def to_json
         to_h.map do |key, value|
           [key.to_s.split("_").map.with_index do |word, index|
-            index == 0 ? word : word.capitalize
+            (index == 0) ? word : word.capitalize
           end.join.to_sym, value]
         end.to_h.to_json
       end
     end
   end
-end
+end

data/lib/pinecone/vector/sparse_vector.rb

@@ -24,8 +24,8 @@ module Pinecone
         end
       end
 
-      attribute :indices, Dry::Types['array'].of(Dry::Types['integer'])
-      attribute :values, Dry::Types['array'].of(Dry::Types['float'] | Dry::Types['integer'])
+      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)
@@ -37,4 +37,4 @@ module Pinecone
       end
     end
   end
-end
+end

data/lib/pinecone/vector.rb

@@ -5,46 +5,52 @@ require "pinecone/vector/sparse_vector"
 module Pinecone
   class Vector
     include HTTParty
+    parser Pinecone::ResponseParser
+
+    attr_reader :base_uri
 
     def initialize(index_name)
-      self.class.base_uri set_base_uri(index_name)
+      @base_uri = set_base_uri(index_name)
 
       @headers = {
         "Content-Type" => "application/json",
         "Accept" => "application/json",
-        "Api-Key" => Pinecone.configuration.api_key,
+        "Api-Key" => Pinecone.configuration.api_key
       }
     end
 
-    def delete(namespace: "", ids: [], delete_all: false)
+    def delete(namespace: "", ids: [], delete_all: false, filter: {})
       inputs = {
-        "namespace": namespace,
-        "ids": ids,
-        "deleteAll": delete_all,
-      }.to_json
-      payload = options.merge(body: inputs)
-      self.class.post('/vectors/delete', payload)
+        namespace: namespace,
+        ids: ids,
+        deleteAll: delete_all,
+        filter: filter
+      }
+
+      inputs.delete(:filter) if delete_all || ids.any?
+      payload = options.merge(body: inputs.to_json)
+      self.class.post("#{@base_uri}/vectors/delete", payload)
     end
 
     def fetch(namespace: "", ids: [])
-      query_string = URI.encode_www_form({ namespace: namespace, ids: ids})
-      self.class.get("/vectors/fetch?#{query_string}", options)
+      query_string = URI.encode_www_form({namespace: namespace, ids: ids})
+      self.class.get("#{@base_uri}/vectors/fetch?#{query_string}", options)
     end
 
     def upsert(body)
       payload = options.merge(body: body.to_json)
-      self.class.post('/vectors/upsert', payload)
+      self.class.post("#{@base_uri}/vectors/upsert", payload)
     end
 
     def query(query)
       object = query.is_a?(Pinecone::Vector::Query) ? query : Pinecone::Vector::Query.new(query)
       payload = options.merge(body: object.to_json)
-      self.class.post('/query', payload)
+      self.class.post("#{@base_uri}/query", payload)
     end
 
     def update(id:, values: [], sparse_values: {indices: [], values: []}, set_metadata: {}, namespace: "")
       inputs = {
-        "id": id
+        id: id
       }
       inputs["values"] = values unless values.empty?
       inputs["sparseValues"] = sparse_values unless sparse_values[:indices].empty? || sparse_values[:values].empty?
@@ -52,7 +58,7 @@ module Pinecone
       inputs["namespace"] = namespace unless namespace.empty?
 
       payload = options.merge(body: inputs.to_json)
-      self.class.post('/vectors/update', payload)
+      self.class.post("#{@base_uri}/vectors/update", payload)
     end
 
     def describe_index_stats(filter: {})
@@ -61,13 +67,12 @@ module Pinecone
       else
         options.merge(body: {filter: filter}.to_json)
       end
-      self.class.post('/describe_index_stats', payload)
+      self.class.post("#{@base_uri}/describe_index_stats", payload)
     end
 
-
     def options
       {
-        headers: @headers,
+        headers: @headers
       }
     end
 
@@ -77,8 +82,8 @@ module Pinecone
     def set_base_uri(index_name)
       index_description = Pinecone::Index.new.describe(index_name)
       raise Pinecone::IndexNotFoundError, "Index #{index_name} does not exist" if index_description.code != 200
-      uri = index_description.parsed_response["status"]["host"]
+      uri = index_description.parsed_response["host"]
       "https://#{uri}"
     end
   end
-end
+end

data/lib/pinecone/version.rb

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

data/lib/pinecone.rb

@@ -1,5 +1,6 @@
 require "httparty"
 
+require "pinecone/response_parser"
 require "pinecone/client"
 require "pinecone/index"
 require "pinecone/vector"
@@ -8,14 +9,16 @@ require "pinecone/version"
 
 module Pinecone
   class ConfigurationError < StandardError; end
+
   class IndexNotFoundError < StandardError; end
+
   class Configuration
     attr_writer :api_key, :base_uri, :environment
 
     def initialize
-      @api_key     = nil
+      @api_key = nil
       @environment = nil
-      @base_uri    = nil
+      @base_uri = nil
     end
 
     def api_key
@@ -48,4 +51,4 @@ module Pinecone
   def self.configure
     yield(configuration)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinecone
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.1
 platform: ruby
 authors:
 - Scott Carleton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -30,126 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 1.10.0
 description: Ruby client library which includes index and vector operations to upload
   embeddings into Pinecone and do similarity searches on them.
 email: scott@extrayarn.com
@@ -161,6 +63,7 @@ files:
 - lib/pinecone/client.rb
 - lib/pinecone/collection.rb
 - lib/pinecone/index.rb
+- lib/pinecone/response_parser.rb
 - lib/pinecone/vector.rb
 - lib/pinecone/vector/filter.rb
 - lib/pinecone/vector/query.rb
@@ -186,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Ruby client library for Pinecone Vector DB