ruby_llm 1.10.0 → 1.11.0

data/lib/ruby_llm/provider.rb

@@ -108,10 +108,14 @@ module RubyLLM
       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

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/bedrock/chat.rb

@@ -66,7 +66,7 @@ module RubyLLM
             content_blocks << thinking_block if thinking_block
           end
 
-          Anthropic::Chat.append_formatted_content(content_blocks, msg.content)
+          append_formatted_content(content_blocks, msg.content)
 
           {
             role: Anthropic::Chat.convert_role(msg.role),
@@ -100,6 +100,15 @@ module RubyLLM
             content: content_blocks
           }
         end
+
+        def append_formatted_content(content_blocks, content)
+          formatted_content = Media.format_content(content)
+          if formatted_content.is_a?(Array)
+            content_blocks.concat(formatted_content)
+          else
+            content_blocks << formatted_content
+          end
+        end
       end
     end
   end

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

@@ -37,7 +37,7 @@ module RubyLLM
           {
             type: 'image_url',
             image_url: {
-              url: image.url? ? image.source : image.for_llm
+              url: image.url? ? image.source.to_s : image.for_llm
             }
           }
         end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    class XAI
+      # Chat implementation for xAI
+      # https://docs.x.ai/docs/api-reference#chat-completions
+      module Chat
+        def format_role(role)
+          role.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    class XAI
+      # Models metadata for xAI list models.
+      module Models
+        module_function
+
+        IMAGE_MODELS = %w[grok-2-image-1212].freeze
+        VISION_MODELS = %w[
+          grok-2-vision-1212
+          grok-4-0709
+          grok-4-fast-non-reasoning
+          grok-4-fast-reasoning
+          grok-4-1-fast-non-reasoning
+          grok-4-1-fast-reasoning
+        ].freeze
+        REASONING_MODELS = %w[
+          grok-3-mini
+          grok-4-0709
+          grok-4-fast-reasoning
+          grok-4-1-fast-reasoning
+          grok-code-fast-1
+        ].freeze
+
+        def parse_list_models_response(response, slug, _capabilities)
+          Array(response.body['data']).map do |model_data|
+            model_id = model_data['id']
+
+            Model::Info.new(
+              id: model_id,
+              name: format_display_name(model_id),
+              provider: slug,
+              family: 'grok',
+              created_at: model_data['created'] ? Time.at(model_data['created']) : nil,
+              context_window: nil,
+              max_output_tokens: nil,
+              modalities: modalities_for(model_id),
+              capabilities: capabilities_for(model_id),
+              pricing: {},
+              metadata: {
+                object: model_data['object'],
+                owned_by: model_data['owned_by']
+              }.compact
+            )
+          end
+        end
+
+        def modalities_for(model_id)
+          if IMAGE_MODELS.include?(model_id)
+            { input: ['text'], output: ['image'] }
+          else
+            input = ['text']
+            input << 'image' if VISION_MODELS.include?(model_id)
+            { input: input, output: ['text'] }
+          end
+        end
+
+        def capabilities_for(model_id)
+          return [] if IMAGE_MODELS.include?(model_id)
+
+          capabilities = %w[streaming function_calling structured_output]
+          capabilities << 'reasoning' if REASONING_MODELS.include?(model_id)
+          capabilities << 'vision' if VISION_MODELS.include?(model_id)
+          capabilities
+        end
+
+        def format_display_name(model_id)
+          model_id.tr('-', ' ').split.map(&:capitalize).join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/ruby_llm/providers/xai.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    # xAI API integration
+    class XAI < OpenAI
+      include XAI::Chat
+      include XAI::Models
+
+      def api_base
+        'https://api.x.ai/v1'
+      end
+
+      def headers
+        {
+          'Authorization' => "Bearer #{@config.xai_api_key}",
+          'Content-Type' => 'application/json'
+        }
+      end
+
+      class << self
+        def configuration_requirements
+          %i[xai_api_key]
+        end
+      end
+    end
+  end
+end

data/lib/ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/lib/ruby_llm.rb

@@ -13,19 +13,20 @@ require 'zeitwerk'
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect(
-  'ruby_llm' => 'RubyLLM',
-  'llm' => 'LLM',
-  'openai' => 'OpenAI',
+  'UI' => 'UI',
   'api' => 'API',
-  'deepseek' => 'DeepSeek',
-  'perplexity' => 'Perplexity',
   'bedrock' => 'Bedrock',
-  'openrouter' => 'OpenRouter',
+  'deepseek' => 'DeepSeek',
   'gpustack' => 'GPUStack',
+  'llm' => 'LLM',
   'mistral' => 'Mistral',
-  'vertexai' => 'VertexAI',
+  'openai' => 'OpenAI',
+  'openrouter' => 'OpenRouter',
   'pdf' => 'PDF',
-  'UI' => 'UI'
+  'perplexity' => 'Perplexity',
+  'ruby_llm' => 'RubyLLM',
+  'vertexai' => 'VertexAI',
+  'xai' => 'XAI'
 )
 loader.ignore("#{__dir__}/tasks")
 loader.ignore("#{__dir__}/generators")
@@ -100,6 +101,7 @@ RubyLLM::Provider.register :openai, RubyLLM::Providers::OpenAI
 RubyLLM::Provider.register :openrouter, RubyLLM::Providers::OpenRouter
 RubyLLM::Provider.register :perplexity, RubyLLM::Providers::Perplexity
 RubyLLM::Provider.register :vertexai, RubyLLM::Providers::VertexAI
+RubyLLM::Provider.register :xai, RubyLLM::Providers::XAI
 
 if defined?(Rails::Railtie)
   require 'ruby_llm/railtie'

data/lib/tasks/models.rake

@@ -45,6 +45,7 @@ def configure_from_env
     config.deepseek_api_key = ENV.fetch('DEEPSEEK_API_KEY', nil)
     config.perplexity_api_key = ENV.fetch('PERPLEXITY_API_KEY', nil)
     config.openrouter_api_key = ENV.fetch('OPENROUTER_API_KEY', nil)
+    config.xai_api_key = ENV.fetch('XAI_API_KEY', nil)
     config.mistral_api_key = ENV.fetch('MISTRAL_API_KEY', nil)
     config.vertexai_location = ENV.fetch('GOOGLE_CLOUD_LOCATION', nil)
     config.vertexai_project_id = ENV.fetch('GOOGLE_CLOUD_PROJECT', nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Carmine Paolino
@@ -290,6 +290,9 @@ files:
 - lib/ruby_llm/providers/vertexai/models.rb
 - lib/ruby_llm/providers/vertexai/streaming.rb
 - lib/ruby_llm/providers/vertexai/transcription.rb
+- lib/ruby_llm/providers/xai.rb
+- lib/ruby_llm/providers/xai/chat.rb
+- lib/ruby_llm/providers/xai/models.rb
 - lib/ruby_llm/railtie.rb
 - lib/ruby_llm/stream_accumulator.rb
 - lib/ruby_llm/streaming.rb