omniai-google 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc0ec04a882a2e35a5d7ff7b613bde89641e57a67ed4a68cdb84ab72d04a982
-  data.tar.gz: a72573e3a57e13b6bf56e33c4133ea4a9ae0c4c3d79688979a8f166345508a6f
+  metadata.gz: 3a64561af96984da60b42099f415cdb90d738757f6108af74b035e1a2e5d34ce
+  data.tar.gz: 837b82e0ec5e45b3300858591f1a60ffd2783d16d0c5b1ad8280dd9585d944de
 SHA512:
-  metadata.gz: 3cd82fccac3f31b37f9505569ff411d91c9c2a9429fde7308c7b5b34abe922bd4734613f355ed616ff27ff49502c17714d380d0676a2f6f63493fa4baf65c0bc
-  data.tar.gz: c1ac419641eebf177c72a425ac695e5fad10d09cd943998c5952d29ace751234a135eeb009e3000db47869de07db675bbadcddec6cd225ce851641635ffc2550
+  metadata.gz: abb56f1dc0d7ddb3efcd79ffcd132c45c85e3ca5fc43f72bfc8fd94b535f0bf76bb32946e1dca7e55cb180bc8d7492ecc116f16cb7fd8b454825f38395c92f22
+  data.tar.gz: 9baa74ce37c0a0c7a20b9f36e15d205a89df9556042d17e999f622c86e505f1f5ace1b143091f346120045102e62a1b4bf34d522d4c90b179aec8773f34b8c78

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

@@ -23,6 +23,46 @@ module OmniAI
         GEMINI_FLASH = GEMINI_1_5_FLASH
       end
 
+      TEXT_SERIALIZER = lambda do |content, *|
+        { text: content.text }
+      end
+
+      # @param [Message]
+      # @return [Hash]
+      # @example
+      #   message = Message.new(...)
+      #   MESSAGE_SERIALIZER.call(message)
+      MESSAGE_SERIALIZER = lambda do |message, context:|
+        parts = message.content.is_a?(String) ? [Text.new(message.content)] : message.content
+
+        {
+          role: message.role,
+          parts: parts.map { |part| part.serialize(context:) },
+        }
+      end
+
+      # @param [Media]
+      # @return [Hash]
+      # @example
+      #   media = Media.new(...)
+      #   MEDIA_SERIALIZER.call(media)
+      MEDIA_SERIALIZER = lambda do |media, *|
+        {
+          inlineData: {
+            mimeType: media.type,
+            data: media.data,
+          },
+        }
+      end
+
+      # @return [Context]
+      CONTEXT = Context.build do |context|
+        context.serializers[:message] = MESSAGE_SERIALIZER
+        context.serializers[:text] = TEXT_SERIALIZER
+        context.serializers[:file] = MEDIA_SERIALIZER
+        context.serializers[:url] = MEDIA_SERIALIZER
+      end
+
       protected
 
       # @return [HTTP::Response]
@@ -40,10 +80,20 @@ module OmniAI
       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
@@ -57,9 +107,7 @@ module OmniAI
       #
       # @return [Array<Hash>]
       def contents
-        messages.map do |message|
-          { role: message[:role], parts: [{ text: message[:content] }] }
-        end
+        @prompt.serialize(context: CONTEXT)
       end
 
       # @return [String]

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.4.0'
+    VERSION = '1.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2024-07-18 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