ruby_llm 2.0.0.rc3 → 2.0.0

data/lib/ruby_llm/batch.rb

@@ -101,7 +101,7 @@ module RubyLLM
         chats = normalize_chats(records)
 
         provider = shared_provider(chats)
-        payload = { provider: provider.slug, provider_class: provider.class.display_name, requests: chats.size }
+        payload = { provider: provider.slug, provider_class: provider.name, requests: chats.size }
         RubyLLM.instrument('batch.ruby_llm', payload, config: provider.config) do |event|
           requests = chats.each_with_index.map do |chat, index|
             { custom_id: index.to_s, model: chat.model.id, payload: chat.render }
@@ -120,7 +120,7 @@ module RubyLLM
         end
 
         provider = shared_provider(requests)
-        payload = { provider: provider.slug, provider_class: provider.class.display_name, requests: requests.size }
+        payload = { provider: provider.slug, provider_class: provider.name, requests: requests.size }
         RubyLLM.instrument('batch.ruby_llm', payload, config: provider.config) do |event|
           lines = requests.each_with_index.map do |request, index|
             { custom_id: index.to_s, model: request.model.id, payload: request.render, text: request.text }

data/lib/ruby_llm/chat.rb

@@ -42,9 +42,9 @@ module RubyLLM
     # The registered tools, as a Hash of tool name Symbols to Tool instances.
     attr_reader :tools
 
-    # The server tools enabled with #with_server_tools, as an array of
+    # The provider tools enabled with #with_provider_tools, as an array of
     # normalized entry Hashes.
-    attr_reader :server_tools
+    attr_reader :provider_tools
 
     # Extra request options set with #with_provider_options, expressed in
     # the provider's request vocabulary.
@@ -119,7 +119,7 @@ module RubyLLM
       @messages = []
       @usage_entries = []
       @tools = {}
-      @server_tools = []
+      @provider_tools = []
       @tool_prefs = { choice: nil, calls: nil }
       @concurrency = normalize_tool_concurrency(@config.tool_concurrency)
       @provider_options = {}
@@ -354,10 +354,10 @@ module RubyLLM
     # no alias for yet work without a gem update. Entries add to any tools
     # enabled earlier; pass +nil+ to clear them all. Returns +self+.
     #
-    #   chat.with_server_tools(:web_search)
-    #   chat.with_server_tools(:web_search, :code_execution)
-    #   chat.with_server_tools(web_search: { allowed_domains: ["ruby-lang.org"] })
-    #   chat.with_server_tools({ type: "web_search_20260318", name: "web_search" })
+    #   chat.with_provider_tools(:web_search)
+    #   chat.with_provider_tools(:web_search, :code_execution)
+    #   chat.with_provider_tools(web_search: { allowed_domains: ["ruby-lang.org"] })
+    #   chat.with_provider_tools({ type: "web_search_20260318", name: "web_search" })
     #
     # The tool steps the model ran come back on
     # Message#server_tool_calls, citations from search tools on
@@ -365,14 +365,14 @@ module RubyLLM
     # <tt>message.tokens.server_tool_use</tt>.
     #
     # Raises UnsupportedServerToolError at request time when the provider
-    # has no server-tool support or does not define a requested alias.
-    def with_server_tools(*tools, **tools_with_options)
+    # has no provider-tool support or does not define a requested alias.
+    def with_provider_tools(*tools, **tools_with_options)
       if tools == [nil] && tools_with_options.empty?
-        @server_tools = []
+        @provider_tools = []
         return self
       end
 
-      @server_tools += RubyLLM::Tools::ServerTools.normalize(tools, tools_with_options)
+      @provider_tools += RubyLLM::Tools::ProviderTools.normalize(tools, tools_with_options)
       self
     end
 
@@ -742,7 +742,7 @@ module RubyLLM
     #   chat.with_instructions("Be terse.").with_tools(Weather)
     #   chat.count_tokens("What's the weather in Berlin?")
     #
-    # Server tools, provider_options, compaction, and before_request hooks
+    # Provider tools, provider_options, compaction, and before_request hooks
     # are not included. Raises Error when the provider has no token counting
     # endpoint.
     def count_tokens(message = nil)
@@ -849,7 +849,7 @@ module RubyLLM
       @provider.render(
         preprocessed_messages,
         tools: @tools,
-        server_tools: @server_tools,
+        provider_tools: @provider_tools,
         tool_prefs: @tool_prefs,
         temperature: @temperature,
         max_output_tokens: @max_output_tokens,
@@ -1003,13 +1003,13 @@ module RubyLLM
       {
         chat: self,
         provider: @provider.slug,
-        provider_class: @provider.class.display_name,
+        provider_class: @provider.name,
         model: @model.id,
         model_info: @model,
         input_messages: messages.dup,
         message_count: messages.size,
         tools: tools.keys,
-        server_tools: server_tools,
+        provider_tools: provider_tools,
         tool_choice: tool_prefs[:choice],
         tool_call_limit: tool_prefs[:calls],
         temperature: @temperature,
@@ -1147,7 +1147,7 @@ module RubyLLM
       @provider.complete(
         preprocessed_messages,
         tools: @tools,
-        server_tools: @server_tools,
+        provider_tools: @provider_tools,
         tool_prefs: @tool_prefs,
         temperature: @temperature,
         max_output_tokens: @max_output_tokens,
@@ -1347,7 +1347,7 @@ module RubyLLM
       payload = {
         chat: self,
         provider: @provider.slug,
-        provider_class: @provider.class.display_name,
+        provider_class: @provider.name,
         model: @model.id,
         model_info: @model,
         tool: tool,

data/lib/ruby_llm/embedding.rb

@@ -117,7 +117,7 @@ module RubyLLM
 
       payload = {
         provider: provider_instance.slug,
-        provider_class: provider_instance.class.display_name,
+        provider_class: provider_instance.name,
         model: model_id,
         model_info: model,
         input: text,

data/lib/ruby_llm/error.rb

@@ -83,7 +83,7 @@ module RubyLLM
     end
   end
 
-  # Raised when Chat#with_server_tools is used with a provider RubyLLM has
+  # Raised when Chat#with_provider_tools is used with a provider RubyLLM has
   # no server-tool support for, or with an alias the provider's protocol
   # does not define.
   class UnsupportedServerToolError < Error; end

data/lib/ruby_llm/image.rb

@@ -75,7 +75,7 @@ module RubyLLM
       empty_tokens = Tokens.new
       payload = {
         provider: provider_instance.slug,
-        provider_class: provider_instance.class.display_name,
+        provider_class: provider_instance.name,
         model: model.id,
         model_info: model,
         prompt: prompt,

data/lib/ruby_llm/message.rb

@@ -64,7 +64,7 @@ module RubyLLM
 
     # The provider-executed tool steps in this response, as an array of
     # ServerToolCall objects. Empty unless the chat enabled tools with
-    # Chat#with_server_tools and the model used one.
+    # Chat#with_provider_tools and the model used one.
     attr_reader :server_tool_calls
 
     # The provider-shaped content blocks of this assistant message, kept
@@ -129,6 +129,14 @@ module RubyLLM
       dup.tap { |message| message.instance_variable_set(:@attachments, wrapped) }
     end
 
+    def without_thinking # :nodoc:
+      dup.tap do |message|
+        message.instance_variable_set(:@thinking, nil)
+        message.instance_variable_set(:@raw_reasoning, nil)
+        message.instance_variable_set(:@tool_calls, tool_calls_without_thought_signatures)
+      end
+    end
+
     # Returns +true+ if the assistant requested one or more tool calls,
     # +false+ otherwise.
     def tool_call?
@@ -276,6 +284,12 @@ module RubyLLM
       end
     end
 
+    def tool_calls_without_thought_signatures
+      tool_calls&.transform_values do |call|
+        call.dup.tap { |copy| copy.thought_signature = nil }
+      end
+    end
+
     def coerce_thinking(thinking, signature)
       case thinking
       when nil, Thinking then thinking