omniai 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24e77ca1695f294daa0762f9c4c9b32a39ba329d8745d10d8b9fdd5c98917838
-  data.tar.gz: c6594df5e048bd4c7ea5d04bc3a66a01a2311ff2ff36ec5ee60db22afca7e412
+  metadata.gz: cca8dd5cc19989ca0a3fc89d1e8f2c5a56611378a202ea8da2fd49528454ea6c
+  data.tar.gz: ee0abcf49b13df01ed5b63ed557de44d42d640fb966bcfb5c7592e19aff06f93
 SHA512:
-  metadata.gz: 274c978038080fbbb760dc3341a6ffdd103bd7ac176511189f1f36d8287084800dd5fdbb098138a3bb2b4405e7272763423b9815f1c2d1ca735a3f55f16271a4
-  data.tar.gz: 39e42f5e5ea5031653b2d6474326c767183270f6ca3dd1ff0b873c64fdc1999df1bcc58015457f5c8673b1c4544ef4d4fe39c72e7eb450951a839a5cc27b7382
+  metadata.gz: eb48e8f76d7cd1836ad8dc0ceb577362a3f289026749e2cc49044e31d25758a625ff66fe8003be12dc09585d9ee571671dd4f6d0b8c355cc7962eb4c136ec9f0
+  data.tar.gz: 41cf6419a3cf3c1662e2f6c5925ae5a05e991f6f2e8f81bcf3d5dfb62ad029bf3d6c32565892ef81acc651a43533dc3a7e9efb2c75922bbdddf28bb29e18b3c2

data/Gemfile

@@ -4,11 +4,13 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'factory_bot'
 gem 'logger'
 gem 'rake'
 gem 'rspec'
 gem 'rspec_junit_formatter'
 gem 'rubocop'
+gem 'rubocop-factory_bot'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'simplecov'

data/README.md

@@ -128,7 +128,7 @@ Generating a completion is as simple as sending in the text:
 
 ```ruby
 completion = client.chat('Tell me a joke.')
-completion.choice.message.content # 'Why don't scientists trust atoms? They make up everything!'
+completion.text # 'Why don't scientists trust atoms? They make up everything!'
 ```
 
 #### Completions using a Complex Prompt
@@ -145,7 +145,7 @@ completion = client.chat do |prompt|
     message.file('./hamster.jpeg', "image/jpeg")
   end
 end
-completion.choice.message.content  # 'They are photos of a cat, a cat, and a hamster.'
+completion.text  # 'They are photos of a cat, a cat, and a hamster.'
 ```
 
 #### Completions using Streaming via Proc
@@ -154,7 +154,7 @@ A real-time stream of messages can be generated by passing in a proc:
 
 ```ruby
 stream = proc do |chunk|
-  print(chunk.choice.delta.content) # '...'
+  print(chunk.text) # '...'
 end
 client.chat('Tell me a joke.', stream:)
 ```
@@ -179,12 +179,12 @@ tool = OmniAI::Tool.new(
   parameters: OmniAI::Tool::Parameters.new(
     properties: {
       location: OmniAI::Tool::Property.string(description: 'e.g. Toronto'),
-      unit: OmniAI::Tool::Property.string(enum: %w[celcius farenheit]),
+      unit: OmniAI::Tool::Property.string(enum: %w[celcius fahrenheit]),
     },
     required: %i[location]
   )
 )
-client.chat('What is the weather in "London" and "Madrid"?', tools: [tool])
+client.chat('What is the weather in "London" in celcius and "Paris" in fahrenheit?', tools: [tool])
 ```
 
 ### Transcribe
@@ -315,10 +315,3 @@ Type 'exit' or 'quit' to abort.
 0.0
 ...
 ```
-
-0.0
-...
-
-```
-
-```

data/lib/omniai/chat/choice.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module OmniAI
+  class Chat
+    # For for.
+    class Choice
+      # @return [Integer]
+      attr_accessor :index
+
+      # @return [Message]
+      attr_accessor :message
+
+      # @param message [Message]
+      # @param index [Integer]
+      # @param tool_call_list [Array<ToolCall>]
+      def initialize(message:, index: 0)
+        @message = message
+        @index = index
+      end
+
+      # @return [String]
+      def inspect
+        "#<#{self.class.name} index=#{@index} message=#{@message.inspect}>"
+      end
+
+      # @param data [Hash]
+      # @param context [OmniAI::Context] optional
+      #
+      # @return [Choice]
+      def self.deserialize(data, context: nil)
+        deserialize = context&.deserializer(:choice)
+        return deserialize.call(data, context:) if deserialize
+
+        index = data['index']
+        message = Message.deserialize(data['message'] || data['delta'], context:)
+
+        new(message:, index:)
+      end
+
+      # @param context [OmniAI::Context] optional
+      # @return [Hash]
+      def serialize(context: nil)
+        serialize = context&.serializer(:choice)
+        return serialize.call(self, context:) if serialize
+
+        {
+          index:,
+          message: message.serialize(context:),
+        }
+      end
+
+      # @return [Message]
+      def delta
+        message
+      end
+
+      # @return [Array<Content>, String]
+      def content
+        message.content
+      end
+
+      # @return [Array<ToolCall, nil]
+      def tool_call_list
+        message.tool_call_list
+      end
+    end
+  end
+end

data/lib/omniai/chat/content.rb

@@ -16,14 +16,22 @@ module OmniAI
       #
       # @return [String]
       def serialize(context: nil)
-        raise NotImplementedError, ' # {self.class}#serialize undefined'
+        raise NotImplementedError, "#{self.class}#serialize undefined"
       end
 
-      # @param data [hash]
+      # @param data [Hash, Array, String]
       # @param context [Context] optional
       #
       # @return [Content]
       def self.deserialize(data, context: nil)
+        return data if data.nil?
+        return data.map { |data| deserialize(data, context:) } if data.is_a?(Array)
+
+        deserialize = context&.deserializer(:content)
+        return deserialize.call(data, context:) if deserialize
+
+        return data if data.is_a?(String)
+
         raise ArgumentError, "untyped data=#{data.inspect}" unless data.key?('type')
 
         case data['type']

data/lib/omniai/chat/file.rb

@@ -21,8 +21,8 @@ module OmniAI
       # @return [String]
       def fetch!
         case @io
-        when IO then @io.read
-        else ::File.binread(@io)
+        when String then ::File.binread(@io)
+        else @io.read
         end
       end
 
@@ -33,7 +33,7 @@ module OmniAI
           content = fetch!
           Text.new("<file>#{filename}: #{content}</file>").serialize(context:)
         else
-          serializer = context&.serializers&.[](:file)
+          serializer = context&.serializer(:file)
           return serializer.call(self, context:) if serializer
 
           { type: "#{kind}_url", "#{kind}_url": { url: data_uri } }

data/lib/omniai/chat/function.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module OmniAI
+  class Chat
+    # A function that includes a name / arguments.
+    class Function
+      # @return [String]
+      attr_accessor :name
+
+      # @return [Hash]
+      attr_accessor :arguments
+
+      # @param name [String]
+      # @param arguments [Hash]
+      def initialize(name:, arguments:)
+        @name = name
+        @arguments = arguments
+      end
+
+      # @return [String]
+      def inspect
+        "#<#{self.class.name} name=#{name.inspect} arguments=#{arguments.inspect}>"
+      end
+
+      # @param data [Hash]
+      # @param context [Context] optional
+      #
+      # @return [Function]
+      def self.deserialize(data, context: nil)
+        deserialize = context&.deserializer(:function)
+        return deserialize.call(data, context:) if deserialize
+
+        name = data['name']
+        arguments = begin
+          JSON.parse(data['arguments']) if data['arguments']
+        rescue JSON::ParserError
+          data['arguments']
+        end
+
+        new(name:, arguments:)
+      end
+
+      # @param context [Context] optional
+      #
+      # @return [Hash]
+      def serialize(context: nil)
+        serializer = context&.serializer(:function)
+        return serializer.call(self, context:) if serializer
+
+        {
+          name: @name,
+          arguments: (JSON.generate(@arguments) if @arguments),
+        }
+      end
+    end
+  end
+end

data/lib/omniai/chat/message/builder.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module OmniAI
+  class Chat
+    class Message
+      # Used to build a message.
+      class Builder
+        # @param role [String]
+        # @return [Message]
+        def self.build(role:)
+          builder = new(role:)
+          yield(builder)
+          builder.build
+        end
+
+        # @param role [String]
+        def initialize(role: Role::USER)
+          @role = role
+          @content = []
+        end
+
+        # @return [Message]
+        def build
+          Message.new(content: @content, role: @role)
+        end
+
+        # @example
+        #   message.text('What are these photos of?')
+        #
+        # @param value [String]
+        #
+        # @return [Text]
+        def text(value)
+          Text.new(value).tap do |text|
+            @content << text
+          end
+        end
+
+        # @example
+        #   message.url('https://example.com/hamster.jpg', type: "image/jpeg")
+        #
+        # @param uri [String]
+        # @param type [String]
+        #
+        # @return [URL]
+        def url(uri, type)
+          URL.new(uri, type).tap do |url|
+            @content << url
+          end
+        end
+
+        # @example
+        #   message.file(File.open('hamster.jpg'), type: "image/jpeg")
+        #
+        # @param io [IO]
+        # @param type [String]
+        #
+        # @return [File]
+        def file(io, type)
+          File.new(io, type).tap do |file|
+            @content << file
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniai/chat/message.rb

@@ -10,20 +10,50 @@ module OmniAI
     #       message.url 'https://example.com/cat.jpg', type: "image/jpeg"
     #       message.url 'https://example.com/dog.jpg', type: "image/jpeg"
     #       message.file File.open('hamster.jpg'), type: "image/jpeg"
+    #       message.
     #     end
     #   end
     class Message
+      # @example
+      #   prompt.build('What is the capital of Canada?')
+      #
+      # @example
+      #   prompt.build(role: 'user') do |message|
+      #     message.text 'What is the capital of Canada?'
+      #   end
+      #
+      # @param content [String, nil]
+      # @param role [Symbol]
+      #
+      # @yield [builder]
+      # @yieldparam builder [Message::Builder]
+      #
+      # @return [Message]
+      def self.build(content = nil, role: Role::USER, &block)
+        raise ArgumentError, 'content or block is required' if content.nil? && block.nil?
+
+        Builder.build(role:) do |builder|
+          builder.text(content) if content
+          block&.call(builder)
+        end
+      end
+
       # @return [Array<Content>, String]
       attr_accessor :content
 
       # @return [String]
       attr_accessor :role
 
+      # @return [Array<ToolCall>, nil]
+      attr_accessor :tool_call_list
+
       # @param content [String, nil]
       # @param role [String]
-      def initialize(content: nil, role: Role::USER)
-        @content = content || []
+      # @param tool_call_list [Array<ToolCall>, nil]
+      def initialize(content:, role: Role::USER, tool_call_list: nil)
+        @content = content
         @role = role
+        @tool_call_list = tool_call_list
       end
 
       # @return [String]
@@ -48,13 +78,14 @@ module OmniAI
       #
       # @return [Message]
       def self.deserialize(data, context: nil)
-        deserialize = context&.deserializers&.[](:message)
+        deserialize = context&.deserializer(:message)
         return deserialize.call(data, context:) if deserialize
 
-        new(
-          content: data['content'].map { |content| Content.deserialize(content, context:) },
-          role: data['role']
-        )
+        role = data['role']
+        content = Content.deserialize(data['content'], context:)
+        tool_call_list = data['tool_calls']&.map { |subdata| ToolCall.deserialize(subdata, context:) }
+
+        new(content:, role:, tool_call_list:)
       end
 
       # Usage:
@@ -66,12 +97,13 @@ module OmniAI
       #
       # @return [Hash]
       def serialize(context: nil)
-        serializer = context&.serializers&.[](:message)
+        serializer = context&.serializer(:message)
         return serializer.call(self, context:) if serializer
 
-        content = @content.is_a?(String) ? @content : @content.map { |content| content.serialize(context:) }
+        content = @content.is_a?(Array) ? @content.map { |content| content.serialize(context:) } : @content
+        tool_calls = @tool_call_list&.map { |tool_call| tool_call.serialize(context:) }
 
-        { role: @role, content: }
+        { role: @role, content:, tool_calls: }.compact
       end
 
       # @return [Boolean]
@@ -89,45 +121,32 @@ module OmniAI
         role?(Role::USER)
       end
 
-      # Usage:
-      #
-      #   message.text('What are these photos of?')
-      #
-      # @param value [String]
-      #
-      # @return [Text]
-      def text(value)
-        Text.new(value).tap do |text|
-          @content << text
-        end
+      # @return [Boolean]
+      def tool?
+        role?(Role::TOOL)
       end
 
-      # Usage:
-      #
-      #   message.url('https://example.com/hamster.jpg', type: "image/jpeg")
-      #
-      # @param uri [String]
-      # @param type [String]
-      #
-      # @return [URL]
-      def url(uri, type)
-        URL.new(uri, type).tap do |url|
-          @content << url
-        end
+      # @return [Boolean]
+      def text?
+        !text.nil?
       end
 
-      # Usage:
-      #
-      #   message.file(File.open('hamster.jpg'), type: "image/jpeg")
-      #
-      # @param io [IO]
-      # @param type [String]
-      #
-      # @return [File]
-      def file(io, type)
-        File.new(io, type).tap do |file|
-          @content << file
-        end
+      # @return [String, nil]
+      def text
+        return if @content.nil?
+        return @content if @content.is_a?(String)
+
+        parts = arrayify(@content).filter { |content| content.is_a?(Text) }
+        parts.map(&:text).join("\n") unless parts.empty?
+      end
+
+      # @param object [Object]
+      # @return [Array]
+      def arrayify(object)
+        return if object.nil?
+        return object if object.is_a?(Array)
+
+        [object]
       end
     end
   end

data/lib/omniai/chat/payload.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module OmniAI
+  class Chat
+    # A chunk or completion.
+    class Payload
+      # @return [Array<Choice>]
+      attr_accessor :choices
+
+      # @return [Usage, nil]
+      attr_accessor :usage
+
+      # @param choices [Array<Choice>]
+      # @param usage [Usage, nil]
+      def initialize(choices:, usage: nil)
+        @choices = choices
+        @usage = usage
+      end
+
+      # @return [String]
+      def inspect
+        "#<#{self.class.name} choices=#{choices.inspect} usage=#{usage.inspect}>"
+      end
+
+      # @param data [Hash]
+      # @param context [OmniAI::Context] optional
+      def self.deserialize(data, context: nil)
+        deserialize = context&.deserializer(:payload)
+        return deserialize.call(data, context:) if deserialize
+
+        choices = data['choices'].map { |choice_data| Choice.deserialize(choice_data, context:) }
+        usage = Usage.deserialize(data['usage'], context:) if data['usage']
+
+        new(choices:, usage:)
+      end
+
+      # @param context [OmniAI::Context] optional
+      # @return [Hash]
+      def serialize(context:)
+        serialize = context&.serializer(:payload)
+        return serialize.call(self, context:) if serialize
+
+        {
+          choices: choices.map { |choice| choice.serialize(context:) },
+          usage: usage&.serialize(context:),
+        }
+      end
+
+      # @param index [Integer]
+      # @return [Choice]
+      def choice(index: 0)
+        @choices[index]
+      end
+
+      # @param index [Integer]
+      # @return [Message]
+      def message(index: 0)
+        choice(index:).message
+      end
+
+      # @return [Array<Message>]
+      def messages
+        @choices.map(&:message)
+      end
+
+      # @param index [Integer]
+      # @return [String, nil]
+      def text(index: 0)
+        message(index:).text
+      end
+
+      # @param index [Integer]
+      # @return [Boolean]
+      def text?(index: 0)
+        message(index:).text?
+      end
+
+      # @param index [Integer]
+      # @return [Array<ToolCall>]
+      def tool_call_list(index:)
+        message(index:).tool_call_list
+      end
+    end
+  end
+end

data/lib/omniai/chat/prompt.rb

@@ -57,6 +57,11 @@ module OmniAI
         @messages = messages
       end
 
+      # @return [Prompt]
+      def dup
+        self.class.new(messages: @messages.dup)
+      end
+
       # @return [String]
       def inspect
         "#<#{self.class.name} messages=#{@messages.inspect}>"
@@ -75,57 +80,66 @@ module OmniAI
       #
       # @return [Array<Hash>]
       def serialize(context: nil)
-        serializer = context&.serializers&.[](:prompt)
+        serializer = context&.serializer(:prompt)
         return serializer.call(self, context:) if serializer
 
         @messages.map { |message| message.serialize(context:) }
       end
 
-      # Usage:
+      # @example
+      #   prompt.message 'What is the capital of Canada?', role: '...'
       #
-      #   prompt.message('What is the capital of Canada?')
+      # @example
+      #   prompt.message role: '...' do |message|
+      #     message.text 'What is the capital of Canada?'
+      #   end
       #
       # @param content [String, nil]
       # @param role [Symbol]
       #
-      # @yield [Message]
+      # @yield [builder]
+      # @yieldparam builder [Message::Builder]
+      #
       # @return [Message]
-      def message(content = nil, role: :user, &block)
-        raise ArgumentError, 'content or block is required' if content.nil? && block.nil?
-
-        Message.new(content:, role:).tap do |message|
-          block&.call(message)
+      def message(content = nil, role: Role::USER, &)
+        Message.build(content, role:, &).tap do |message|
           @messages << message
         end
       end
 
-      # Usage:
-      #
-      #   prompt.system('You are a helpful assistant.')
+      # @example
+      #   prompt.system 'You are a helpful assistant.'
       #
+      # @example
       #   prompt.system do |message|
       #     message.text 'You are a helpful assistant.'
       #   end
       #
       # @param content [String, nil]
       #
-      # @yield [Message]
+      # @yield [builder]
+      # @yieldparam builder [Message::Builder]
+      #
       # @return [Message]
       def system(content = nil, &)
         message(content, role: Role::SYSTEM, &)
       end
 
-      # Usage:
-      #
+      # @example
       #   prompt.user('What is the capital of Canada?')
       #
+      # @example
       #   prompt.user do |message|
       #     message.text 'What is the capital of Canada?'
+      #     message.url 'https://...', type: "image/gif"
+      #     message.file File.open('...'), type: "image/gif"
       #   end
       #
       # @param content [String, nil]
       #
-      # @yield [Message]
+      # @yield [builder]
+      # @yieldparam builder [Message::Builder]
+      #
       # @return [Message]
       def user(content = nil, &)
         message(content, role: Role::USER, &)