omniai-google 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e870633ad811d978c7d3e70313d96d646a2ec03bd2ca989c24ebf84dfe9a1bbc
-  data.tar.gz: 5bdd175f1a6ec4299a76f02d00c66e6e8615f05408c3c77edbad2aca096c67f9
+  metadata.gz: ef7814ad2fd60f7d89dd87a2350c23496d4846e172393bb0b8fbf3ffde48347f
+  data.tar.gz: 7ead40b0168c010885d0af4fb8633d5da67ef187508777aa506528a5946bef75
 SHA512:
-  metadata.gz: bf8f59a91eff99a9b266f9d487b580999322e27107bc0591c12fe070ffe61b1a177452c3504f3f20a2cdcf38aec642a121a4212715c5f6ba594701b5c8f4ec94
-  data.tar.gz: 8ea4b0be462ce5df1e502323d2230df7652e83bc57afe8706517fe1c9188680c318ffcfc90a9e6728bd0f238339ab4aaba642dd05c0cd8d31ee7d3b365cadb09
+  metadata.gz: f49152ce0896a0c4ed9668dcc5f4abce7363d4dfe907fd79a7511363fa5e8b7ec1797d1449653c22fb5dfbb9f49054359d7d57102607ec59699c113975d7fdb4
+  data.tar.gz: 8a88be48a793faefd52d98928fc57b9b1acdc84e1ad0d82735ca6605e63cfdfb7119c6835dc88c51d323cb4d0155a61d5c49995ae2f7b546b937ab333bb90471

data/README.md

@@ -35,9 +35,7 @@ A client may also be passed the following options:
 
 Vertex AI and Google AI offer different options for interacting w/ Google's AI APIs. Checkout the [Vertex AI and Google AI differences](https://cloud.google.com/vertex-ai/generative-ai/docs/overview#how-gemini-vertex-different-gemini-aistudio) to determine which option best fits your requirements.
 
-#### Configuration w/ Gemini
-
-**w/ `api_key`**
+#### Configuration w/ Google AI
 
 If using Gemini simply provide an `api_key`:
 
@@ -47,7 +45,7 @@ OmniAI::Google.configure do |config|
 end
 ```
 
-#### Configuration w/ Vertex
+#### Configuration w/ Vertex AI
 
 If using Vertex supply the `credentials`, `host`, `location_id` and `project_id`:
 

data/lib/omniai/google/client.rb

@@ -109,6 +109,11 @@ module OmniAI
         !@credentials.nil?
       end
 
+      # @return [Boolean]
+      def vertex?
+        @host.include?("aiplatform.googleapis.com")
+      end
+
     private
 
       # @return [String] e.g. "Bearer ..."

data/lib/omniai/google/embed.rb

@@ -12,6 +12,7 @@ module OmniAI
     class Embed < OmniAI::Embed
       module Model
         TEXT_EMBEDDING_004 = "text-embedding-004"
+        TEXT_EMBEDDING_005 = "text-embedding-005"
         TEXT_MULTILINGUAL_EMBEDDING_002 = "text-multilingual-embedding-002"
         EMBEDDING = TEXT_EMBEDDING_004
         MULTILINGUAL_EMBEDDING = TEXT_MULTILINGUAL_EMBEDDING_002
@@ -19,24 +20,48 @@ module OmniAI
 
       DEFAULT_MODEL = Model::EMBEDDING
 
-      EMBEDDINGS_DESERIALIZER = proc do |data, *|
+      DEFAULT_EMBEDDINGS_DESERIALIZER = proc do |data, *|
         data["embeddings"].map { |embedding| embedding["values"] }
       end
 
+      VERTEX_EMBEDDINGS_DESERIALIZER = proc do |data, *|
+        data["predictions"].map { |prediction| prediction["embeddings"]["values"] }
+      end
+
+      # @return [Context]
+      DEFAULT_CONTEXT = Context.build do |context|
+        context.deserializers[:embeddings] = DEFAULT_EMBEDDINGS_DESERIALIZER
+      end
+
       # @return [Context]
-      CONTEXT = Context.build do |context|
-        context.deserializers[:embeddings] = EMBEDDINGS_DESERIALIZER
+      VERTEX_CONTEXT = Context.build do |context|
+        context.deserializers[:embeddings] = VERTEX_EMBEDDINGS_DESERIALIZER
       end
 
     protected
 
+      # @return [Boolean]
+      def vertex?
+        @client.vertex?
+      end
+
+      # @return [Context]
+      def context
+        vertex? ? VERTEX_CONTEXT : DEFAULT_CONTEXT
+      end
+
       # @param response [HTTP::Response]
       # @return [Response]
       def parse!(response:)
-        Response.new(data: response.parse, context: CONTEXT)
+        Response.new(data: response.parse, context:)
+      end
+
+      # @return [Array[Hash]]
+      def instances
+        arrayify(@input).map { |content| { content: } }
       end
 
-      # @return [Array<Hash<{ text: String }>]
+      # @return [Array[Hash]]
       def requests
         arrayify(@input).map do |text|
           {
@@ -48,14 +73,26 @@ module OmniAI
 
       # @return [Hash]
       def payload
-        { requests: }
+        vertex? ? { instances: } : { requests: }
+      end
+
+      # @return [Hash]
+      def params
+        { key: (@client.api_key unless @client.credentials?) }.compact
       end
 
       # @return [String]
       def path
-        "/#{@client.path}/models/#{@model}:batchEmbedContents?key=#{@client.api_key}"
+        "/#{@client.path}/models/#{@model}:#{procedure}"
+      end
+
+      # @return [String]
+      def procedure
+        vertex? ? "predict" : "batchEmbedContents"
       end
 
+      # @param input [Object]
+      # @return [Array]
       def arrayify(input)
         input.is_a?(Array) ? input : [input]
       end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "2.2.2"
+    VERSION = "2.3.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 bindir: exe
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement