omniai-google 2.2.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e870633ad811d978c7d3e70313d96d646a2ec03bd2ca989c24ebf84dfe9a1bbc
-  data.tar.gz: 5bdd175f1a6ec4299a76f02d00c66e6e8615f05408c3c77edbad2aca096c67f9
+  metadata.gz: 904b9944d8f92b2dd343568a5185c0adf8151d84e57698a85542187f88e5b469
+  data.tar.gz: fbcac301f2f80c16b3ad2d1c3e1d812ea52c9ea7f5ba5ca0ba22c2f2e7b5a594
 SHA512:
-  metadata.gz: bf8f59a91eff99a9b266f9d487b580999322e27107bc0591c12fe070ffe61b1a177452c3504f3f20a2cdcf38aec642a121a4212715c5f6ba594701b5c8f4ec94
-  data.tar.gz: 8ea4b0be462ce5df1e502323d2230df7652e83bc57afe8706517fe1c9188680c318ffcfc90a9e6728bd0f238339ab4aaba642dd05c0cd8d31ee7d3b365cadb09
+  metadata.gz: ac86234994438b8197e88ce447479aab12aaddef77e2d50e04c58560af2d83c0f18af34512de2e19524ae383203194dd42fb4264510bd01aed26a60bc8e77cf8
+  data.tar.gz: 9a212401e92a2ab193fab62db2b01da7f7012c42ba4e1f95a5446b921a57946c816347248138f98c0a8f387cbe2fcef359fc0a8189363388aff0c2ffd76aa2d8

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

@@ -50,7 +50,7 @@ module OmniAI
 
         @project_id = project_id
         @location_id = location_id
-        @credentials = credentials
+        @credentials = Credentials.parse(credentials)
         @version = version
       end
 
@@ -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/config.rb

@@ -51,7 +51,7 @@ module OmniAI
         Credentials.detect
       end
 
-      # @param value [String, File, Google::Auth::ServiceAccountCredentials, nil]
+      # @param value [String, File, Hash, Google::Auth::ServiceAccountCredentials, nil]
       def credentials=(value)
         @credentials = Credentials.parse(value)
       end

data/lib/omniai/google/credentials.rb

@@ -17,14 +17,15 @@ module OmniAI
         end
       end
 
-      # @param value [Google::Auth::ServiceAccountCredentials, IO, Pathname, String nil]
+      # @param value [Google::Auth::ServiceAccountCredentials, IO, Pathname, String, Hash, nil]
       # @return [Google::Auth::ServiceAccountCredentials]
       def self.parse(value)
         case value
-        when ::Google::Auth::ServiceAccountCredentials then value
         when IO, StringIO then ::Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: value, scope: SCOPE)
+        when Hash then parse(JSON.generate(value))
         when Pathname then parse(File.open(value))
         when String then parse(StringIO.new(value))
+        else value
         end
       end
     end

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.1"
   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.1
 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