omniai-anthropic 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6103ed1e3c87ab2d1f2767dc4dce991756eefb558886ab8436632083058aba
-  data.tar.gz: aa75e2707afdb2bdffb7f74716e1afa31c027141dbfd114c45a77c00abe52045
+  metadata.gz: e9b758783278cd58cfeac0e8a80765d796e63efb811671eaa44b4e4653496c45
+  data.tar.gz: 1cdcff27b130211ff661bf14d219716373eb7bc03d568a50d1c5a453215977f9
 SHA512:
-  metadata.gz: b06128d930cd70b61d2cea0ee2bb0318342d9114f7c9fe46ddaf8a1778f3570cb6e49748efd3a626d95daac9df1ecaf5680bb05180c500a4933e95fd682c942e
-  data.tar.gz: a18cce1b18ca45810dc9677856ef96e8af5d5faa71bf6160a981a5584d1f76157f45679481fc69e946d2837681cb9a40d8860fa6f52e879206c0af44612f5095
+  metadata.gz: 3ff6a720b6a032067d2e1c217f1cda76e552fe06e3c61e82b3eec36f307e9ab55da840b850718c38f7ed074c719597bbcd22d2c36bcdf56822782253661f74b2
+  data.tar.gz: 76cd69ef19bc717166576ea4ba7cb11579508a182da624fa18764804ee46466958c651e7be79874ac1b51ae2791839e74cc08613e1fb07ce3e4cae594958c820

data/README.md

@@ -44,21 +44,10 @@ completion.choice.message.content # 'Why did the chicken cross the road? To get
 ```
 
 ```ruby
-completion = client.chat({
-  role: OmniAI::Chat::Role::USER,
-  content: 'Is it wise to jump off a bridge?'
-})
-completion.choice.message.content # 'No.'
-```
-
-```ruby
-completion = client.chat([
-  {
-    role: OmniAI::Chat::Role::SYSTEM,
-    content: 'You are a helpful assistant.'
-  },
-  'What is the capital of Canada?',
-])
+completion = client.chat do |prompt|
+  prompt.system('You are a helpful assistant.')
+  prompt.user('What is the capital of Canada?')
+end
 completion.choice.message.content # 'The capital of Canada is Ottawa.'
 ```
 
@@ -102,9 +91,9 @@ client.chat('Be poetic.', stream:)
 `format` takes an optional symbol (`:json`) and modifies requests to send additional system text requesting JSON:
 
 ```ruby
-completion = client.chat([
-  { role: OmniAI::Chat::Role::USER, content: 'What is the name of the drummer for the Beatles?' }
-], format: :json)
+completion = client.chat(format: :json) do |prompt|
+  prompt.system(OmniAI::Chat::JSON_PROMPT)
+  prompt.user('What is the name of the drummer for the Beatles?')
 JSON.parse(completion.choice.message.content) # { "name": "Ringo" }
 ```
 

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

@@ -46,8 +46,8 @@ module OmniAI
 
             # Handler for Type::MESSAGE_STOP
             #
-            # @param data [Hash]
-            def message_stop(_)
+            # @param _data [Hash]
+            def message_stop(_data)
               @id = nil
               @model = nil
               @role = nil
@@ -62,8 +62,8 @@ module OmniAI
 
             # Handler for Type::CONTENT_BLOCK_STOP
             #
-            # @param data [Hash]
-            def content_block_stop(_)
+            # @param _data [Hash]
+            def content_block_stop(_data)
               @index = nil
             end
 

data/lib/omniai/anthropic/chat.rb

@@ -2,15 +2,15 @@
 
 module OmniAI
   module Anthropic
-    # A Anthropic chat implementation.
+    # An Anthropic chat implementation.
     #
     # Usage:
     #
-    #   chat = OmniAI::Anthropic::Chat.new(client: client)
-    #   chat.completion('Tell me a joke.')
-    #   chat.completion(['Tell me a joke.'])
-    #   chat.completion({ role: 'user', content: 'Tell me a joke.' })
-    #   chat.completion([{ role: 'system', content: 'Tell me a joke.' }])
+    #   completion = OmniAI::Anthropic::Chat.process!(client: client) do |prompt|
+    #     prompt.system('You are an expert in the field of AI.')
+    #     prompt.user('What are the biggest risks of AI?')
+    #   end
+    #   completion.choice.message.content # '...'
     class Chat < OmniAI::Chat
       module Model
         CLAUDE_INSTANT_1_0 = 'claude-instant-1.2'
@@ -25,13 +25,33 @@ module OmniAI
         CLAUDE_SONET = CLAUDE_3_5_SONET_20240620
       end
 
-      protected
+      # @param [Media]
+      # @return [Hash]
+      # @example
+      #   media = Media.new(...)
+      #   MEDIA_SERIALIZER.call(media)
+      MEDIA_SERIALIZER = lambda do |media, *|
+        {
+          type: media.kind, # i.e. 'image' / 'video' / 'audio' / ...
+          source: {
+            type: 'base64',
+            media_type: media.type, # i.e. 'image/jpeg' / 'video/ogg' / 'audio/mpeg' / ...
+            data: media.data,
+          },
+        }
+      end
+
+      # @return [Context]
+      CONTEXT = Context.build do |context|
+        context.serializers[:file] = MEDIA_SERIALIZER
+        context.serializers[:url] = MEDIA_SERIALIZER
+      end
 
       # @return [Hash]
       def payload
         OmniAI::Anthropic.config.chat_options.merge({
           model: @model,
-          messages: messages.filter { |message| !message[:role].eql?(Role::SYSTEM) },
+          messages:,
           system:,
           stream: @stream.nil? ? nil : !@stream.nil?,
           temperature: @temperature,
@@ -39,12 +59,16 @@ module OmniAI
         }).compact
       end
 
+      # @return [Array<Hash>]
+      def messages
+        messages = @prompt.messages.filter(&:user?)
+        messages.map { |message| message.serialize(context: CONTEXT) }
+      end
+
       # @return [String, nil]
       def system
-        messages = self.messages.filter { |message| message[:role].eql?(Role::SYSTEM) }
-        messages << { role: Role::SYSTEM, content: JSON_PROMPT } if @format.eql?(:json)
-
-        messages.map { |message| message[:content] }.join("\n\n") if messages.any?
+        messages = @prompt.messages.filter(&:system?)
+        messages.map(&:content).join("\n\n") if messages.any?
       end
 
       # @return [String]

data/lib/omniai/anthropic/client.rb

@@ -59,9 +59,12 @@ module OmniAI
       # @param stream [Proc, nil] optional
       # @param tools [Array<OmniAI::Tool>, nil] optional
       #
+      # @yield [prompt]
+      # @yieldparam prompt [OmniAI::Chat::Prompt]
+      #
       # @return [OmniAI::Chat::Completion]
-      def chat(messages, model: Chat::Model::CLAUDE_HAIKU, temperature: nil, format: nil, stream: nil, tools: nil)
-        Chat.process!(messages, model:, temperature:, format:, stream:, tools:, client: self)
+      def chat(messages, model: Chat::Model::CLAUDE_HAIKU, temperature: nil, format: nil, stream: nil, tools: nil, &)
+        Chat.process!(messages, model:, temperature:, format:, stream:, tools:, client: self, &)
       end
     end
   end

data/lib/omniai/anthropic/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Anthropic
-    VERSION = '1.5.0'
+    VERSION = '1.6.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-anthropic
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser