omniai-google 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c29d5c7580f38ae07eb596186fea540ccd1e179dccd906b3fb1473c187546c
-  data.tar.gz: 187dc0cffd36841469b5fd998216f3f3fa2a56b1cce7bd7d51c9ececa12784e9
+  metadata.gz: dd9502894aaf9bafda46ad7c4475d0cd155f7ac50b582c5dd2d334357e082c61
+  data.tar.gz: 6e7ccb59aa0bcb92654cf1e6917da4f058b1687aefda2ec096c8f1e725953b47
 SHA512:
-  metadata.gz: 0ddd16af090b9692ff68f7d816e7d153759dd65793d7b816ae40e5ce195c0341f4c6959df4a1bfc09a9452df07bd6fe9633ccc7b46a89e2513c3a417c9f12ad0
-  data.tar.gz: 48c1d3a78de86387e9a95716ece83d27cb4c128bacc43285ed3830d210f2769516bfd69e9212f66caaf0e38dfe77ddcabd67d0005b4d21eeed41094de60e1590
+  metadata.gz: 3100656557336fc035bdb236ecd500b5e17289598f1153af80863c8aac81ecebcd6722fb2166e184a5883ffc5515233294b09cf63edec0c1b3279f928d6788c0
+  data.tar.gz: cd9f92d8b16721306681c83352b3f305eac681a4e0370b24407ca7019a37d3684521386a5682b17ca38e165f2cff84a34d6d84ea409df0295d186dcf7180a94d

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'logger'
 gem 'rake'
 gem 'rspec'
 gem 'rspec_junit_formatter'

data/README.md

@@ -1,6 +1,10 @@
 # OmniAI::Google
 
-[![CircleCI](https://circleci.com/gh/ksylvest/omniai-google.svg?style=svg)](https://circleci.com/gh/ksylvest/omniai-google)
+[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/ksylvest/omniai-google/blob/main/LICENSE)
+[![RubyGems](https://img.shields.io/gem/v/omniai-google)](https://rubygems.org/gems/omniai-google)
+[![GitHub](https://img.shields.io/badge/github-repo-blue.svg)](https://github.com/ksylvest/omniai-google)
+[![Yard](https://img.shields.io/badge/docs-site-blue.svg)](https://omniai-google.ksylvest.com)
+[![CircleCI](https://img.shields.io/circleci/build/github/ksylvest/omniai-google)](https://circleci.com/gh/ksylvest/omniai-google)
 
 A Google implementation of the [OmniAI](https://github.com/ksylvest/omniai) APIs.
 
@@ -90,4 +94,29 @@ end
 client.chat('Be poetic.', stream:)
 ```
 
+### Upload
+
+An upload is especially useful when processing audio / image / video / text files. To use:
+
+```ruby
+CAT_URL = 'https://images.unsplash.com/photo-1472491235688-bdc81a63246e?fm=jpg'
+DOG_URL = 'https://images.unsplash.com/photo-1517849845537-4d257902454a?fm=jpg'
+
+begin
+  cat_upload = client.upload(CAT_URL)
+  dog_upload = client.upload(DOG_URL)
+
+  completion = client.chat(stream: $stdout) do |prompt|
+    prompt.user do |message|
+      message.text 'What are these photos of?'
+      message.url(cat_upload.uri, cat_upload.mime_type)
+      message.url(dog_upload.uri, dog_upload.mime_type)
+    end
+  end
+ensure
+  cat_upload.delete!
+  dog_upload.delete!
+end
+```
+
 [Google API Reference `stream`](https://ai.google.dev/gemini-api/docs/api-overview#stream)

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

@@ -6,8 +6,21 @@ module OmniAI
       # Overrides media serialize / deserialize.
       module MediaSerializer
         # @param media [OmniAI::Chat::Media]
-        # @return [Hash]
-        def self.serialize(media, *)
+        #
+        # @return [hash]
+        def self.serialize_as_file_data(media)
+          {
+            fileData: {
+              mimeType: media.type,
+              fileUri: media.uri,
+            },
+          }
+        end
+
+        # @param media [OmniAI::Chat::Media]
+        #
+        # @return [hash]
+        def self.serialize_as_inline_data(media)
           {
             inlineData: {
               mimeType: media.type,
@@ -15,6 +28,24 @@ module OmniAI
             },
           }
         end
+
+        # @param media [OmniAI::Chat::Media]
+        #
+        # @return [Hash]
+        def self.serialize(media, *)
+          if media.is_a?(OmniAI::Chat::URL) && use_file_data?(URI.parse(media.uri))
+            serialize_as_file_data(media)
+          else
+            serialize_as_inline_data(media)
+          end
+        end
+
+        # @param uri [URI]
+        #
+        # @return [Boolean]
+        def self.use_file_data?(uri)
+          uri.host.eql?('generativelanguage.googleapis.com') || uri.scheme.eql?('gs')
+        end
       end
     end
   end

data/lib/omniai/google/client.rb

@@ -59,6 +59,15 @@ module OmniAI
       def chat(messages = nil, model: Chat::DEFAULT_MODEL, temperature: nil, format: nil, stream: nil, tools: nil, &)
         Chat.process!(messages, model:, temperature:, format:, stream:, tools:, client: self, &)
       end
+
+      # @param io [File, String] required - a file or URL
+      #
+      # @raise [OmniAI::Google::Upload::FetchError]
+      #
+      # @return [OmniAI::Google::Upload::File]
+      def upload(io)
+        Upload.process!(client: self, io:)
+      end
     end
   end
 end

data/lib/omniai/google/upload/file.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    class Upload
+      # A file that can be used for generating chat completions.
+      class File
+        class DeleteError < HTTPError; end
+
+        # @!attribute [rw] name
+        #   @return [String]
+        attr_accessor :name
+
+        # @attribute [rw] uri
+        #   @return [String]
+        attr_accessor :uri
+
+        # @attribute [rw] state
+        #   @return [String]
+        attr_accessor :state
+
+        # @attribute [rw] mime_type
+        #   @return [String]
+        attr_accessor :mime_type
+
+        # @param client [Client]
+        # @param data [Hash]
+        #
+        # @return [File]
+        def self.parse(client:, data:)
+          new(
+            client: client,
+            name: data['name'],
+            uri: data['uri'],
+            state: data['state'],
+            mime_type: data['mimeType']
+          )
+        end
+
+        # @param client [Client]
+        # @param name [String]
+        # @param uri [String]
+        # @param state [String]
+        # @param mime_type [String]
+        def initialize(client:, name:, uri:, state:, mime_type:)
+          @client = client
+          @name = name
+          @uri = uri
+          @state = state
+          @mime_type = mime_type
+        end
+
+        # @raise [DeleteError]
+        def delete!
+          response = @client.connection
+            .delete("/#{@client.version}/#{@name}", params: { key: @client.api_key })
+
+          raise DeleteError, response unless response.status.success?
+        end
+      end
+    end
+  end
+end

data/lib/omniai/google/upload.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    # Uploads a file to Google to be used when generating completions.
+    class Upload
+      class FetchError < HTTPError; end
+
+      # @param client [Client]
+      # @param io [IO]
+      # @param mime_type [String]
+      def self.process!(client:, io:)
+        new(client:, io:).process!
+      end
+
+      # @param client [Client]
+      # @param file [File]
+      # @param mime_type [String]
+      def initialize(client:, io:)
+        @client = client
+        @io = io
+      end
+
+      # @raise [HTTPError]
+      #
+      # @return [Upload::File]
+      def process!
+        response = io! do |io|
+          response = @client
+            .connection
+            .headers({ 'X-Goog-Upload-Protocol' => 'raw' })
+            .post("/upload/#{@client.version}/files?key=#{@client.api_key}", body: HTTP::FormData::File.new(io))
+        end
+
+        raise OmniAI::HTTPError, response.flush unless response.status.ok?
+
+        File.parse(client: @client, data: response.parse['file'])
+      end
+
+      protected
+
+      # @raise [FetchError]
+      #
+      # @yield [io]
+      # @yieldparam io [IO]
+      def io!(&block)
+        case @io
+        when File, IO then block.call(@io)
+        else fetch!(&block)
+        end
+      end
+
+      # @raise [FetchError]
+      #
+      # @yield [tempfile]
+      # @yieldparam tempfile [Tempfile]
+      def fetch!
+        tempfile = Tempfile.new
+        tempfile.binmode
+
+        response = HTTP.follow.get(@io)
+        raise FetchError, response.flush unless response.status.success?
+
+        response.body.each { |chunk| tempfile.write(chunk) }
+        tempfile.rewind
+
+        yield(tempfile)
+      ensure
+        tempfile.close
+        tempfile.unlink
+      end
+    end
+  end
+end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = '1.9.0'
+    VERSION = '1.9.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -76,6 +76,8 @@ files:
 - lib/omniai/google/chat/usage_serializer.rb
 - lib/omniai/google/client.rb
 - lib/omniai/google/config.rb
+- lib/omniai/google/upload.rb
+- lib/omniai/google/upload/file.rb
 - lib/omniai/google/version.rb
 homepage: https://github.com/ksylvest/omniai-google
 licenses: