anthropic-sdk-beta 0.1.0.pre.beta.6 → 0.1.0.pre.beta.7

data/lib/anthropic/internal/type/base_stream.rb

@@ -3,11 +3,13 @@
 module Anthropic
   module Internal
     module Type
+      # @api private
+      #
       # @generic Elem
       #
       # This module provides a base implementation for streaming responses in the SDK.
       #
-      # @see https://rubyapi.org/3.1/o/enumerable
+      # @see https://rubyapi.org/3.2/o/enumerable
       module BaseStream
         include Enumerable
 
@@ -22,10 +24,12 @@ module Anthropic
           #
           # @return [Proc]
           #
-          # @see https://rubyapi.org/3.1/o/objectspace#method-c-define_finalizer
+          # @see https://rubyapi.org/3.2/o/objectspace#method-c-define_finalizer
           def defer_closing(stream) = ->(_id) { Anthropic::Internal::Util.close_fused!(stream) }
         end
 
+        # @api public
+        #
         # @return [void]
         def close = Anthropic::Internal::Util.close_fused!(@iterator)
 
@@ -34,6 +38,8 @@ module Anthropic
         # @return [Enumerable<generic<Elem>>]
         private def iterator = (raise NotImplementedError)
 
+        # @api public
+        #
         # @param blk [Proc]
         #
         # @yieldparam [generic<Elem>]
@@ -45,6 +51,8 @@ module Anthropic
           @iterator.each(&blk)
         end
 
+        # @api public
+        #
         # @return [Enumerator<generic<Elem>>]
         def to_enum = @iterator
 
@@ -67,6 +75,15 @@ module Anthropic
 
           ObjectSpace.define_finalizer(self, Anthropic::Internal::Type::BaseStream.defer_closing(@stream))
         end
+
+        # @api private
+        #
+        # @return [String]
+        def inspect
+          model = Anthropic::Internal::Type::Converter.inspect(@model, depth: 1)
+
+          "#<#{self.class}[#{model}]:0x#{object_id.to_s(16)}>"
+        end
       end
     end
   end

data/lib/anthropic/internal/type/boolean.rb

@@ -11,11 +11,17 @@ module Anthropic
       class Boolean
         extend Anthropic::Internal::Type::Converter
 
+        private_class_method :new
+
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
         def self.===(other) = other == true || other == false
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
@@ -40,17 +46,16 @@ module Anthropic
             value
           end
 
-          # @!parse
-          #   # @api private
-          #   #
-          #   # @param value [Boolean, Object]
-          #   #
-          #   # @param state [Hash{Symbol=>Object}] .
-          #   #
-          #   #   @option state [Boolean] :can_retry
-          #   #
-          #   # @return [Boolean, Object]
-          #   def dump(value, state:) = super
+          # @!method dump(value, state:)
+          #   @api private
+          #
+          #   @param value [Boolean, Object]
+          #
+          #   @param state [Hash{Symbol=>Object}] .
+          #
+          #     @option state [Boolean] :can_retry
+          #
+          #   @return [Boolean, Object]
         end
       end
     end

data/lib/anthropic/internal/type/converter.rb

@@ -5,6 +5,8 @@ module Anthropic
     module Type
       # @api private
       module Converter
+        extend Anthropic::Internal::Util::SorbetRuntimeSupport
+
         # rubocop:disable Lint/UnusedMethodArgument
 
         # @api private
@@ -43,12 +45,24 @@ module Anthropic
             value.string
           in Pathname | IO
             state[:can_retry] = false if value.is_a?(IO)
-            Anthropic::Internal::Util::SerializationAdapter.new(value)
+            Anthropic::FilePart.new(value)
+          in Anthropic::FilePart
+            state[:can_retry] = false if value.content.is_a?(IO)
+            value
           else
             value
           end
         end
 
+        # @api private
+        #
+        # @param depth [Integer]
+        #
+        # @return [String]
+        def inspect(depth: 0)
+          super()
+        end
+
         # rubocop:enable Lint/UnusedMethodArgument
 
         class << self
@@ -240,6 +254,37 @@ module Anthropic
               Anthropic::Internal::Type::Unknown.dump(value, state: state)
             end
           end
+
+          # @api private
+          #
+          # @param target [Object]
+          # @param depth [Integer]
+          #
+          # @return [String]
+          def inspect(target, depth:)
+            case target
+            in Anthropic::Internal::Type::Converter
+              target.inspect(depth: depth.succ)
+            else
+              target.inspect
+            end
+          end
+        end
+
+        define_sorbet_constant!(:Input) do
+          T.type_alias { T.any(Anthropic::Internal::Type::Converter, T::Class[T.anything]) }
+        end
+        define_sorbet_constant!(:CoerceState) do
+          T.type_alias do
+            {
+              strictness: T.any(T::Boolean, Symbol),
+              exactness: {yes: Integer, no: Integer, maybe: Integer},
+              branched: Integer
+            }
+          end
+        end
+        define_sorbet_constant!(:DumpState) do
+          T.type_alias { {can_retry: T::Boolean} }
         end
       end
     end

data/lib/anthropic/internal/type/enum.rb

@@ -17,13 +17,13 @@ module Anthropic
       # values safely.
       #
       # @example
-      #   # `stop_reason` is a `Anthropic::Models::StopReason`
+      #   # `stop_reason` is a `Anthropic::StopReason`
       #   case stop_reason
-      #   when Anthropic::Models::StopReason::END_TURN
+      #   when Anthropic::StopReason::END_TURN
       #     # ...
-      #   when Anthropic::Models::StopReason::MAX_TOKENS
+      #   when Anthropic::StopReason::MAX_TOKENS
       #     # ...
-      #   when Anthropic::Models::StopReason::STOP_SEQUENCE
+      #   when Anthropic::StopReason::STOP_SEQUENCE
       #     # ...
       #   else
       #     puts(stop_reason)
@@ -42,31 +42,36 @@ module Anthropic
       #   end
       module Enum
         include Anthropic::Internal::Type::Converter
+        include Anthropic::Internal::Util::SorbetRuntimeSupport
 
         # All of the valid Symbol values for this enum.
         #
         # @return [Array<NilClass, Boolean, Integer, Float, Symbol>]
-        def values = (@values ||= constants.map { const_get(_1) })
+        def values = constants.map { const_get(_1) }
 
-        # @api private
+        # @api public
         #
-        # Guard against thread safety issues by instantiating `@values`.
-        private def finalize! = values
-
         # @param other [Object]
         #
         # @return [Boolean]
         def ===(other) = values.include?(other)
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
         def ==(other)
-          # rubocop:disable Layout/LineLength
-          other.is_a?(Module) && other.singleton_class <= Anthropic::Internal::Type::Enum && other.values.to_set == values.to_set
-          # rubocop:enable Layout/LineLength
+          # rubocop:disable Style/CaseEquality
+          Anthropic::Internal::Type::Enum === other && other.values.to_set == values.to_set
+          # rubocop:enable Style/CaseEquality
         end
 
+        # @api public
+        #
+        # @return [Integer]
+        def hash = values.to_set.hash
+
         # @api private
         #
         # Unlike with primitives, `Enum` additionally validates that the value is a member
@@ -96,17 +101,32 @@ module Anthropic
           end
         end
 
-        # @!parse
-        #   # @api private
-        #   #
-        #   # @param value [Symbol, Object]
-        #   #
-        #   # @param state [Hash{Symbol=>Object}] .
-        #   #
-        #   #   @option state [Boolean] :can_retry
-        #   #
-        #   # @return [Symbol, Object]
-        #   def dump(value, state:) = super
+        # @!method dump(value, state:)
+        #   @api private
+        #
+        #   @param value [Symbol, Object]
+        #
+        #   @param state [Hash{Symbol=>Object}] .
+        #
+        #     @option state [Boolean] :can_retry
+        #
+        #   @return [Symbol, Object]
+
+        # @api private
+        #
+        # @param depth [Integer]
+        #
+        # @return [String]
+        def inspect(depth: 0)
+          if depth.positive?
+            return is_a?(Module) ? super() : self.class.name
+          end
+
+          members = values.map { Anthropic::Internal::Type::Converter.inspect(_1, depth: depth.succ) }
+          prefix = is_a?(Module) ? name : self.class.name
+
+          "#{prefix}[#{members.join(' | ')}]"
+        end
       end
     end
   end

data/lib/anthropic/internal/type/{io_like.rb → file_input.rb}

@@ -7,26 +7,36 @@ module Anthropic
       #
       # @abstract
       #
-      # Either `Pathname` or `StringIO`.
-      class IOLike
+      # Either `Pathname` or `StringIO`, or `IO`, or
+      # `Anthropic::Internal::Type::FileInput`.
+      #
+      # Note: when `IO` is used, all retries are disabled, since many IO` streams are
+      # not rewindable.
+      class FileInput
         extend Anthropic::Internal::Type::Converter
 
+        private_class_method :new
+
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
         def self.===(other)
           case other
-          in StringIO | Pathname | IO
+          in Pathname | StringIO | IO | String | Anthropic::FilePart
             true
           else
             false
           end
         end
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
-        def self.==(other) = other.is_a?(Class) && other <= Anthropic::Internal::Type::IOLike
+        def self.==(other) = other.is_a?(Class) && other <= Anthropic::Internal::Type::FileInput
 
         class << self
           # @api private
@@ -57,17 +67,28 @@ module Anthropic
             end
           end
 
-          # @!parse
-          #   # @api private
-          #   #
-          #   # @param value [Pathname, StringIO, IO, String, Object]
-          #   #
-          #   # @param state [Hash{Symbol=>Object}] .
-          #   #
-          #   #   @option state [Boolean] :can_retry
-          #   #
-          #   # @return [Pathname, StringIO, IO, String, Object]
-          #   def dump(value, state:) = super
+          # @api private
+          #
+          # @param value [Pathname, StringIO, IO, String, Object]
+          #
+          # @param state [Hash{Symbol=>Object}] .
+          #
+          #   @option state [Boolean] :can_retry
+          #
+          # @return [Pathname, StringIO, IO, String, Object]
+          def dump(value, state:)
+            # rubocop:disable Lint/DuplicateBranch
+            case value
+            in IO
+              state[:can_retry] = false
+            in Anthropic::FilePart if value.content.is_a?(IO)
+              state[:can_retry] = false
+            else
+            end
+            # rubocop:enable Lint/DuplicateBranch
+
+            value
+          end
         end
       end
     end

data/lib/anthropic/internal/type/hash_of.rb

@@ -13,6 +13,10 @@ module Anthropic
       class HashOf
         include Anthropic::Internal::Type::Converter
 
+        private_class_method :new
+
+        # @overload [](type_info, spec = {})
+        #
         # @param type_info [Hash{Symbol=>Object}, Proc, Anthropic::Internal::Type::Converter, Class]
         #
         # @param spec [Hash{Symbol=>Object}] .
@@ -24,8 +28,12 @@ module Anthropic
         #   @option spec [Proc] :union
         #
         #   @option spec [Boolean] :"nil?"
-        def self.[](type_info, spec = {}) = new(type_info, spec)
+        #
+        # @return [self]
+        def self.[](...) = new(...)
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
@@ -46,6 +54,8 @@ module Anthropic
           end
         end
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
@@ -55,6 +65,11 @@ module Anthropic
           # rubocop:enable Layout/LineLength
         end
 
+        # @api public
+        #
+        # @return [Integer]
+        def hash = [self.class, item_type].hash
+
         # @api private
         #
         # @param value [Hash{Object=>Object}, Object]
@@ -140,7 +155,18 @@ module Anthropic
         #   @option spec [Boolean] :"nil?"
         def initialize(type_info, spec = {})
           @item_type_fn = Anthropic::Internal::Type::Converter.type_info(type_info || spec)
-          @nilable = spec[:nil?]
+          @nilable = spec.fetch(:nil?, false)
+        end
+
+        # @api private
+        #
+        # @param depth [Integer]
+        #
+        # @return [String]
+        def inspect(depth: 0)
+          items = Anthropic::Internal::Type::Converter.inspect(item_type, depth: depth.succ)
+
+          "#{self.class}[#{[items, nilable? ? 'nil' : nil].compact.join(' | ')}]"
         end
       end
     end

data/lib/anthropic/internal/type/request_parameters.rb

@@ -5,16 +5,15 @@ module Anthropic
     module Type
       # @api private
       module RequestParameters
-        # @!parse
-        #   # Options to specify HTTP behaviour for this request.
-        #   # @return [Anthropic::RequestOptions, Hash{Symbol=>Object}]
-        #   attr_accessor :request_options
+        # @!attribute request_options
+        # Options to specify HTTP behaviour for this request.
+        #
+        #   @return [Anthropic::RequestOptions, Hash{Symbol=>Object}]
 
         # @param mod [Module]
         def self.included(mod)
-          return unless mod <= Anthropic::Internal::Type::BaseModel
+          raise ArgumentError.new(mod) unless mod <= Anthropic::Internal::Type::BaseModel
 
-          mod.extend(Anthropic::Internal::Type::RequestParameters::Converter)
           mod.optional(:request_options, Anthropic::RequestOptions)
         end
 
@@ -29,14 +28,8 @@ module Anthropic
             state = {can_retry: true}
             case (dumped = dump(params, state: state))
             in Hash
-              options = Anthropic::Internal::Util.coerce_hash(dumped[:request_options])
-              request_options =
-                case [options, state.fetch(:can_retry)]
-                in [Hash | nil, false]
-                  {**options.to_h, max_retries: 0}
-                else
-                  options
-                end
+              options = Anthropic::Internal::Util.coerce_hash!(dumped[:request_options]).to_h
+              request_options = state.fetch(:can_retry) ? options : {**options, max_retries: 0}
               [dumped.except(:request_options), request_options]
             else
               [dumped, nil]

data/lib/anthropic/internal/type/union.rb

@@ -6,13 +6,13 @@ module Anthropic
       # @api private
       #
       # @example
-      #   # `raw_message_stream_event` is a `Anthropic::Models::RawMessageStreamEvent`
+      #   # `raw_message_stream_event` is a `Anthropic::RawMessageStreamEvent`
       #   case raw_message_stream_event
-      #   when Anthropic::Models::RawMessageStartEvent
+      #   when Anthropic::RawMessageStartEvent
       #     puts(raw_message_stream_event.message)
-      #   when Anthropic::Models::RawMessageDeltaEvent
+      #   when Anthropic::RawMessageDeltaEvent
       #     puts(raw_message_stream_event.delta)
-      #   when Anthropic::Models::RawMessageStopEvent
+      #   when Anthropic::RawMessageStopEvent
       #     puts(raw_message_stream_event.type)
       #   else
       #     puts(raw_message_stream_event)
@@ -31,6 +31,7 @@ module Anthropic
       #   end
       module Union
         include Anthropic::Internal::Type::Converter
+        include Anthropic::Internal::Util::SorbetRuntimeSupport
 
         # @api private
         #
@@ -43,7 +44,7 @@ module Anthropic
         #
         # @return [Array<Array(Symbol, Object)>]
         protected def derefed_variants
-          @known_variants.map { |key, variant_fn| [key, variant_fn.call] }
+          known_variants.map { |key, variant_fn| [key, variant_fn.call] }
         end
 
         # All of the specified variants for this union.
@@ -112,6 +113,8 @@ module Anthropic
         # rubocop:disable Style/HashEachMethods
         # rubocop:disable Style/CaseEquality
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
@@ -121,15 +124,20 @@ module Anthropic
           end
         end
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
         def ==(other)
-          # rubocop:disable Layout/LineLength
-          other.is_a?(Module) && other.singleton_class <= Anthropic::Internal::Type::Union && other.derefed_variants == derefed_variants
-          # rubocop:enable Layout/LineLength
+          Anthropic::Internal::Type::Union === other && other.derefed_variants == derefed_variants
         end
 
+        # @api public
+        #
+        # @return [Integer]
+        def hash = variants.hash
+
         # @api private
         #
         # @param value [Object]
@@ -210,6 +218,22 @@ module Anthropic
 
         # rubocop:enable Style/CaseEquality
         # rubocop:enable Style/HashEachMethods
+
+        # @api private
+        #
+        # @param depth [Integer]
+        #
+        # @return [String]
+        def inspect(depth: 0)
+          if depth.positive?
+            return is_a?(Module) ? super() : self.class.name
+          end
+
+          members = variants.map { Anthropic::Internal::Type::Converter.inspect(_1, depth: depth.succ) }
+          prefix = is_a?(Module) ? name : self.class.name
+
+          "#{prefix}[#{members.join(' | ')}]"
+        end
       end
     end
   end

data/lib/anthropic/internal/type/unknown.rb

@@ -13,11 +13,17 @@ module Anthropic
 
         # rubocop:disable Lint/UnusedMethodArgument
 
+        private_class_method :new
+
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
         def self.===(other) = true
 
+        # @api public
+        #
         # @param other [Object]
         #
         # @return [Boolean]
@@ -42,17 +48,16 @@ module Anthropic
             value
           end
 
-          # @!parse
-          #   # @api private
-          #   #
-          #   # @param value [Object]
-          #   #
-          #   # @param state [Hash{Symbol=>Object}] .
-          #   #
-          #   #   @option state [Boolean] :can_retry
-          #   #
-          #   # @return [Object]
-          #   def dump(value, state:) = super
+          # @!method dump(value, state:)
+          #   @api private
+          #
+          #   @param value [Object]
+          #
+          #   @param state [Hash{Symbol=>Object}] .
+          #
+          #     @option state [Boolean] :can_retry
+          #
+          #   @return [Object]
         end
 
         # rubocop:enable Lint/UnusedMethodArgument