ruby_llm 1.5.1 → 1.6.0

data/lib/ruby_llm/providers/bedrock/capabilities.rb

@@ -2,14 +2,11 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       # Determines capabilities and pricing for AWS Bedrock models
       module Capabilities
         module_function
 
-        # Returns the context window size for the given model ID
-        # @param model_id [String] the model identifier
-        # @return [Integer] the context window size in tokens
         def context_window_for(model_id)
           case model_id
           when /anthropic\.claude-2/ then 100_000
@@ -17,95 +14,56 @@ module RubyLLM
           end
         end
 
-        # Returns the maximum output tokens for the given model ID
-        # @param model_id [String] the model identifier
-        # @return [Integer] the maximum output tokens
         def max_tokens_for(_model_id)
           4_096
         end
 
-        # Returns the input price per million tokens for the given model ID
-        # @param model_id [String] the model identifier
-        # @return [Float] the price per million tokens for input
         def input_price_for(model_id)
           PRICES.dig(model_family(model_id), :input) || default_input_price
         end
 
-        # Returns the output price per million tokens for the given model ID
-        # @param model_id [String] the model identifier
-        # @return [Float] the price per million tokens for output
         def output_price_for(model_id)
           PRICES.dig(model_family(model_id), :output) || default_output_price
         end
 
-        # Determines if the model supports chat capabilities
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports chat
         def supports_chat?(model_id)
           model_id.match?(/anthropic\.claude/)
         end
 
-        # Determines if the model supports streaming capabilities
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports streaming
         def supports_streaming?(model_id)
           model_id.match?(/anthropic\.claude/)
         end
 
-        # Determines if the model supports image input/output
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports images
         def supports_images?(model_id)
           model_id.match?(/anthropic\.claude/)
         end
 
-        # Determines if the model supports vision capabilities
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports vision
         def supports_vision?(model_id)
           model_id.match?(/anthropic\.claude/)
         end
 
-        # Determines if the model supports function calling
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports functions
         def supports_functions?(model_id)
           model_id.match?(/anthropic\.claude/)
         end
 
-        # Determines if the model supports audio input/output
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports audio
         def supports_audio?(_model_id)
           false
         end
 
-        # Determines if the model supports JSON mode
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports JSON mode
         def supports_json_mode?(model_id)
           model_id.match?(/anthropic\.claude/)
         end
 
-        # Formats the model ID into a human-readable display name
-        # @param model_id [String] the model identifier
-        # @return [String] the formatted display name
         def format_display_name(model_id)
           model_id.then { |id| humanize(id) }
         end
 
-        # Determines the type of model
-        # @param model_id [String] the model identifier
-        # @return [String] the model type (chat, embedding, image, audio)
         def model_type(_model_id)
           'chat'
         end
 
-        # Determines if the model supports structured output
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports structured output
-        def supports_structured_output?(model_id)
-          model_id.match?(/anthropic\.claude/)
+        def supports_structured_output?(_model_id)
+          false
         end
 
         # Model family patterns for capability lookup
@@ -120,9 +78,6 @@ module RubyLLM
           /anthropic\.claude-instant/ => :claude_instant
         }.freeze
 
-        # Determines the model family for pricing and capability lookup
-        # @param model_id [String] the model identifier
-        # @return [Symbol] the model family identifier
         def model_family(model_id)
           MODEL_FAMILIES.find { |pattern, _family| model_id.match?(pattern) }&.last || :other
         end
@@ -137,21 +92,14 @@ module RubyLLM
           claude_instant: { input: 0.8, output: 2.4 }
         }.freeze
 
-        # Default input price when model-specific pricing is not available
-        # @return [Float] the default price per million tokens
         def default_input_price
           0.1
         end
 
-        # Default output price when model-specific pricing is not available
-        # @return [Float] the default price per million tokens
         def default_output_price
           0.2
         end
 
-        # Converts a model ID to a human-readable format
-        # @param id [String] the model identifier
-        # @return [String] the humanized model name
         def humanize(id)
           id.tr('-', ' ')
             .split('.')
@@ -167,7 +115,6 @@ module RubyLLM
             output: ['text']
           }
 
-          # Vision support for Claude models
           if model_id.match?(/anthropic\.claude/) && supports_vision?(model_id)
             modalities[:input] << 'image'
             modalities[:input] << 'pdf'
@@ -179,18 +126,12 @@ module RubyLLM
         def capabilities_for(model_id)
           capabilities = []
 
-          # Streaming
           capabilities << 'streaming' if model_id.match?(/anthropic\.claude/)
 
-          # Function calling & structured output
           capabilities << 'function_calling' if supports_functions?(model_id)
 
-          capabilities << 'structured_output' if supports_json_mode?(model_id)
-
-          # Extended thinking for 3.7 models
           capabilities << 'reasoning' if model_id.match?(/claude-3-7/)
 
-          # Batch capabilities for newer Claude models
           if model_id.match?(/claude-3\.5|claude-3-7/)
             capabilities << 'batch'
             capabilities << 'citations'
@@ -208,7 +149,6 @@ module RubyLLM
             output_per_million: prices[:output]
           }
 
-          # Batch pricing - typically 50% of standard
           batch_pricing = {
             input_per_million: prices[:input] * 0.5,
             output_per_million: prices[:output] * 0.5

data/lib/ruby_llm/providers/bedrock/chat.rb

@@ -2,16 +2,17 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       # Chat methods for the AWS Bedrock API implementation
       module Chat
         module_function
 
-        def sync_response(connection, payload)
-          signature = sign_request("#{connection.connection.url_prefix}#{completion_url}", config: connection.config,
-                                                                                           payload:)
+        def sync_response(connection, payload, additional_headers = {})
+          signature = sign_request("#{connection.connection.url_prefix}#{completion_url}", payload:)
           response = connection.post completion_url, payload do |req|
             req.headers.merge! build_headers(signature.headers, streaming: block_given?)
+            # Merge additional headers, with existing headers taking precedence
+            req.headers = additional_headers.merge(req.headers) unless additional_headers.empty?
           end
           Anthropic::Chat.parse_completion_response response
         end

data/lib/ruby_llm/providers/bedrock/media.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       # Media handling methods for the Bedrock API integration
       # NOTE: Bedrock does not support url attachments
       module Media

data/lib/ruby_llm/providers/bedrock/models.rb

@@ -2,15 +2,14 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       # Models methods for the AWS Bedrock API implementation
       module Models
-        def list_models(connection:)
-          config = connection.config
-          mgmt_api_base = "https://bedrock.#{config.bedrock_region}.amazonaws.com"
+        def list_models
+          mgmt_api_base = "https://bedrock.#{@config.bedrock_region}.amazonaws.com"
           full_models_url = "#{mgmt_api_base}/#{models_url}"
-          signature = sign_request(full_models_url, config: config, method: :get)
-          response = connection.get(full_models_url) do |req|
+          signature = sign_request(full_models_url, method: :get)
+          response = @connection.get(full_models_url) do |req|
             req.headers.merge! signature.headers
           end
 

data/lib/ruby_llm/providers/bedrock/signing.rb

@@ -14,7 +14,7 @@ require 'pathname'
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       module Signing
         # Utility class for creating AWS signature version 4 signature. This class
         # provides a method for generating signatures:

data/lib/ruby_llm/providers/bedrock/streaming/base.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       module Streaming
         # Base module for AWS Bedrock streaming functionality.
         # Serves as the core module that includes all other streaming-related modules
@@ -29,13 +29,14 @@ module RubyLLM
             "model/#{@model_id}/invoke-with-response-stream"
           end
 
-          def stream_response(connection, payload, &block)
-            signature = sign_request("#{connection.connection.url_prefix}#{stream_url}", config: connection.config,
-                                                                                         payload:)
+          def stream_response(connection, payload, additional_headers = {}, &block)
+            signature = sign_request("#{connection.connection.url_prefix}#{stream_url}", payload:)
             accumulator = StreamAccumulator.new
 
             response = connection.post stream_url, payload do |req|
               req.headers.merge! build_headers(signature.headers, streaming: block_given?)
+              # Merge additional headers, with existing headers taking precedence
+              req.headers = additional_headers.merge(req.headers) unless additional_headers.empty?
               req.options.on_data = handle_stream do |chunk|
                 accumulator.add chunk
                 block.call chunk

data/lib/ruby_llm/providers/bedrock/streaming/content_extraction.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       module Streaming
         # Module for handling content extraction from AWS Bedrock streaming responses.
         # Provides methods to extract and process various types of content from the response data.

data/lib/ruby_llm/providers/bedrock/streaming/message_processing.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       module Streaming
         # Module for processing streaming messages from AWS Bedrock.
         # Handles the core message processing logic, including validation and chunking.

data/lib/ruby_llm/providers/bedrock/streaming/payload_processing.rb

@@ -4,7 +4,7 @@ require 'base64'
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       module Streaming
         # Module for processing payloads from AWS Bedrock streaming responses.
         # Handles JSON payload extraction, decoding, and chunk creation.

data/lib/ruby_llm/providers/bedrock/streaming/prelude_handling.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       module Streaming
         # Module for handling message preludes in AWS Bedrock streaming responses.
         # Manages the parsing and validation of message headers and prelude data.

data/lib/ruby_llm/providers/bedrock/streaming.rb

@@ -8,7 +8,7 @@ require_relative 'streaming/prelude_handling'
 
 module RubyLLM
   module Providers
-    module Bedrock
+    class Bedrock
       # Streaming implementation for the AWS Bedrock API.
       # This module provides functionality for handling streaming responses from AWS Bedrock,
       # including message processing, content extraction, and error handling.

data/lib/ruby_llm/providers/bedrock.rb

@@ -7,19 +7,16 @@ module RubyLLM
   module Providers
     # AWS Bedrock API integration. Handles chat completion and streaming
     # for Claude models.
-    module Bedrock
-      extend Provider
-      extend Bedrock::Chat
-      extend Bedrock::Streaming
-      extend Bedrock::Models
-      extend Bedrock::Signing
-      extend Bedrock::Media
-      extend Anthropic::Tools
+    class Bedrock < Provider
+      include Bedrock::Chat
+      include Bedrock::Streaming
+      include Bedrock::Models
+      include Bedrock::Signing
+      include Bedrock::Media
+      include Anthropic::Tools
 
-      module_function
-
-      def api_base(config)
-        "https://bedrock-runtime.#{config.bedrock_region}.amazonaws.com"
+      def api_base
+        "https://bedrock-runtime.#{@config.bedrock_region}.amazonaws.com"
       end
 
       def parse_error(response)
@@ -38,25 +35,25 @@ module RubyLLM
         end
       end
 
-      def sign_request(url, config:, method: :post, payload: nil)
-        signer = create_signer(config)
-        request = build_request(url, config:, method:, payload:)
+      def sign_request(url, method: :post, payload: nil)
+        signer = create_signer
+        request = build_request(url, method:, payload:)
         signer.sign_request(request)
       end
 
-      def create_signer(config)
+      def create_signer
         Signing::Signer.new({
-                              access_key_id: config.bedrock_api_key,
-                              secret_access_key: config.bedrock_secret_key,
-                              session_token: config.bedrock_session_token,
-                              region: config.bedrock_region,
+                              access_key_id: @config.bedrock_api_key,
+                              secret_access_key: @config.bedrock_secret_key,
+                              session_token: @config.bedrock_session_token,
+                              region: @config.bedrock_region,
                               service: 'bedrock'
                             })
       end
 
-      def build_request(url, config:, method: :post, payload: nil)
+      def build_request(url, method: :post, payload: nil)
         {
-          connection: connection(config),
+          connection: @connection,
           http_method: method,
           url: url || completion_url,
           body: payload ? JSON.generate(payload, ascii_only: false) : nil
@@ -72,16 +69,14 @@ module RubyLLM
         )
       end
 
-      def capabilities
-        Bedrock::Capabilities
-      end
-
-      def slug
-        'bedrock'
-      end
+      class << self
+        def capabilities
+          Bedrock::Capabilities
+        end
 
-      def configuration_requirements
-        %i[bedrock_api_key bedrock_secret_key bedrock_region]
+        def configuration_requirements
+          %i[bedrock_api_key bedrock_secret_key bedrock_region]
+        end
       end
     end
   end

data/lib/ruby_llm/providers/deepseek/capabilities.rb

@@ -2,14 +2,11 @@
 
 module RubyLLM
   module Providers
-    module DeepSeek
+    class DeepSeek
       # Determines capabilities and pricing for DeepSeek models
       module Capabilities
         module_function
 
-        # Returns the context window size for the given model
-        # @param model_id [String] the model identifier
-        # @return [Integer] the context window size in tokens
         def context_window_for(model_id)
           case model_id
           when /deepseek-(?:chat|reasoner)/ then 64_000
@@ -17,61 +14,37 @@ module RubyLLM
           end
         end
 
-        # Returns the maximum number of tokens that can be generated
-        # @param model_id [String] the model identifier
-        # @return [Integer] the maximum number of tokens
         def max_tokens_for(model_id)
           case model_id
           when /deepseek-(?:chat|reasoner)/ then 8_192
-          else 4_096 # Default if max_tokens not specified
+          else 4_096
           end
         end
 
-        # Returns the price per million tokens for input (cache miss)
-        # @param model_id [String] the model identifier
-        # @return [Float] the price per million tokens in USD
         def input_price_for(model_id)
           PRICES.dig(model_family(model_id), :input_miss) || default_input_price
         end
 
-        # Returns the price per million tokens for output
-        # @param model_id [String] the model identifier
-        # @return [Float] the price per million tokens in USD
         def output_price_for(model_id)
           PRICES.dig(model_family(model_id), :output) || default_output_price
         end
 
-        # Returns the price per million tokens for input with cache hit
-        # @param model_id [String] the model identifier
-        # @return [Float] the price per million tokens in USD
         def cache_hit_price_for(model_id)
           PRICES.dig(model_family(model_id), :input_hit) || default_cache_hit_price
         end
 
-        # Determines if the model supports vision capabilities
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports vision
         def supports_vision?(_model_id)
-          false # DeepSeek models don't currently support vision
+          false
         end
 
-        # Determines if the model supports function calling
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports function calling
         def supports_functions?(model_id)
-          model_id.match?(/deepseek-chat/) # Only deepseek-chat supports function calling
+          model_id.match?(/deepseek-chat/)
         end
 
-        # Determines if the model supports JSON mode
-        # @param model_id [String] the model identifier
-        # @return [Boolean] true if the model supports JSON mode
         def supports_json_mode?(_model_id)
-          false # DeepSeek function calling is unstable
+          false
         end
 
-        # Returns a formatted display name for the model
-        # @param model_id [String] the model identifier
-        # @return [String] the formatted display name
         def format_display_name(model_id)
           case model_id
           when 'deepseek-chat' then 'DeepSeek V3'
@@ -83,53 +56,41 @@ module RubyLLM
           end
         end
 
-        # Returns the model type
-        # @param model_id [String] the model identifier
-        # @return [String] the model type (e.g., 'chat')
         def model_type(_model_id)
-          'chat' # All DeepSeek models are chat models
+          'chat'
         end
 
-        # Returns the model family
-        # @param model_id [String] the model identifier
-        # @return [Symbol] the model family
         def model_family(model_id)
           case model_id
           when /deepseek-reasoner/ then :reasoner
-          else :chat # Default to chat family
+          else :chat
           end
         end
 
         # Pricing information for DeepSeek models (USD per 1M tokens)
         PRICES = {
           chat: {
-            input_hit: 0.07,   # $0.07 per million tokens on cache hit
-            input_miss: 0.27,  # $0.27 per million tokens on cache miss
-            output: 1.10       # $1.10 per million tokens output
+            input_hit: 0.07,
+            input_miss: 0.27,
+            output: 1.10
           },
           reasoner: {
-            input_hit: 0.14,   # $0.14 per million tokens on cache hit
-            input_miss: 0.55,  # $0.55 per million tokens on cache miss
-            output: 2.19       # $2.19 per million tokens output
+            input_hit: 0.14,
+            input_miss: 0.55,
+            output: 2.19
           }
         }.freeze
 
-        # Default input price when model family can't be determined
-        # @return [Float] the default input price
         def default_input_price
-          0.27 # Default to chat cache miss price
+          0.27
         end
 
-        # Default output price when model family can't be determined
-        # @return [Float] the default output price
         def default_output_price
-          1.10 # Default to chat output price
+          1.10
         end
 
-        # Default cache hit price when model family can't be determined
-        # @return [Float] the default cache hit price
         def default_cache_hit_price
-          0.07 # Default to chat cache hit price
+          0.07
         end
 
         def modalities_for(_model_id)
@@ -142,7 +103,6 @@ module RubyLLM
         def capabilities_for(model_id)
           capabilities = ['streaming']
 
-          # Function calling for chat models
           capabilities << 'function_calling' if model_id.match?(/deepseek-chat/)
 
           capabilities
@@ -157,7 +117,6 @@ module RubyLLM
             output_per_million: prices[:output]
           }
 
-          # Add cached pricing if available
           standard_pricing[:cached_input_per_million] = prices[:input_hit] if prices[:input_hit]
 
           {

data/lib/ruby_llm/providers/deepseek/chat.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module DeepSeek
+    class DeepSeek
       # Chat methods of the DeepSeek API integration
       module Chat
         module_function

data/lib/ruby_llm/providers/deepseek.rb

@@ -3,32 +3,27 @@
 module RubyLLM
   module Providers
     # DeepSeek API integration.
-    module DeepSeek
-      extend OpenAI
-      extend DeepSeek::Chat
+    class DeepSeek < OpenAI
+      include DeepSeek::Chat
 
-      module_function
-
-      def api_base(_config)
+      def api_base
         'https://api.deepseek.com'
       end
 
-      def headers(config)
+      def headers
         {
-          'Authorization' => "Bearer #{config.deepseek_api_key}"
+          'Authorization' => "Bearer #{@config.deepseek_api_key}"
         }
       end
 
-      def capabilities
-        DeepSeek::Capabilities
-      end
-
-      def slug
-        'deepseek'
-      end
+      class << self
+        def capabilities
+          DeepSeek::Capabilities
+        end
 
-      def configuration_requirements
-        %i[deepseek_api_key]
+        def configuration_requirements
+          %i[deepseek_api_key]
+        end
       end
     end
   end

data/lib/ruby_llm/providers/gemini/capabilities.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Determines capabilities and pricing for Google Gemini models
       module Capabilities
         module_function

data/lib/ruby_llm/providers/gemini/chat.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Chat methods for the Gemini API implementation
       module Chat
         module_function

data/lib/ruby_llm/providers/gemini/embeddings.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Embeddings methods for the Gemini API integration
       module Embeddings
         module_function

data/lib/ruby_llm/providers/gemini/images.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Image generation methods for the Gemini API implementation
       module Images
         def images_url