omniai-google 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef7814ad2fd60f7d89dd87a2350c23496d4846e172393bb0b8fbf3ffde48347f
-  data.tar.gz: 7ead40b0168c010885d0af4fb8633d5da67ef187508777aa506528a5946bef75
+  metadata.gz: 3f36d76cb11dd6560ced4cdc09989f40fe0c0461b27c67caf17a7620990d888d
+  data.tar.gz: c08242def01cf99eba317b78310b5cb9f7c88346893d1c929a23d89fb4b32f6d
 SHA512:
-  metadata.gz: f49152ce0896a0c4ed9668dcc5f4abce7363d4dfe907fd79a7511363fa5e8b7ec1797d1449653c22fb5dfbb9f49054359d7d57102607ec59699c113975d7fdb4
-  data.tar.gz: 8a88be48a793faefd52d98928fc57b9b1acdc84e1ad0d82735ca6605e63cfdfb7119c6835dc88c51d323cb4d0155a61d5c49995ae2f7b546b937ab333bb90471
+  metadata.gz: a3c01b3dd839b845944621e328c091d132ef104a01d7d4c1c59b6277211a05f7a68156d971ce9d632f08270b0b161bbc54d18ea4430902539c1c880c897bf8e6
+  data.tar.gz: 353201b366071ac3d4eac2b96c5c24acb3d5a73b09f04e13e2642e96f8eaec9d4ed8c67f50758dfb117221ea3d54d6478a9d4c7eb4f2360711b84598c53d3db2

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
 

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

@@ -28,6 +28,12 @@ module OmniAI
         data["predictions"].map { |prediction| prediction["embeddings"]["values"] }
       end
 
+      VERTEX_USAGE_DESERIALIZER = proc do |data, *|
+        tokens = data["predictions"].map { |prediction| prediction["embeddings"]["statistics"]["token_count"] }.sum
+
+        Usage.new(prompt_tokens: tokens, total_tokens: tokens)
+      end
+
       # @return [Context]
       DEFAULT_CONTEXT = Context.build do |context|
         context.deserializers[:embeddings] = DEFAULT_EMBEDDINGS_DESERIALIZER
@@ -36,6 +42,7 @@ module OmniAI
       # @return [Context]
       VERTEX_CONTEXT = Context.build do |context|
         context.deserializers[:embeddings] = VERTEX_EMBEDDINGS_DESERIALIZER
+        context.deserializers[:usage] = VERTEX_USAGE_DESERIALIZER
       end
 
     protected
@@ -50,12 +57,6 @@ module OmniAI
         vertex? ? VERTEX_CONTEXT : DEFAULT_CONTEXT
       end
 
-      # @param response [HTTP::Response]
-      # @return [Response]
-      def parse!(response:)
-        Response.new(data: response.parse, context:)
-      end
-
       # @return [Array[Hash]]
       def instances
         arrayify(@input).map { |content| { content: } }

data/lib/omniai/google/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Kevin Sylvestre