omniai-google 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160ee5b0f488ea6fc30c0439f1e6d813ee5aedf89c0174a3e241d4c6ea68b9d7
-  data.tar.gz: 20f52dfc6dc50cccbb1224eaf8c61403e7e523ef13f475da7bc2ada3c024a32f
+  metadata.gz: 211c1f9d1640953f0494852010f90e347763fc2c5ded1430506c07118d31452d
+  data.tar.gz: b768a2e8d92ee643168b61fbeaff90fe1cd5efa385e0aedbb29015e6c85ceb92
 SHA512:
-  metadata.gz: ba9c0537a440707d32a94ccbfdec106836c4e43b21bd9310b6d55d2ca431b96943a4a5c320c1182e4c2fc13d0bd214a5f5c7e10ab4a9f62b1fb0953dda8f3d14
-  data.tar.gz: 83a30a54a45daf71b0ebfbb5e53862cddec04f94c6cfddd20fb2dbb37a66d34148a66fb23ac44e9f3eba50884802ce5f4e87c94522ecd82fcb27f82fd5833a67
+  metadata.gz: a36130f6939632b59138d12c9d96d8ba59b6c5f0b17c5adc868bc1df482ac2a04020dd516a778ed7857ed84d5fa01bbf4a5c12d9ad07d3697edc8dbc4a234f4a
+  data.tar.gz: 34e61e6506e4d99185253e7aaf70c41e5fc2f802ce28321b5483fa417fa52bc9edfb505c45bbfb312f3f1a545814aac0b7c09d989149231a9dcfdcfc7f9830cd

data/lib/omniai/google/chat/chunk.rb

@@ -10,7 +10,7 @@ module OmniAI
           @choices ||= [].tap do |choices|
             @data['candidates'].each do |candidate|
               candidate['content']['parts'].each do |part|
-                choices << OmniAI::Chat::Choice.for(data: {
+                choices << OmniAI::Chat::DeltaChoice.for(data: {
                   'index' => candidate['index'],
                   'delta' => { 'role' => candidate['content']['role'], 'content' => part['text'] },
                 })

data/lib/omniai/google/chat/completion.rb

@@ -10,7 +10,7 @@ module OmniAI
           @choices ||= [].tap do |entries|
             @data['candidates'].each do |candidate|
               candidate['content']['parts'].each do |part|
-                entries << OmniAI::Chat::Choice.for(data: {
+                entries << OmniAI::Chat::MessageChoice.for(data: {
                   'index' => candidate['index'],
                   'message' => { 'role' => candidate['content']['role'], 'content' => part['text'] },
                 })

data/lib/omniai/google/client.rb

@@ -20,31 +20,29 @@ module OmniAI
     #
     #   client = OmniAI::Google::Client.new
     class Client < OmniAI::Client
+      # @!attribute [rw] version
+      #   @return [String, nil]
       attr_accessor :version
 
       # @param api_key [String] optional - defaults to `OmniAI::Google.config.api_key`
       # @param host [String] optional - defaults to `OmniAI::Google.config.host`
       # @param version [String] optional - defaults to `OmniAI::Google.config.version`
       # @param logger [Logger] optional - defaults to `OmniAI::Google.config.logger`
+      # @param timeout [Integer] optional - defaults to `OmniAI::Google.config.timeout`
       def initialize(
         api_key: OmniAI::Google.config.api_key,
         logger: OmniAI::Google.config.logger,
         host: OmniAI::Google.config.host,
-        version: OmniAI::Google.config.version
+        version: OmniAI::Google.config.version,
+        timeout: OmniAI::Google.config.timeout
       )
         raise(ArgumentError, %(ENV['GOOGLE_API_KEY'] must be defined or `api_key` must be passed)) if api_key.nil?
 
-        super(api_key:, logger:)
+        super(api_key:, host:, logger:, timeout:)
 
-        @host = host
         @version = version
       end
 
-      # @return [HTTP::Client]
-      def connection
-        HTTP.persistent(@host)
-      end
-
       # @raise [OmniAI::Error]
       #
       # @param messages [String, Array, Hash]

data/lib/omniai/google/config.rb

@@ -2,16 +2,29 @@
 
 module OmniAI
   module Google
-    # Config for the Google `api_key` / `host` / `logger` / `version`, `chat_options`.
+    # Configuration for Google.
     class Config < OmniAI::Config
-      attr_accessor :chat_options, :version
+      DEFAULT_HOST = 'https://generativelanguage.googleapis.com'
+      DEFAULT_VERSION = 'v1'
 
-      def initialize
-        super
-        @api_key = ENV.fetch('GOOGLE_API_KEY', nil)
-        @host = ENV.fetch('GOOGLE_HOST', 'https://generativelanguage.googleapis.com')
-        @version = ENV.fetch('GOOGLE_VERSION', 'v1')
-        @chat_options = {}
+      # @!attribute [rw] version
+      #   @return [String, nil]
+      attr_accessor :version
+
+      # @param api_key [String, nil] optional - defaults to `ENV['GOOGLE_API_KEY']`
+      # @param host [String, nil] optional - defaults to `ENV['GOOGLE_HOST'] w/ fallback to `DEFAULT_HOST`
+      # @param version [String, nil] optional - defaults to `ENV['GOOGLE_VERSION'] w/ fallback to `DEFAULT_VERSION`
+      # @param logger [Logger, nil] optional - defaults to
+      # @param timeout [Integer, Hash, nil] optional
+      def initialize(
+        api_key: ENV.fetch('GOOGLE_API_KEY', nil),
+        host: ENV.fetch('GOOGLE_HOST', DEFAULT_HOST),
+        version: ENV.fetch('GOOGLE_VERSION', DEFAULT_VERSION),
+        logger: nil,
+        timeout: nil
+      )
+        super(api_key:, host:, logger:, timeout:)
+        @version = version
       end
     end
   end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser