omniai-google 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 211c1f9d1640953f0494852010f90e347763fc2c5ded1430506c07118d31452d
-  data.tar.gz: b768a2e8d92ee643168b61fbeaff90fe1cd5efa385e0aedbb29015e6c85ceb92
+  metadata.gz: 5654724585620a00d0254e9eb55a80eccae2bc0d58e13bd44cc10d4ccfd3abd4
+  data.tar.gz: 3253d076f87054ed57ae84279f83b8dcb06493b504ffecf4fde5ba9d2d0150e0
 SHA512:
-  metadata.gz: a36130f6939632b59138d12c9d96d8ba59b6c5f0b17c5adc868bc1df482ac2a04020dd516a778ed7857ed84d5fa01bbf4a5c12d9ad07d3697edc8dbc4a234f4a
-  data.tar.gz: 34e61e6506e4d99185253e7aaf70c41e5fc2f802ce28321b5483fa417fa52bc9edfb505c45bbfb312f3f1a545814aac0b7c09d989149231a9dcfdcfc7f9830cd
+  metadata.gz: 28b889a214a03e16478a0ad57856e53faabc28e007b75c165723136110aba6dcca2ffb3ba31a4244b4294922a44e14639d570d2a011131ec8a2a4df0fc923a6e
+  data.tar.gz: 0ac2802328f1acda7739039f9365fd2eaecd78a11255dee060b853481c7e85e517060080dfcfbf943eb4088bd92efed9a5252d17d8f54750f80e6189106d4abd

data/Gemfile

@@ -5,7 +5,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-
 gem 'rspec'
 gem 'rspec_junit_formatter'
 gem 'rubocop'
@@ -13,3 +12,4 @@ gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'simplecov'
 gem 'webmock'
+gem 'yard'

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    class Chat
+      module Response
+        # A chunk given when streaming.
+        class Chunk < OmniAI::Chat::Response::Chunk
+          # @return [Array<OmniAI::Chat::Choice>]
+          def choices
+            @choices ||= [].tap do |choices|
+              @data['candidates'].each do |candidate|
+                candidate['content']['parts'].each do |part|
+                  choices << OmniAI::Chat::Response::DeltaChoice.new(data: {
+                    'index' => candidate['index'],
+                    'delta' => {
+                      'role' => candidate['content']['role'],
+                      'content' => part['text'],
+                    },
+                  })
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    class Chat
+      module Response
+        # A completion returned by the API.
+        class Completion < OmniAI::Chat::Response::Completion
+          # @return [Array<OmniAI::Chat::Choice>]
+          def choices
+            @choices ||= [].tap do |entries|
+              @data['candidates'].each do |candidate|
+                candidate['content']['parts'].each do |part|
+                  entries << OmniAI::Chat::Response::MessageChoice.new(data: {
+                    'index' => candidate['index'],
+                    'message' => {
+                      'role' => candidate['content']['role'],
+                      'content' => part['text'],
+                    },
+                  })
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniai/google/chat/response/stream.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    class Chat
+      module Response
+        # A stream given when streaming.
+        class Stream < OmniAI::Chat::Response::Stream
+          # @yield [OmniAI::Chat::Chunk]
+          def stream!(&)
+            @response.body.each do |chunk|
+              @parser.feed(chunk) do |_, data|
+                yield(Chunk.new(data: JSON.parse(data)))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniai/google/chat.rb

@@ -36,28 +36,24 @@ module OmniAI
           }.compact, json: payload)
       end
 
-      # @param response [HTTP::Response]
-      # @return [OmniAI::Google::Chat::Stream]
-      def stream!(response:)
-        raise Error, "#{self.class.name}#stream! unstreamable" unless @stream
-
-        Stream.new(response:).stream! { |chunk| @stream.call(chunk) }
-      end
-
-      # @param response [HTTP::Response]
-      # @param response [OmniAI::Google::Chat::Completion]
-      def complete!(response:)
-        Completion.new(data: response.parse)
-      end
-
       # @return [Hash]
       def payload
         OmniAI::Google.config.chat_options.merge({
           contents:,
+          tools:,
           generationConfig: generation_config,
         }).compact
       end
 
+      # @return [Hash]
+      def tools
+        return unless @tools
+
+        [
+          function_declarations: @tools&.map(&:prepare),
+        ]
+      end
+
       # @return [Hash]
       def generation_config
         return unless @temperature

data/lib/omniai/google/client.rb

@@ -50,10 +50,11 @@ module OmniAI
       # @param format [Symbol] optional :text or :json
       # @param temperature [Float, nil] optional
       # @param stream [Proc, nil] optional
+      # @param tools [Array<OmniAI::Chat::Tool>, nil] optional
       #
       # @return [OmniAI::Chat::Completion]
-      def chat(messages, model: Chat::Model::GEMINI_PRO, temperature: nil, format: nil, stream: nil)
-        Chat.process!(messages, model:, temperature:, format:, stream:, client: self)
+      def chat(messages, model: Chat::Model::GEMINI_PRO, temperature: nil, format: nil, stream: nil, tools: nil)
+        Chat.process!(messages, model:, temperature:, format:, stream:, tools:, client: self)
       end
     end
   end

data/lib/omniai/google/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -63,9 +63,9 @@ files:
 - README.md
 - lib/omniai/google.rb
 - lib/omniai/google/chat.rb
-- lib/omniai/google/chat/chunk.rb
-- lib/omniai/google/chat/completion.rb
-- lib/omniai/google/chat/stream.rb
+- lib/omniai/google/chat/response/chunk.rb
+- lib/omniai/google/chat/response/completion.rb
+- lib/omniai/google/chat/response/stream.rb
 - lib/omniai/google/client.rb
 - lib/omniai/google/config.rb
 - lib/omniai/google/version.rb
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.14
 signing_key: 
 specification_version: 4
 summary: A generalized framework for interacting with Google

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module OmniAI
-  module Google
-    class Chat
-      # A chunk given when streaming.
-      class Chunk < OmniAI::Chat::Chunk
-        # @return [Array<OmniAI::Chat::Choice>]
-        def choices
-          @choices ||= [].tap do |choices|
-            @data['candidates'].each do |candidate|
-              candidate['content']['parts'].each do |part|
-                choices << OmniAI::Chat::DeltaChoice.for(data: {
-                  'index' => candidate['index'],
-                  'delta' => { 'role' => candidate['content']['role'], 'content' => part['text'] },
-                })
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module OmniAI
-  module Google
-    class Chat
-      # A completion returned by the API.
-      class Completion < OmniAI::Chat::Completion
-        # @return [Array<OmniAI::Chat::Choice>]
-        def choices
-          @choices ||= [].tap do |entries|
-            @data['candidates'].each do |candidate|
-              candidate['content']['parts'].each do |part|
-                entries << OmniAI::Chat::MessageChoice.for(data: {
-                  'index' => candidate['index'],
-                  'message' => { 'role' => candidate['content']['role'], 'content' => part['text'] },
-                })
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module OmniAI
-  module Google
-    class Chat
-      # A stream given when streaming.
-      class Stream < OmniAI::Chat::Stream
-        # @yield [OmniAI::Chat::Chunk]
-        def stream!(&)
-          @response.body.each do |chunk|
-            @parser.feed(chunk) do |_, data|
-              yield(Chunk.new(data: JSON.parse(data)))
-            end
-          end
-        end
-      end
-    end
-  end
-end