anthropic 1.13.0 → 1.14.0

data/lib/anthropic/helpers/tools/runner.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+module Anthropic
+  module Helpers
+    module Tools
+      # @api private
+      #
+      class Runner
+        # @return [Anthropic::Models::Beta::MessageCreateParams]
+        attr_accessor :params
+
+        # @return [Boolean]
+        def finished? = @finished
+
+        # @param params [Array<Anthropic::Beta::BetaMessageParam>]
+        def feed_messages(*messages)
+          self.params = {**params.to_h, messages: params[:messages].to_a + messages}
+        end
+
+        # @return [Array<Anthropic::Beta::BetaMessageParam>]
+        private def current_messages = params&.[](:messages).to_a
+
+        # @return [Anthropic::Models::BetaMessage, nil]
+        def next_message
+          message = nil
+          unless finished?
+            fold do
+              message = @client.beta.messages.create(_1)
+              [true, message]
+            end
+          end
+          message
+        end
+
+        # @return [Array<Anthropic::Models::BetaMessage>]
+        def run_until_finished
+          messages = []
+          each_streaming { messages << _1.accumulated_message }
+          messages
+        end
+
+        # @yieldparam [Anthropic::Models::BetaMessage]
+        def each_message(&blk)
+          unless block_given?
+            raise ArgumentError.new("A block must be given to ##{__method__}")
+          end
+
+          fold do
+            message = @client.beta.messages.create(_1)
+            blk.call(message)
+            [false, message]
+          end
+        end
+
+        # @yieldparam [Anthropic::Internal::Stream<Anthropic::Models::Beta::BetaRawMessageStartEvent, Anthropic::Models::Beta::BetaRawMessageDeltaEvent, Anthropic::Models::Beta::BetaRawMessageStopEvent, Anthropic::Models::Beta::BetaRawContentBlockStartEvent, Anthropic::Models::Beta::BetaRawContentBlockDeltaEvent, Anthropic::Models::Beta::BetaRawContentBlockStopEvent>]
+        def each_streaming(&blk)
+          unless block_given?
+            raise ArgumentError.new("A block must be given to ##{__method__}")
+          end
+
+          fold do
+            stream = @client.beta.messages.stream(_1)
+            blk.call(stream)
+            [false, stream.accumulated_message]
+          ensure
+            stream&.close
+          end
+        end
+
+        # @api private
+        #
+        # @yieldparam [Array(Boolean, Anthropic::Models::Beta::MessageCreateParams)]
+        private def fold(&blk)
+          return nil if finished?
+
+          count =
+            case @param
+            in {max_iterations: Integer => m}
+              m
+            else
+              nil
+            end
+
+          # rubocop:disable Metrics/BlockLength
+          # rubocop:disable Style/CaseEquality
+          loop do
+            return if (count = count&.pred)&.negative?
+
+            tools = params[:tools].to_a.grep(Anthropic::Helpers::Tools::BaseTool)
+            messages = current_messages
+            brk, response = blk.call(params)
+
+            next unless current_messages.equal?(messages)
+
+            mapped =
+              response
+              .content
+              .lazy
+              .grep(Anthropic::Beta::BetaToolUseBlock)
+              .map do |tool_use|
+                resp = {type: :tool_result, tool_use_id: tool_use.id}
+                if (tool = tools.find { _1.class.model === tool_use.parsed })
+                  begin
+                    raw = tool.call(tool_use.parsed)
+                    is_error = false
+                  rescue StandardError => e
+                    is_error = true
+                    raw = e.message
+                  end
+                else
+                  is_error = true
+                  raw = "Error: parsed '#{tool_use.name}' not found"
+                end
+                content = raw.is_a?(Array) ? raw : raw.to_s
+                {**resp, content:, is_error:}
+              end
+              .to_a
+
+            if mapped.empty?
+              @finished = true
+              break
+            end
+
+            content = response.content.map do
+              case _1
+              in Anthropic::Beta::BetaToolUseBlock
+                raw = {**_1, input: _1.parsed}.except(:parsed)
+                Anthropic::Internal::Type::Converter.dump(Anthropic::Beta::BetaToolUseBlock, raw)
+              else
+                _1
+              end
+            end
+
+            messages << {role: :assistant, content:}
+            messages << {role: :user, content: mapped}
+
+            break if brk
+          end
+          # rubocop:enable Style/CaseEquality
+          # rubocop:enable Metrics/BlockLength
+        end
+
+        # @api private
+        #
+        # @param client [Anthropic::Client]
+        #
+        # @param params [Anthropic::Models::Beta::MessageCreateParams]
+        def initialize(client, params:)
+          @client = client
+          @params = params.to_h
+          @finished = false
+        end
+      end
+    end
+  end
+end

data/lib/anthropic/helpers/tools.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Anthropic
+  BaseTool = Anthropic::Helpers::Tools::BaseTool
+end

data/lib/anthropic/internal/transport/base_client.rb

@@ -201,7 +201,8 @@ module Anthropic
             self.class::PLATFORM_HEADERS,
             {
               "accept" => "application/json",
-              "content-type" => "application/json"
+              "content-type" => "application/json",
+              "user-agent" => user_agent
             },
             headers
           )
@@ -219,6 +220,11 @@ module Anthropic
         # @return [Hash{String=>String}]
         private def auth_headers = {}
 
+        # @api private
+        #
+        # @return [String]
+        private def user_agent = "#{self.class.name}/Ruby #{Anthropic::VERSION}"
+
         # @api private
         #
         # @return [String]

data/lib/anthropic/internal/transport/pooled_net_requester.rb

@@ -16,10 +16,11 @@ module Anthropic
         class << self
           # @api private
           #
+          # @param cert_store [OpenSSL::X509::Store]
           # @param url [URI::Generic]
           #
           # @return [Net::HTTP]
-          def connect(url)
+          def connect(cert_store:, url:)
             port =
               case [url.port, url.scheme]
               in [Integer, _]
@@ -33,6 +34,8 @@ module Anthropic
             Net::HTTP.new(url.host, port).tap do
               _1.use_ssl = %w[https wss].include?(url.scheme)
               _1.max_retries = 0
+
+              (_1.cert_store = cert_store) if _1.use_ssl?
             end
           end
 
@@ -102,7 +105,7 @@ module Anthropic
           pool =
             @mutex.synchronize do
               @pools[origin] ||= ConnectionPool.new(size: @size) do
-                self.class.connect(url)
+                self.class.connect(cert_store: @cert_store, url: url)
               end
             end
 
@@ -192,6 +195,7 @@ module Anthropic
         def initialize(size: self.class::DEFAULT_MAX_CONNECTIONS)
           @mutex = Mutex.new
           @size = size
+          @cert_store = OpenSSL::X509::Store.new.tap(&:set_default_paths)
           @pools = {}
         end
 

data/lib/anthropic/models/beta/beta_tool_use_block.rb

@@ -24,6 +24,20 @@ module Anthropic
         #   @return [Symbol, :tool_use]
         required :type, const: :tool_use
 
+        response_only do
+          # @api public
+          #
+          # Parsed input data coerced to the tool's input schema model.
+          # Only present when tools are defined using the InputSchema DSL.
+          required :parsed, Anthropic::Internal::Type::Unknown
+
+          # @api private
+          #
+          # Internal buffer for accumulating partial JSON during streaming.
+          # Used by streaming helpers to reconstruct complete JSON input from deltas.
+          optional :_json_buf, String
+        end
+
         # @!method initialize(id:, input:, name:, type: :tool_use)
         #   @param id [String]
         #   @param input [Object]

data/lib/anthropic/models/tool_use_block.rb

@@ -23,18 +23,18 @@ module Anthropic
       #   @return [Symbol, :tool_use]
       required :type, const: :tool_use
 
-      # @api private
-      #
-      # Internal buffer for accumulating partial JSON during streaming.
-      # Used by streaming helpers to reconstruct complete JSON input from deltas.
-      optional :json_buf, String
-
       response_only do
         # @api public
         #
         # Parsed input data coerced to the tool's input schema model.
         # Only present when tools are defined using the InputSchema DSL.
         optional :parsed, Anthropic::Internal::Type::Unknown
+
+        # @api private
+        #
+        # Internal buffer for accumulating partial JSON during streaming.
+        # Used by streaming helpers to reconstruct complete JSON input from deltas.
+        optional :_json_buf, String
       end
 
       # @!method initialize(id:, input:, name:, type: :tool_use)

data/lib/anthropic/resources/beta/messages.rb

@@ -7,6 +7,13 @@ module Anthropic
         # @return [Anthropic::Resources::Beta::Messages::Batches]
         attr_reader :batches
 
+        # @param params [Anthropic::Models::Beta::MessageCreateParams]
+        #
+        # @return [Anthropic::Helpers::Tools::Runner]
+        def tool_runner(params)
+          Anthropic::Helpers::Tools::Runner.new(@client, params:)
+        end
+
         # See {Anthropic::Resources::Beta::Messages#stream_raw} for streaming counterpart.
         #
         # Some parameter documentations has been truncated, see
@@ -68,8 +75,12 @@ module Anthropic
             raise ArgumentError.new(message)
           end
 
+          tools, models = Anthropic::Helpers::Messages.distill_input_schema_models!(parsed, strict: nil)
+
+          unwrap = ->(raw) { Anthropic::Helpers::Messages.parse_input_schemas!(raw, tools:, models:) }
+
           if options.empty? && @client.timeout == Anthropic::Client::DEFAULT_TIMEOUT_IN_SECONDS
-            model = parsed[:model].to_sym
+            model = parsed[:model]&.to_sym
             max_tokens = parsed[:max_tokens].to_i
             timeout = @client.calculate_nonstreaming_timeout(
               max_tokens,
@@ -87,6 +98,7 @@ module Anthropic
             headers: parsed.slice(*header_params.keys).transform_keys(header_params),
             body: parsed.except(*header_params.keys),
             model: Anthropic::Beta::BetaMessage,
+            unwrap: unwrap,
             options: options
           )
         end
@@ -152,16 +164,22 @@ module Anthropic
             raise ArgumentError.new(message)
           end
           parsed.store(:stream, true)
+          tools, models = Anthropic::Helpers::Messages.distill_input_schema_models!(parsed, strict: nil)
+
+          header_params = {betas: "anthropic-beta"}
           raw_stream = @client.request(
             method: :post,
             path: "v1/messages?beta=true",
-            headers: {"accept" => "text/event-stream"},
-            body: parsed,
+            headers: {
+              "accept" => "text/event-stream",
+              **parsed.slice(*header_params.keys)
+            }.transform_keys(header_params),
+            body: parsed.except(*header_params.keys),
             stream: Anthropic::Internal::Stream,
             model: Anthropic::Beta::BetaRawMessageStreamEvent,
-            options: options
+            options: {timeout: 600, **options}
           )
-          Anthropic::Streaming::MessageStream.new(raw_stream: raw_stream)
+          Anthropic::Streaming::MessageStream.new(raw_stream:, tools:, models:)
         end
 
         # See {Anthropic::Resources::Beta::Messages#create} for non-streaming counterpart.

data/lib/anthropic/resources/messages.rb

@@ -59,14 +59,12 @@ module Anthropic
           raise ArgumentError.new(message)
         end
 
-        tool_models = get_structured_output_models(parsed)
+        tools, models = Anthropic::Helpers::Messages.distill_input_schema_models!(parsed, strict: nil)
 
-        unwrap = if tool_models.any?
-          ->(raw) { parse_structured_outputs!(raw, tool_models) }
-        end
+        unwrap = ->(raw) { Anthropic::Helpers::Messages.parse_input_schemas!(raw, tools:, models:) }
 
         if options.empty? && @client.timeout == Anthropic::Client::DEFAULT_TIMEOUT_IN_SECONDS
-          model = parsed[:model].to_sym
+          model = parsed[:model]&.to_sym
           max_tokens = parsed[:max_tokens].to_i
           timeout = @client.calculate_nonstreaming_timeout(
             max_tokens,
@@ -87,6 +85,8 @@ module Anthropic
         )
       end
 
+      alias_method :parse, :create
+
       # See {Anthropic::Resources::Messages#create} for non-streaming counterpart.
       #
       # Some parameter documentations has been truncated, see
@@ -141,7 +141,7 @@ module Anthropic
         end
         parsed.store(:stream, true)
 
-        tool_models = get_structured_output_models(parsed)
+        tools, models = Anthropic::Helpers::Messages.distill_input_schema_models!(parsed, strict: nil)
 
         raw_stream = @client.request(
           method: :post,
@@ -152,10 +152,7 @@ module Anthropic
           model: Anthropic::Models::RawMessageStreamEvent,
           options: options
         )
-        Anthropic::Streaming::MessageStream.new(
-          raw_stream: raw_stream,
-          tool_models: tool_models
-        )
+        Anthropic::Streaming::MessageStream.new(raw_stream:, tools:, models:)
       end
 
       # See {Anthropic::Resources::Messages#create} for non-streaming counterpart.
@@ -270,77 +267,6 @@ module Anthropic
         @client = client
         @batches = Anthropic::Resources::Messages::Batches.new(client: client)
       end
-
-      private
-
-      # Extract tool models from the request and convert them to JSON Schema
-      # Returns a hash mapping tool name to Ruby model.
-      def get_structured_output_models(parsed)
-        tool_models = {}
-
-        case parsed
-        in {tools: Array => tools}
-          mapped = tools.map do |tool|
-            case tool
-            # Direct tool class:
-            in Anthropic::Helpers::InputSchema::JsonSchemaConverter
-              name = tool.name.split("::").last
-              description = extract_class_description(tool)
-              tool_models.store(name, tool)
-              {
-                name: name,
-                description: description,
-                input_schema: tool.to_json_schema
-              }
-            # Tool with explicit name/description and BaseModel as input_schema:
-            in {name: String => name,
-                input_schema: Anthropic::Helpers::InputSchema::JsonSchemaConverter => model,
-                **rest}
-              tool_models.store(name, model)
-              rest.merge(
-                name: name,
-                input_schema: model.to_json_schema
-              )
-            else
-              # Any other format (pass through unchanged)
-              # This includes raw JSON schemas and any other tool definitions.
-              tool
-            end
-          end
-          tools.replace(mapped)
-        else
-        end
-
-        tool_models
-      end
-
-      # Extract class description from a BaseModel class
-      def extract_class_description(klass)
-        klass.respond_to?(:doc_string) ? klass.doc_string : nil
-      end
-
-      def parse_structured_outputs!(raw, tool_models)
-        return raw if tool_models.empty?
-
-        raw[:content]&.each do |content|
-          next unless content[:type] == "tool_use"
-
-          model = tool_models[content[:name]]
-          next unless model
-
-          begin
-            parsed_input = content[:input]
-
-            coerced = Anthropic::Internal::Type::Converter.coerce(model, parsed_input)
-
-            content.store(:parsed, coerced)
-          rescue StandardError => e
-            content.store(:parsed, {error: e.message})
-          end
-        end
-
-        raw
-      end
     end
   end
 end

data/lib/anthropic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anthropic
-  VERSION = "1.13.0"
+  VERSION = "1.14.0"
 end

data/lib/anthropic.rb

@@ -9,6 +9,7 @@ require "erb"
 require "etc"
 require "json"
 require "net/http"
+require "openssl"
 require "pathname"
 require "rbconfig"
 require "securerandom"
@@ -55,6 +56,17 @@ require_relative "anthropic/helpers/bedrock/client"
 require_relative "anthropic/helpers/vertex/client"
 require_relative "anthropic/bedrock"
 require_relative "anthropic/vertex"
+require_relative "anthropic/helpers/input_schema"
+require_relative "anthropic/helpers/input_schema/supported_schemas"
+require_relative "anthropic/helpers/input_schema/json_schema_converter"
+require_relative "anthropic/helpers/input_schema/base_model"
+require_relative "anthropic/helpers/input_schema/array_of"
+require_relative "anthropic/helpers/input_schema/boolean"
+require_relative "anthropic/helpers/input_schema/enum_of"
+require_relative "anthropic/helpers/input_schema/union_of"
+require_relative "anthropic/helpers/input_schema/parsed_json"
+require_relative "anthropic/input_schema"
+require_relative "anthropic/helpers/messages"
 require_relative "anthropic/internal/stream"
 require_relative "anthropic/internal/jsonl_stream"
 require_relative "anthropic/internal/page"
@@ -412,13 +424,6 @@ require_relative "anthropic/resources/completions"
 require_relative "anthropic/resources/messages"
 require_relative "anthropic/resources/messages/batches"
 require_relative "anthropic/resources/models"
-require_relative "anthropic/helpers/input_schema"
-require_relative "anthropic/helpers/input_schema/property_mapping"
-require_relative "anthropic/helpers/input_schema/json_schema_converter"
-require_relative "anthropic/helpers/input_schema/base_model"
-require_relative "anthropic/helpers/input_schema/array_of"
-require_relative "anthropic/helpers/input_schema/boolean"
-require_relative "anthropic/helpers/input_schema/enum_of"
-require_relative "anthropic/helpers/input_schema/union_of"
-require_relative "anthropic/helpers/input_schema/parsed_json"
-require_relative "anthropic/input_schema"
+require_relative "anthropic/helpers/tools/runner"
+require_relative "anthropic/helpers/tools/base_tool"
+require_relative "anthropic/helpers/tools"

data/manifest.yaml

@@ -6,6 +6,7 @@ dependencies:
   - etc
   - json
   - net/http
+  - openssl
   - pathname
   - rbconfig
   - securerandom

data/rbi/anthropic/helpers/input_schema/base_model.rbi

@@ -12,8 +12,13 @@ module Anthropic
         extend Anthropic::Helpers::InputSchema::JsonSchemaConverter
 
         class << self
-          sig { params(doc: T.nilable(String)).void }
-          attr_writer :doc
+          # @api public
+          #
+          sig { params(description: String).returns(T.class_of(String)) }
+          def description(description)
+          end
+
+          alias_method :doc, :description
         end
       end
     end

data/rbi/anthropic/helpers/tools/base_tool.rbi

@@ -0,0 +1,51 @@
+# typed: strong
+
+module Anthropic
+  module Helpers
+    module Tools
+      # @api private
+      #
+      class BaseTool
+        include Anthropic::Internal::Type::Converter
+        include Anthropic::Helpers::InputSchema::JsonSchemaConverter
+
+        class << self
+          # @api public
+          #
+          sig { returns(T.class_of(Anthropic::Helpers::InputSchema::BaseModel)) }
+          attr_reader :model
+
+          sig { returns(T.class_of(String)) }
+          attr_reader :doc_string
+
+          # @api public
+          #
+          sig { params(description: String).returns(T.class_of(String)) }
+          def description(description)
+          end
+
+          alias_method :doc, :description
+
+          # @api public
+          #
+          sig { params(model: T.class_of(Anthropic::Helpers::InputSchema::BaseModel)).returns(T.class_of(Anthropic::Helpers::InputSchema::BaseModel)) }
+          def input_schema(model) = (@model = model)
+        end
+
+        # @api public
+        #
+        # Override the `#parse` method to customize the pre-processing of the tool call argument
+        #
+        sig { params(value: T.anything).returns(T.anything) }
+        def parse(value)
+        end
+
+        # @api public
+        #
+        sig { params(parsed: Anthropic::Helpers::InputSchema::BaseModel).returns(T.anything) }
+        def call(parsed)
+        end
+      end
+    end
+  end
+end

data/rbi/anthropic/helpers/tools/runner.rbi

@@ -0,0 +1,40 @@
+# typed: strong
+
+module Anthropic
+  module Helpers
+    module Tools
+      # @api private
+      #
+      class Runner
+        sig { returns(Anthropic::Models::Beta::MessageCreateParams) }
+        attr_accessor :params
+
+        sig { returns(T::Boolean) }
+        def finished?; end
+
+        sig { params(messages: Anthropic::Models::Beta::BetaMessageParam).void }
+        def feed_messages(*messages); end
+
+        sig { returns(Anthropic::Models::BetaMessage) }
+        def next_message; end
+
+        sig { returns(T::Array[Anthropic::Models::BetaMessage]) }
+        def run_until_finished; end
+
+        sig do
+          params(
+            blk: T.proc.params(arg0: Anthropic::Models::BetaMessage).void
+          ).void
+        end
+        def each_message(&blk); end
+
+        sig do
+          params(
+            blk: T.proc.params(arg0: Anthropic::Streaming::MessageStream).void
+          ).void
+        end
+        def each_streaming(&blk); end
+      end
+    end
+  end
+end

data/rbi/anthropic/helpers/tools.rbi

@@ -0,0 +1,5 @@
+# typed: strong
+
+module Anthropic
+  BaseTool = Anthropic::Helpers::Tools::BaseTool
+end

data/rbi/anthropic/internal/transport/base_client.rbi

@@ -184,6 +184,11 @@ module Anthropic
         private def auth_headers
         end
 
+        # @api private
+        sig { returns(String) }
+        private def user_agent
+        end
+
         # @api private
         sig { returns(String) }
         private def generate_idempotency_key

data/rbi/anthropic/internal/transport/pooled_net_requester.rbi

@@ -26,8 +26,12 @@ module Anthropic
 
         class << self
           # @api private
-          sig { params(url: URI::Generic).returns(Net::HTTP) }
-          def connect(url)
+          sig do
+            params(cert_store: OpenSSL::X509::Store, url: URI::Generic).returns(
+              Net::HTTP
+            )
+          end
+          def connect(cert_store:, url:)
           end
 
           # @api private