ruby_llm 1.10.0 → 1.12.0

data/lib/ruby_llm/models.rb

@@ -16,6 +16,21 @@ module RubyLLM
       'openrouter' => 'openrouter',
       'perplexity' => 'perplexity'
     }.freeze
+    PROVIDER_PREFERENCE = %w[
+      openai
+      anthropic
+      gemini
+      vertexai
+      bedrock
+      openrouter
+      deepseek
+      mistral
+      perplexity
+      xai
+      azure
+      ollama
+      gpustack
+    ].freeze
 
     class << self
       def instance
@@ -93,7 +108,7 @@ module RubyLLM
 
         if provider_class
           temp_instance = provider_class.new(config)
-          assume_exists = true if temp_instance.local?
+          assume_exists = true if temp_instance.local? || temp_instance.assume_models_exist?
         end
 
         if assume_exists
@@ -447,8 +462,8 @@ module RubyLLM
     def find_with_provider(model_id, provider)
       resolved_id = Aliases.resolve(model_id, provider)
       resolved_id = resolve_bedrock_region_id(resolved_id) if provider.to_s == 'bedrock'
-      all.find { |m| m.id == model_id && m.provider == provider.to_s } ||
-        all.find { |m| m.id == resolved_id && m.provider == provider.to_s } ||
+      all.find { |m| m.id == resolved_id && m.provider == provider.to_s } ||
+        all.find { |m| m.id == model_id && m.provider == provider.to_s } ||
         raise(ModelNotFoundError, "Unknown model: #{model_id} for provider: #{provider}")
     end
 
@@ -467,9 +482,23 @@ module RubyLLM
     end
 
     def find_without_provider(model_id)
-      all.find { |m| m.id == model_id } ||
-        all.find { |m| m.id == Aliases.resolve(model_id) } ||
-        raise(ModelNotFoundError, "Unknown model: #{model_id}")
+      exact_matches = all.select { |m| m.id == model_id }
+      return preferred_match(exact_matches) if exact_matches.any?
+
+      resolved_id = Aliases.resolve(model_id)
+      alias_matches = all.select { |m| m.id == resolved_id }
+      return preferred_match(alias_matches) if alias_matches.any?
+
+      raise(ModelNotFoundError, "Unknown model: #{model_id}")
+    end
+
+    def preferred_match(candidates)
+      return candidates.first if candidates.size == 1
+
+      candidates.min_by do |model|
+        index = PROVIDER_PREFERENCE.index(model.provider)
+        index || PROVIDER_PREFERENCE.length
+      end
     end
   end
 end

data/lib/ruby_llm/provider.rb

@@ -102,16 +102,24 @@ module RubyLLM
       self.class.remote?
     end
 
+    def assume_models_exist?
+      self.class.assume_models_exist?
+    end
+
     def parse_error(response)
       return if response.body.empty?
 
       body = try_parse_json(response.body)
       case body
       when Hash
+        error = body['error']
+        return error if error.is_a?(String)
+
         body.dig('error', 'message')
       when Array
         body.map do |part|
-          part.dig('error', 'message')
+          error = part['error']
+          error.is_a?(String) ? error : part.dig('error', 'message')
         end.join('. ')
       else
         body
@@ -160,6 +168,10 @@ module RubyLLM
         !local?
       end
 
+      def assume_models_exist?
+        false
+      end
+
       def configured?(config)
         configuration_requirements.all? { |req| config.send(req) }
       end

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

@@ -44,7 +44,7 @@ module RubyLLM
               type: 'image',
               source: {
                 type: 'url',
-                url: image.source
+                url: image.source.to_s
               }
             }
           else
@@ -65,7 +65,7 @@ module RubyLLM
               type: 'document',
               source: {
                 type: 'url',
-                url: pdf.source
+                url: pdf.source.to_s
               }
             }
           else

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    class Azure
+      # Chat methods of the Azure AI Foundry API integration
+      module Chat
+        def completion_url
+          'models/chat/completions?api-version=2024-05-01-preview'
+        end
+
+        def format_messages(messages)
+          messages.map do |msg|
+            {
+              role: format_role(msg.role),
+              content: Media.format_content(msg.content),
+              tool_calls: format_tool_calls(msg.tool_calls),
+              tool_call_id: msg.tool_call_id
+            }.compact.merge(format_thinking(msg))
+          end
+        end
+
+        def format_role(role)
+          role.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    class Azure
+      # Embeddings methods of the Azure AI Foundry API integration
+      module Embeddings
+        module_function
+
+        def embedding_url(...)
+          'openai/v1/embeddings'
+        end
+
+        def render_embedding_payload(text, model:, dimensions:)
+          {
+            model: model,
+            input: [text].flatten,
+            dimensions: dimensions
+          }.compact
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    class Azure
+      # Handles formatting of media content (images, audio) for Azure OpenAI-compatible APIs.
+      module Media
+        module_function
+
+        def format_content(content) # rubocop:disable Metrics/PerceivedComplexity
+          return content.value if content.is_a?(RubyLLM::Content::Raw)
+          return content.to_json if content.is_a?(Hash) || content.is_a?(Array)
+          return content unless content.is_a?(Content)
+
+          parts = []
+          parts << OpenAI::Media.format_text(content.text) if content.text
+
+          content.attachments.each do |attachment|
+            case attachment.type
+            when :image
+              parts << format_image(attachment)
+            when :audio
+              parts << OpenAI::Media.format_audio(attachment)
+            when :text
+              parts << OpenAI::Media.format_text_file(attachment)
+            else
+              raise UnsupportedAttachmentError, attachment.type
+            end
+          end
+
+          parts
+        end
+
+        def format_image(image)
+          {
+            type: 'image_url',
+            image_url: {
+              url: image.for_llm
+            }
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    class Azure
+      # Models methods of the Azure AI Foundry API integration
+      module Models
+        def models_url
+          'openai/v1/models?api-version=preview'
+        end
+      end
+    end
+  end
+end

data/lib/ruby_llm/providers/azure.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    # Azure AI Foundry / OpenAI-compatible API integration.
+    class Azure < OpenAI
+      include Azure::Chat
+      include Azure::Embeddings
+      include Azure::Media
+      include Azure::Models
+
+      def api_base
+        @config.azure_api_base
+      end
+
+      def headers
+        if @config.azure_api_key
+          { 'api-key' => @config.azure_api_key }
+        else
+          { 'Authorization' => "Bearer #{@config.azure_ai_auth_token}" }
+        end
+      end
+
+      def configured?
+        self.class.configured?(@config)
+      end
+
+      class << self
+        def configuration_requirements
+          %i[azure_api_base]
+        end
+
+        def configured?(config)
+          config.azure_api_base && (config.azure_api_key || config.azure_ai_auth_token)
+        end
+
+        # Azure works with deployment names, instead of model names
+        def assume_models_exist?
+          true
+        end
+      end
+
+      def ensure_configured!
+        missing = []
+        missing << :azure_api_base unless @config.azure_api_base
+        if @config.azure_api_key.nil? && @config.azure_ai_auth_token.nil?
+          missing << 'azure_api_key or azure_ai_auth_token'
+        end
+        return if missing.empty?
+
+        raise ConfigurationError,
+              "Missing configuration for Azure: #{missing.join(', ')}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+require 'digest'
+require 'openssl'
+
+module RubyLLM
+  module Providers
+    class Bedrock
+      # SigV4 authentication helpers for Bedrock.
+      module Auth
+        private
+
+        def signed_post(connection, url, payload, additional_headers = {})
+          request_payload = api_payload(payload)
+          body = JSON.generate(request_payload)
+          signed_headers = sign_headers('POST', url, body)
+
+          response = connection.post(url, request_payload) do |req|
+            req.headers.merge!(signed_headers)
+            req.headers.merge!(additional_headers) unless additional_headers.empty?
+            yield req if block_given?
+          end
+
+          parse_completion_response(response)
+        end
+
+        def signed_get(base_url, url)
+          conn = Connection.basic do |f|
+            f.request :json
+            f.response :json
+            f.adapter :net_http
+            f.use :llm_errors, provider: self
+          end
+
+          conn.url_prefix = base_url
+
+          conn.get(url) do |req|
+            req.headers.merge!(sign_headers('GET', url, '', base_url: base_url))
+          end
+        end
+
+        def sign_headers(method, path, body, base_url: api_base)
+          now = Time.now.utc
+          amz_date = now.strftime('%Y%m%dT%H%M%SZ')
+          date_stamp = now.strftime('%Y%m%d')
+
+          uri = URI.parse(path)
+          canonical_uri = canonical_uri(uri.path)
+          canonical_query = canonical_query_string(uri.query)
+          payload_hash = Digest::SHA256.hexdigest(body)
+
+          headers = {
+            'host' => URI.parse(base_url).host,
+            'x-amz-content-sha256' => payload_hash,
+            'x-amz-date' => amz_date
+          }
+          headers['x-amz-security-token'] = @config.bedrock_session_token if @config.bedrock_session_token
+
+          signed_headers = headers.keys.sort.join(';')
+          canonical_headers = headers.keys.sort.map { |key| "#{key}:#{headers[key].to_s.strip}\n" }.join
+
+          canonical_request = [
+            method,
+            canonical_uri,
+            canonical_query,
+            canonical_headers,
+            signed_headers,
+            payload_hash
+          ].join("\n")
+
+          credential_scope = "#{date_stamp}/#{bedrock_region}/bedrock/aws4_request"
+          string_to_sign = [
+            'AWS4-HMAC-SHA256',
+            amz_date,
+            credential_scope,
+            Digest::SHA256.hexdigest(canonical_request)
+          ].join("\n")
+
+          signing_key = signing_key(date_stamp)
+          signature = OpenSSL::HMAC.hexdigest('sha256', signing_key, string_to_sign)
+
+          {
+            'X-Amz-Date' => amz_date,
+            'X-Amz-Content-Sha256' => payload_hash,
+            'X-Amz-Security-Token' => @config.bedrock_session_token,
+            'Authorization' => "AWS4-HMAC-SHA256 Credential=#{@config.bedrock_api_key}/#{credential_scope}, " \
+                               "SignedHeaders=#{signed_headers}, Signature=#{signature}",
+            'Content-Type' => 'application/json'
+          }.compact
+        end
+
+        def canonical_query_string(raw_query)
+          return '' if raw_query.nil? || raw_query.empty?
+
+          URI.decode_www_form(raw_query)
+             .sort_by(&:first)
+             .map { |k, v| "#{uri_encode(k)}=#{uri_encode(v)}" }
+             .join('&')
+        end
+
+        def canonical_uri(path)
+          return '/' if path.nil? || path.empty?
+
+          segments = path.split('/', -1).map { |segment| uri_encode(segment) }
+          canonical = segments.join('/')
+          canonical.start_with?('/') ? canonical : "/#{canonical}"
+        end
+
+        def uri_encode(text)
+          URI.encode_www_form_component(text.to_s).gsub('+', '%20').gsub('%7E', '~')
+        end
+
+        def signing_key(date_stamp)
+          k_date = OpenSSL::HMAC.digest('sha256', "AWS4#{@config.bedrock_secret_key}", date_stamp)
+          k_region = OpenSSL::HMAC.digest('sha256', k_date, bedrock_region)
+          k_service = OpenSSL::HMAC.digest('sha256', k_region, 'bedrock')
+          OpenSSL::HMAC.digest('sha256', k_service, 'aws4_request')
+        end
+      end
+    end
+  end
+end