ruby_llm 1.3.0rc1 → 1.3.0

data/lib/ruby_llm/models.rb

@@ -46,22 +46,25 @@ module RubyLLM
         end
       end
 
-      def resolve(model_id, provider: nil, assume_exists: false)
+      def resolve(model_id, provider: nil, assume_exists: false) # rubocop:disable Metrics/PerceivedComplexity
         assume_exists = true if provider && Provider.providers[provider.to_sym].local?
 
         if assume_exists
           raise ArgumentError, 'Provider must be specified if assume_exists is true' unless provider
 
           provider = Provider.providers[provider.to_sym] || raise(Error, "Unknown provider: #{provider.to_sym}")
-          model = Struct.new(:id, :provider, :capabilities, :modalities, :supports_vision?, :supports_functions?)
-                        .new(model_id,
-                             provider,
-                             %w[function_calling streaming],
-                             RubyLLM::Modalities.new({ input: %w[text image], output: %w[text] }),
-                             true,
-                             true)
-          RubyLLM.logger.warn "Assuming model '#{model_id}' exists for provider '#{provider}'. " \
-                              'Capabilities may not be accurately reflected.'
+          model = Model::Info.new(
+            id: model_id,
+            name: model_id.gsub('-', ' ').capitalize,
+            provider: provider.slug,
+            capabilities: %w[function_calling streaming],
+            modalities: { input: %w[text image], output: %w[text] },
+            metadata: { warning: 'Assuming model exists, capabilities may not be accurate' }
+          )
+          if RubyLLM.config.log_assume_model_exists
+            RubyLLM.logger.warn "Assuming model '#{model_id}' exists for provider '#{provider}'. " \
+                                'Capabilities may not be accurately reflected.'
+          end
         else
           model = Models.find model_id, provider
           provider = Provider.providers[model.provider.to_sym] || raise(Error, "Unknown provider: #{model.provider}")
@@ -84,15 +87,12 @@ module RubyLLM
       def fetch_from_parsera
         RubyLLM.logger.info 'Fetching models from Parsera API...'
 
-        connection = Faraday.new('https://api.parsera.org') do |f|
+        connection = Connection.basic do |f|
           f.request :json
-          f.response :json
-          f.response :raise_error
-          f.adapter Faraday.default_adapter
+          f.response :json, parser_options: { symbolize_names: true }
         end
-
-        response = connection.get('/v1/llm-specs')
-        response.body.map { |data| ModelInfo.new(Utils.deep_symbolize_keys(data)) }
+        response = connection.get 'https://api.parsera.org/v1/llm-specs'
+        response.body.map { |data| Model::Info.new(data) }
       end
 
       def merge_models(provider_models, parsera_models)
@@ -130,10 +130,10 @@ module RubyLLM
       end
 
       def add_provider_metadata(parsera_model, provider_model)
-        # Create a new ModelInfo with parsera data but include provider metadata
+        # Create a new Model::Info with parsera data but include provider metadata
         data = parsera_model.to_h
         data[:metadata] = provider_model.metadata.merge(data[:metadata] || {})
-        ModelInfo.new(data)
+        Model::Info.new(data)
       end
     end
 
@@ -145,7 +145,7 @@ module RubyLLM
     # Load models from the JSON file
     def load_models
       data = File.exist?(self.class.models_file) ? File.read(self.class.models_file) : '[]'
-      JSON.parse(data).map { |model| ModelInfo.new(Utils.deep_symbolize_keys(model)) }
+      JSON.parse(data, symbolize_names: true).map { |model| Model::Info.new(model) }
     rescue JSON::ParserError
       []
     end

data/lib/ruby_llm/provider.rb

@@ -40,7 +40,7 @@ module RubyLLM
       def paint(prompt, model:, size:, connection:)
         payload = render_image_payload(prompt, model:, size:)
         response = connection.post images_url, payload
-        parse_image_response response
+        parse_image_response(response, model:)
       end
 
       def configured?(config = nil)

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

@@ -14,11 +14,15 @@ module RubyLLM
           parts << format_text(content.text) if content.text
 
           content.attachments.each do |attachment|
-            case attachment
-            when Attachments::Image
+            case attachment.type
+            when :image
               parts << format_image(attachment)
-            when Attachments::PDF
+            when :pdf
               parts << format_pdf(attachment)
+            when :text
+              parts << format_text_file(attachment)
+            else
+              raise UnsupportedAttachmentError, attachment.mime_type
             end
           end
 
@@ -73,6 +77,13 @@ module RubyLLM
             }
           end
         end
+
+        def format_text_file(text_file)
+          {
+            type: 'text',
+            text: Utils.format_text_file_for_llm(text_file)
+          }
+        end
       end
     end
   end

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

@@ -15,7 +15,7 @@ module RubyLLM
           Array(response.body['data']).map do |model_data|
             model_id = model_data['id']
 
-            ModelInfo.new(
+            Model::Info.new(
               id: model_id,
               name: model_data['display_name'],
               provider: slug,

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

@@ -4,6 +4,7 @@ module RubyLLM
   module Providers
     module Bedrock
       # Media handling methods for the Bedrock API integration
+      # NOTE: Bedrock does not support url attachments
       module Media
         extend Anthropic::Media
 
@@ -16,13 +17,15 @@ module RubyLLM
           parts << Anthropic::Media.format_text(content.text) if content.text
 
           content.attachments.each do |attachment|
-            case attachment
-            when Attachments::Image
+            case attachment.type
+            when :image
               parts << format_image(attachment)
-            when Attachments::PDF
+            when :pdf
               parts << format_pdf(attachment)
+            when :text
+              parts << Anthropic::Media.format_text_file(attachment)
             else
-              raise "Unsupported attachment type: #{attachment.class}"
+              raise UnsupportedAttachmentError, attachment.type
             end
           end
 

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

@@ -30,7 +30,7 @@ module RubyLLM
           models.select { |m| m['modelId'].include?('claude') }.map do |model_data|
             model_id = model_data['modelId']
 
-            ModelInfo.new(
+            Model::Info.new(
               id: model_id_with_region(model_id, model_data),
               name: model_data['modelName'] || capabilities.format_display_name(model_id),
               provider: slug,
@@ -56,7 +56,7 @@ module RubyLLM
         def create_model_info(model_data, slug, _capabilities)
           model_id = model_data['modelId']
 
-          ModelInfo.new(
+          Model::Info.new(
             id: model_id_with_region(model_id, model_data),
             name: model_data['modelName'] || model_id,
             provider: slug,

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

@@ -24,7 +24,7 @@ module RubyLLM
           }
         end
 
-        def parse_image_response(response)
+        def parse_image_response(response, model:)
           data = response.body
           image_data = data['predictions']&.first
 
@@ -38,7 +38,8 @@ module RubyLLM
 
           Image.new(
             data: base64_data,
-            mime_type: mime_type
+            mime_type: mime_type,
+            model_id: model
           )
         end
       end

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

@@ -14,43 +14,31 @@ module RubyLLM
           parts << format_text(content.text) if content.text
 
           content.attachments.each do |attachment|
-            case attachment
-            when Attachments::Image
-              parts << format_image(attachment)
-            when Attachments::PDF
-              parts << format_pdf(attachment)
-            when Attachments::Audio
-              parts << format_audio(attachment)
+            case attachment.type
+            when :text
+              parts << format_text_file(attachment)
+            when :unknown
+              raise UnsupportedAttachmentError, attachment.mime_type
+            else
+              parts << format_attachment(attachment)
             end
           end
 
           parts
         end
 
-        def format_image(image)
+        def format_attachment(attachment)
           {
             inline_data: {
-              mime_type: image.mime_type,
-              data: image.encoded
+              mime_type: attachment.mime_type,
+              data: attachment.encoded
             }
           }
         end
 
-        def format_pdf(pdf)
+        def format_text_file(text_file)
           {
-            inline_data: {
-              mime_type: pdf.mime_type,
-              data: pdf.encoded
-            }
-          }
-        end
-
-        def format_audio(audio)
-          {
-            inline_data: {
-              mime_type: audio.mime_type,
-              data: audio.encoded
-            }
+            text: Utils.format_text_file_for_llm(text_file)
           }
         end
 

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

@@ -16,7 +16,7 @@ module RubyLLM
             # Extract model ID without "models/" prefix
             model_id = model_data['name'].gsub('models/', '')
 
-            ModelInfo.new(
+            Model::Info.new(
               id: model_id,
               name: model_data['displayName'],
               provider: slug,

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

@@ -16,13 +16,17 @@ module RubyLLM
           parts << format_text(content.text) if content.text
 
           content.attachments.each do |attachment|
-            case attachment
-            when Attachments::Image
+            case attachment.type
+            when :image
               parts << Ollama::Media.format_image(attachment)
-            when Attachments::PDF
+            when :pdf
               parts << format_pdf(attachment)
-            when Attachments::Audio
+            when :audio
               parts << format_audio(attachment)
+            when :text
+              parts << format_text_file(attachment)
+            else
+              raise UnsupportedAttachmentError, attachment.mime_type
             end
           end
 

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

@@ -263,7 +263,7 @@ module RubyLLM
           # Advanced capabilities
           capabilities << 'reasoning' if model_id.match?(/o1/)
 
-          if model_id.match?(/gpt-4-turbo|gpt-4o|claude/)
+          if model_id.match?(/gpt-4-turbo|gpt-4o/)
             capabilities << 'image_generation' if model_id.match?(/vision/)
             capabilities << 'speech_generation' if model_id.match?(/audio/)
             capabilities << 'transcription' if model_id.match?(/audio/)

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

@@ -20,7 +20,7 @@ module RubyLLM
           }
         end
 
-        def parse_image_response(response)
+        def parse_image_response(response, model:)
           data = response.body
           image_data = data['data'].first
 
@@ -28,7 +28,8 @@ module RubyLLM
             url: image_data['url'],
             mime_type: 'image/png', # DALL-E typically returns PNGs
             revised_prompt: image_data['revised_prompt'],
-            model_id: data['model']
+            model_id: model,
+            data: image_data['b64_json']
           )
         end
       end

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

@@ -14,13 +14,17 @@ module RubyLLM
           parts << format_text(content.text) if content.text
 
           content.attachments.each do |attachment|
-            case attachment
-            when Attachments::Image
+            case attachment.type
+            when :image
               parts << format_image(attachment)
-            when Attachments::PDF
+            when :pdf
               parts << format_pdf(attachment)
-            when Attachments::Audio
+            when :audio
               parts << format_audio(attachment)
+            when :text
+              parts << format_text_file(attachment)
+            else
+              raise UnsupportedAttachmentError, attachment.type
             end
           end
 
@@ -31,8 +35,7 @@ module RubyLLM
           {
             type: 'image_url',
             image_url: {
-              url: image.url? ? image.source : "data:#{image.mime_type};base64,#{image.encoded}",
-              detail: 'auto'
+              url: image.url? ? image.source : "data:#{image.mime_type};base64,#{image.encoded}"
             }
           }
         end
@@ -41,18 +44,25 @@ module RubyLLM
           {
             type: 'file',
             file: {
-              filename: File.basename(pdf.source),
+              filename: pdf.filename,
               file_data: "data:#{pdf.mime_type};base64,#{pdf.encoded}"
             }
           }
         end
 
+        def format_text_file(text_file)
+          {
+            type: 'text',
+            text: Utils.format_text_file_for_llm(text_file)
+          }
+        end
+
         def format_audio(audio)
           {
             type: 'input_audio',
             input_audio: {
               data: audio.encoded,
-              format: audio.format
+              format: audio.mime_type.split('/').last
             }
           }
         end

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

@@ -15,7 +15,7 @@ module RubyLLM
           Array(response.body['data']).map do |model_data|
             model_id = model_data['id']
 
-            ModelInfo.new(
+            Model::Info.new(
               id: model_id,
               name: capabilities.format_display_name(model_id),
               provider: slug,

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

@@ -37,7 +37,7 @@ module RubyLLM
             # Convert OpenRouter's supported parameters to our capability format
             capabilities = supported_parameters_to_capabilities(model_data['supported_parameters'])
 
-            ModelInfo.new(
+            Model::Info.new(
               id: model_data['id'],
               name: model_data['name'],
               provider: slug,

data/lib/ruby_llm/streaming.rb

@@ -12,9 +12,18 @@ module RubyLLM
       accumulator = StreamAccumulator.new
 
       connection.post stream_url, payload do |req|
-        req.options.on_data = handle_stream do |chunk|
-          accumulator.add chunk
-          block.call chunk
+        if req.options.respond_to?(:on_data)
+          # Handle Faraday 2.x streaming with on_data method
+          req.options.on_data = handle_stream do |chunk|
+            accumulator.add chunk
+            block.call chunk
+          end
+        else
+          # Handle Faraday 1.x streaming with :on_data key
+          req.options[:on_data] = handle_stream do |chunk|
+            accumulator.add chunk
+            block.call chunk
+          end
         end
       end
 
@@ -29,19 +38,45 @@ module RubyLLM
 
     private
 
-    def to_json_stream(&block)
+    def to_json_stream(&)
       buffer = String.new
       parser = EventStreamParser::Parser.new
 
-      proc do |chunk, _bytes, env|
-        RubyLLM.logger.debug "Received chunk: #{chunk}"
+      create_stream_processor(parser, buffer, &)
+    end
 
-        if error_chunk?(chunk)
-          handle_error_chunk(chunk, env)
-        elsif env&.status != 200
-          handle_failed_response(chunk, buffer, env)
+    def create_stream_processor(parser, buffer, &)
+      if Faraday::VERSION.start_with?('1')
+        # Faraday 1.x: on_data receives (chunk, size)
+        legacy_stream_processor(parser, &)
+      else
+        # Faraday 2.x: on_data receives (chunk, bytes, env)
+        stream_processor(parser, buffer, &)
+      end
+    end
+
+    def process_stream_chunk(chunk, parser, _env, &)
+      RubyLLM.logger.debug "Received chunk: #{chunk}"
+
+      if error_chunk?(chunk)
+        handle_error_chunk(chunk, nil)
+      else
+        yield handle_sse(chunk, parser, nil, &)
+      end
+    end
+
+    def legacy_stream_processor(parser, &block)
+      proc do |chunk, _size|
+        process_stream_chunk(chunk, parser, nil, &block)
+      end
+    end
+
+    def stream_processor(parser, buffer, &block)
+      proc do |chunk, _bytes, env|
+        if env&.status == 200
+          process_stream_chunk(chunk, parser, env, &block)
         else
-          yield handle_sse(chunk, parser, env, &block)
+          handle_failed_response(chunk, buffer, env)
         end
       end
     end

data/lib/ruby_llm/utils.rb

@@ -5,17 +5,22 @@ module RubyLLM
   module Utils
     module_function
 
-    def deep_symbolize_keys(value)
-      case value
-      when Hash
-        value.each_with_object({}) do |(k, v), new_hash|
-          new_key = k.is_a?(String) ? k.to_sym : k
-          new_hash[new_key] = deep_symbolize_keys(v)
-        end
+    def format_text_file_for_llm(text_file)
+      "<file name='#{text_file.filename}' mime_type='#{text_file.mime_type}'>#{text_file.content}</file>"
+    end
+
+    def hash_get(hash, key)
+      hash[key.to_sym] || hash[key.to_s]
+    end
+
+    def to_safe_array(item)
+      case item
       when Array
-        value.map { |v| deep_symbolize_keys(v) }
+        item
+      when Hash
+        [item]
       else
-        value
+        Array(item)
       end
     end
   end

data/lib/ruby_llm/version.rb

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