omniai-anthropic 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae62c7e30da3f0f0ad3fc0e0c3d6c77fb2401281d5630d0d5447a49321416fcf
-  data.tar.gz: 76ed4ac36be43c81788ec82542c10905a04882f76d48b24903899c571989f7e3
+  metadata.gz: 2b6103ed1e3c87ab2d1f2767dc4dce991756eefb558886ab8436632083058aba
+  data.tar.gz: aa75e2707afdb2bdffb7f74716e1afa31c027141dbfd114c45a77c00abe52045
 SHA512:
-  metadata.gz: 0cf54724f2a28628c73fcefcc71e660bc18af0f615d1dbd1c4455a9f001a71fd9bd35801776318c344833d1b9ce47e599441aa6181de20cc07872b51e056595e
-  data.tar.gz: 887d226ca9d48d16595a1ba7b49fca0d3f07062a65372114558d201f4ccd2cbaebe45b814215f88a7ea06620fbbc7d1e9fff8ec6c5b21208825a5756835c635c
+  metadata.gz: b06128d930cd70b61d2cea0ee2bb0318342d9114f7c9fe46ddaf8a1778f3570cb6e49748efd3a626d95daac9df1ecaf5680bb05180c500a4933e95fd682c942e
+  data.tar.gz: a18cce1b18ca45810dc9677856ef96e8af5d5faa71bf6160a981a5584d1f76157f45679481fc69e946d2837681cb9a40d8860fa6f52e879206c0af44612f5095

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/anthropic/chat/response/completion.rb

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

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

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Anthropic
+    class Chat
+      module Response
+        # A stream given when streaming.
+        class Stream < OmniAI::Chat::Response::Stream
+          module Type
+            PING = 'ping'
+            MESSAGE_START = 'message_start'
+            MESSAGE_STOP = 'message_stop'
+            MESSAGE_DELTA = 'message_delta'
+            CONTENT_BLOCK_START = 'content_block_start'
+            CONTENT_BLOCK_STOP = 'content_block_stop'
+            CONTENT_BLOCK_DELTA = 'content_block_delta'
+          end
+
+          # Process the stream into chunks by event.
+          class Builder
+            attr_reader :id, :model, :role, :content, :index
+
+            # @return [OmniAI::Chat::Chunk]
+            def chunk
+              OmniAI::Chat::Response::Chunk.new(data: {
+                'id' => @id,
+                'model' => @model,
+                'choices' => [{
+                  'index' => @index,
+                  'delta' => {
+                    'role' => @role,
+                    'content' => @content,
+                  },
+                }],
+              })
+            end
+
+            # Handler for Type::MESSAGE_START
+            #
+            # @param data [Hash]
+            def message_start(data)
+              @id = data['id']
+              @model = data['model']
+              @role = data['role']
+            end
+
+            # Handler for Type::MESSAGE_STOP
+            #
+            # @param data [Hash]
+            def message_stop(_)
+              @id = nil
+              @model = nil
+              @role = nil
+            end
+
+            # Handler for Type::CONTENT_BLOCK_START
+            #
+            # @param data [Hash]
+            def content_block_start(data)
+              @index = data['index']
+            end
+
+            # Handler for Type::CONTENT_BLOCK_STOP
+            #
+            # @param data [Hash]
+            def content_block_stop(_)
+              @index = nil
+            end
+
+            # Handler for Type::CONTENT_BLOCK_DELTA
+            #
+            # @param data [Hash]
+            def content_block_delta(data)
+              return unless data['delta']['type'].eql?('text_delta')
+
+              @content = data['delta']['text']
+            end
+          end
+
+          # @yield [OmniAI::Chat::Chunk]
+          def stream!(&block)
+            builder = Builder.new
+
+            @response.body.each do |chunk|
+              @parser.feed(chunk) do |type, data|
+                process(type:, data: JSON.parse(data), builder:, &block)
+              end
+            end
+          end
+
+          private
+
+          # @param type [String]
+          # @param data [Hash]
+          # @param builder [Builder]
+          def process(type:, data:, builder:, &)
+            case type
+            when Type::MESSAGE_START then builder.message_start(data)
+            when Type::CONTENT_BLOCK_START then builder.content_block_start(data)
+            when Type::CONTENT_BLOCK_STOP then builder.content_block_stop(data)
+            when Type::MESSAGE_STOP then builder.message_stop(data)
+            when Type::CONTENT_BLOCK_DELTA
+              builder.content_block_delta(data)
+              yield(builder.chunk)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniai/anthropic/chat.rb

@@ -27,42 +27,42 @@ module OmniAI
 
       protected
 
-      # @param response [HTTP::Response]
-      # @return [OmniAI::Anthropic::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::Anthropic::Chat::Completion]
-      def complete!(response:)
-        Completion.new(data: response.parse)
-      end
-
       # @return [Hash]
       def payload
         OmniAI::Anthropic.config.chat_options.merge({
           model: @model,
-          messages: messages.filter { |message| !message[:role].eql?(OmniAI::Chat::Role::SYSTEM) },
+          messages: messages.filter { |message| !message[:role].eql?(Role::SYSTEM) },
           system:,
           stream: @stream.nil? ? nil : !@stream.nil?,
           temperature: @temperature,
+          tools: tools_payload,
         }).compact
       end
 
       # @return [String, nil]
       def system
-        messages = self.messages.filter { |message| message[:role].eql?(OmniAI::Chat::Role::SYSTEM) }
-        messages << { role: OmniAI::Chat::Role::SYSTEM, content: OmniAI::Chat::JSON_PROMPT } if @format.eql?(:json)
+        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?
       end
 
       # @return [String]
       def path
-        "/#{OmniAI::Anthropic::Client::VERSION}/messages"
+        "/#{Client::VERSION}/messages"
+      end
+
+      private
+
+      # @return [Array<Hash>, nil]
+      def tools_payload
+        @tools&.map do |tool|
+          {
+            name: tool.name,
+            description: tool.description,
+            input_schema: tool.parameters&.prepare,
+          }.compact
+        end
       end
     end
   end

data/lib/omniai/anthropic/client.rb

@@ -57,10 +57,11 @@ module OmniAI
       # @param format [Symbol] optional :text or :json
       # @param temperature [Float, nil] optional
       # @param stream [Proc, nil] optional
+      # @param tools [Array<OmniAI::Tool>, nil] optional
       #
       # @return [OmniAI::Chat::Completion]
-      def chat(messages, model: Chat::Model::CLAUDE_HAIKU, temperature: nil, format: nil, stream: nil)
-        Chat.process!(messages, model:, temperature:, format:, stream:, 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.3.0'
+    VERSION = '1.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-anthropic
 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-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -63,8 +63,8 @@ files:
 - README.md
 - lib/omniai/anthropic.rb
 - lib/omniai/anthropic/chat.rb
-- lib/omniai/anthropic/chat/completion.rb
-- lib/omniai/anthropic/chat/stream.rb
+- lib/omniai/anthropic/chat/response/completion.rb
+- lib/omniai/anthropic/chat/response/stream.rb
 - lib/omniai/anthropic/client.rb
 - lib/omniai/anthropic/config.rb
 - lib/omniai/anthropic/version.rb
@@ -90,7 +90,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 Anthropic

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

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

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

@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-module OmniAI
-  module Anthropic
-    class Chat
-      # A stream given when streaming.
-      class Stream < OmniAI::Chat::Stream
-        module Type
-          PING = 'ping'
-          MESSAGE_START = 'message_start'
-          MESSAGE_STOP = 'message_stop'
-          MESSAGE_DELTA = 'message_delta'
-          CONTENT_BLOCK_START = 'content_block_start'
-          CONTENT_BLOCK_STOP = 'content_block_stop'
-          CONTENT_BLOCK_DELTA = 'content_block_delta'
-        end
-
-        # Process the stream into chunks by event.
-        class Builder
-          attr_reader :id, :model, :role, :content, :index
-
-          # @return [OmniAI::Chat::Chunk]
-          def chunk
-            OmniAI::Chat::Chunk.new(data: {
-              'id' => @id,
-              'model' => @model,
-              'choices' => [{
-                'index' => @index,
-                'delta' => { 'role' => @role, 'content' => @content },
-              }],
-            })
-          end
-
-          # Handler for Type::MESSAGE_START
-          #
-          # @param data [Hash]
-          def message_start(data)
-            @id = data['id']
-            @model = data['model']
-            @role = data['role']
-          end
-
-          # Handler for Type::MESSAGE_STOP
-          #
-          # @param data [Hash]
-          def message_stop(_)
-            @id = nil
-            @model = nil
-            @role = nil
-          end
-
-          # Handler for Type::CONTENT_BLOCK_START
-          #
-          # @param data [Hash]
-          def content_block_start(data)
-            @index = data['index']
-          end
-
-          # Handler for Type::CONTENT_BLOCK_STOP
-          #
-          # @param data [Hash]
-          def content_block_stop(_)
-            @index = nil
-          end
-
-          # Handler for Type::CONTENT_BLOCK_DELTA
-          #
-          # @param data [Hash]
-          def content_block_delta(data)
-            return unless data['delta']['type'].eql?('text_delta')
-
-            @content = data['delta']['text']
-          end
-        end
-
-        # @yield [OmniAI::Chat::Chunk]
-        def stream!(&block)
-          builder = Builder.new
-
-          @response.body.each do |chunk|
-            @parser.feed(chunk) do |type, data|
-              process(type:, data: JSON.parse(data), builder:, &block)
-            end
-          end
-        end
-
-        private
-
-        # @param type [String]
-        # @param data [Hash]
-        # @param builder [Builder]
-        def process(type:, data:, builder:, &)
-          case type
-          when Type::MESSAGE_START then builder.message_start(data)
-          when Type::CONTENT_BLOCK_START then builder.content_block_start(data)
-          when Type::CONTENT_BLOCK_STOP then builder.content_block_stop(data)
-          when Type::MESSAGE_STOP then builder.message_stop(data)
-          when Type::CONTENT_BLOCK_DELTA
-            builder.content_block_delta(data)
-            yield(builder.chunk)
-          end
-        end
-      end
-    end
-  end
-end