ruby_llm_community 1.1.1 → 1.3.0

data/lib/ruby_llm/chat.rb

@@ -32,7 +32,7 @@ module RubyLLM
     end
 
     def ask(message = nil, with: nil, &)
-      add_message role: :user, content: Content.new(message, with)
+      add_message role: :user, content: build_content(message, with)
       complete(&)
     end
 
@@ -200,7 +200,8 @@ module RubyLLM
         @on[:tool_call]&.call(tool_call)
         result = execute_tool tool_call
         @on[:tool_result]&.call(result)
-        content = result.is_a?(Content) ? result : result.to_s
+        tool_payload = result.is_a?(Tool::Halt) ? result.content : result
+        content = content_like?(tool_payload) ? tool_payload : tool_payload.to_s
         message = add_message role: :tool, content:, tool_call_id: tool_call.id
         @on[:end_message]&.call(message)
 
@@ -215,5 +216,15 @@ module RubyLLM
       args = tool_call.arguments
       tool.call(args)
     end
+
+    def build_content(message, attachments)
+      return message if content_like?(message)
+
+      Content.new(message, attachments)
+    end
+
+    def content_like?(object)
+      object.is_a?(Content) || object.is_a?(Content::Raw)
+    end
   end
 end

data/lib/ruby_llm/configuration.rb

@@ -10,6 +10,7 @@ module RubyLLM
                   :openai_use_system_role,
                   :anthropic_api_key,
                   :gemini_api_key,
+                  :gemini_api_base,
                   :vertexai_project_id,
                   :vertexai_location,
                   :deepseek_api_key,
@@ -24,11 +25,16 @@ module RubyLLM
                   :gpustack_api_base,
                   :gpustack_api_key,
                   :mistral_api_key,
+                  # Red Candle configuration
+                  :red_candle_device,
                   # Default models
                   :default_model,
                   :default_embedding_model,
+                  :default_moderation_model,
                   :default_image_model,
+                  :default_transcription_model,
                   # Model registry
+                  :model_registry_file,
                   :model_registry_class,
                   # Rails integration
                   :use_new_acts_as,
@@ -46,7 +52,7 @@ module RubyLLM
                   :log_stream_debug
 
     def initialize
-      @request_timeout = 120
+      @request_timeout = 300
       @max_retries = 3
       @retry_interval = 0.1
       @retry_backoff_factor = 2
@@ -55,8 +61,11 @@ module RubyLLM
 
       @default_model = 'gpt-4.1-nano'
       @default_embedding_model = 'text-embedding-3-small'
+      @default_moderation_model = 'omni-moderation-latest'
       @default_image_model = 'gpt-image-1'
+      @default_transcription_model = 'whisper-1'
 
+      @model_registry_file = File.expand_path('models.json', __dir__)
       @model_registry_class = 'Model'
       @use_new_acts_as = false
 

data/lib/ruby_llm/connection.rb

@@ -34,8 +34,7 @@ module RubyLLM
     end
 
     def post(url, payload, &)
-      body = payload.is_a?(Hash) ? JSON.generate(payload, ascii_only: false) : payload
-      @connection.post url, body do |req|
+      @connection.post url, payload do |req|
         req.headers.merge! @provider.headers if @provider.respond_to?(:headers)
         yield req if block_given?
       end
@@ -66,7 +65,7 @@ module RubyLLM
                        errors: true,
                        headers: false,
                        log_level: :debug do |logger|
-        logger.filter(%r{[A-Za-z0-9+/=]{100,}}, 'data":"[BASE64 DATA]"')
+        logger.filter(%r{[A-Za-z0-9+/=]{100,}}, '[BASE64 DATA]')
         logger.filter(/[-\d.e,\s]{100,}/, '[EMBEDDINGS ARRAY]')
       end
     end
@@ -83,9 +82,10 @@ module RubyLLM
     end
 
     def setup_middleware(faraday)
+      faraday.request :multipart
       faraday.request :json
       faraday.response :json
-      faraday.adapter Faraday.default_adapter
+      faraday.adapter :net_http
       faraday.use :llm_errors, provider: @provider
     end
 

data/lib/ruby_llm/content.rb

@@ -53,3 +53,26 @@ module RubyLLM
     end
   end
 end
+
+module RubyLLM
+  class Content
+    # Represents provider-specific payloads that should bypass RubyLLM formatting.
+    class Raw
+      attr_reader :value
+
+      def initialize(value)
+        raise ArgumentError, 'Raw content payload cannot be nil' if value.nil?
+
+        @value = value
+      end
+
+      def format
+        @value
+      end
+
+      def to_h
+        @value
+      end
+    end
+  end
+end

data/lib/ruby_llm/message.rb

@@ -5,22 +5,22 @@ module RubyLLM
   class Message
     ROLES = %i[system user assistant tool].freeze
 
-    attr_reader :role, :tool_calls, :tool_call_id, :input_tokens, :output_tokens, :model_id, :raw,
-                :cached_tokens, :cache_creation_tokens, :reasoning_id
+    attr_reader :role, :model_id, :tool_calls, :tool_call_id, :input_tokens, :output_tokens,
+                :cached_tokens, :cache_creation_tokens, :raw, :reasoning_id
     attr_writer :content
 
     def initialize(options = {})
       @role = options.fetch(:role).to_sym
       @content = normalize_content(options.fetch(:content))
+      @model_id = options[:model_id]
       @tool_calls = options[:tool_calls]
+      @tool_call_id = options[:tool_call_id]
       @input_tokens = options[:input_tokens]
       @output_tokens = options[:output_tokens]
-      @model_id = options[:model_id]
-      @tool_call_id = options[:tool_call_id]
       @cached_tokens = options[:cached_tokens]
       @cache_creation_tokens = options[:cache_creation_tokens]
-      @reasoning_id = options[:reasoning_id]
       @raw = options[:raw]
+      @reasoning_id = options[:reasoning_id]
 
       ensure_valid_role
     end
@@ -46,16 +46,24 @@ module RubyLLM
     end
 
     def to_h
+      content_value = content
+      content_value = content_value.to_h if content_value.is_a?(Content) || content_value.is_a?(Content::Raw)
+
+      tool_calls_value = tool_calls
+      if tool_calls_value.is_a?(Hash) && tool_calls_value.values.any?(ToolCall)
+        tool_calls_value = tool_calls_value&.transform_values(&:to_h)
+      end
+
       {
         role: role,
-        content: content.is_a?(Content) ? content.to_h : content,
-        tool_calls: tool_calls,
+        content: content_value,
+        model_id: model_id,
+        tool_calls: tool_calls_value,
         tool_call_id: tool_call_id,
         input_tokens: input_tokens,
         output_tokens: output_tokens,
-        model_id: model_id,
-        cache_creation_tokens: cache_creation_tokens,
         cached_tokens: cached_tokens,
+        cache_creation_tokens: cache_creation_tokens,
         reasoning_id: reasoning_id
       }.compact
     end

data/lib/ruby_llm/model/info.rb

@@ -72,6 +72,10 @@ module RubyLLM
         pricing.text_tokens.output
       end
 
+      def provider_class
+        RubyLLM::Provider.resolve provider
+      end
+
       def type # rubocop:disable Metrics/PerceivedComplexity
         if modalities.output.include?('embeddings') && !modalities.output.include?('text')
           'embedding'