llm.rb 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482fe176a5e48457ba806d4ca3ae46c2e39f0e6a8037b8b39f4aaeea399ea33c
-  data.tar.gz: 71088a3ae2878ad20ed021324ab3da60df42c99753d062c3063bf9ba45cfc079
+  metadata.gz: 56ddedb75f6c791cc42bca736bc62360ba4850a3a204f9a82288e8c6ea977eeb
+  data.tar.gz: 3881b731dacd921e258eac954c4468d052e673e48ad53c63ae1a246973c84d33
 SHA512:
-  metadata.gz: aef5fa2469606524a5c00cd582c12035b513c284743a2f86650cb8e0b828952be06935c173bf6b20d0230c31c91dbb20475fca5ca1c25b04e08b02069d399a49
-  data.tar.gz: f937bb7f2d381e131f6c4d87b5c095cab5c4a2c3af9a0dc0557b263c26d637fcc463fd876442faa128cb31edb7833a67a34da5bd9e527c86d4030349d388b000
+  metadata.gz: a8838f57a1232afc42448d28a0f3f7b8907c2a527be284579b3af56e398edda50d7cc02a8dda2794c65096699831058494cccae3f8a116b538f76bc42127eba8
+  data.tar.gz: ef49e8046b4aab4e59b252ffdbf16135673d227b4124bf45bf5c31856c49822168182928b56fdc7428d2056dbae7c211fac0d6d8ef3eba48a7aca47420bb96e7

data/CHANGELOG.md

@@ -2,8 +2,29 @@
 
 ## Unreleased
 
+Changes since `v5.1.0`.
+
+## v5.1.0
+
 Changes since `v5.0.0`.
 
+This release tightens streamed tool execution around the actual request-local
+runtime state. It fixes streamed resolution of per-request tools and makes
+that streamed path work cleanly with `LLM.function(...)`, MCP tools, bound
+tool instances, and normal tool classes.
+
+### Fix
+
+* **Resolve request-local tools during streaming** <br>
+  Resolve streamed tool calls through `LLM::Stream` request-local tools
+  before falling back to the global registry, so per-request tools and bound
+  tool instances work correctly during streaming.
+
+* **Support `LLM.function(...)` and MCP tools in streamed tool resolution** <br>
+  Let streamed tool resolution use the current request tool set, so
+  `LLM.function(...)`, MCP tools, bound tool instances, and normal
+  `LLM::Tool` classes all work through the same streamed tool path.
+
 ## v5.0.0
 
 Changes since `v4.23.0`.

data/README.md

@@ -4,7 +4,7 @@
 <p align="center">
   <a href="https://0x1eef.github.io/x/llm.rb?rebuild=1"><img src="https://img.shields.io/badge/docs-0x1eef.github.io-blue.svg" alt="RubyDoc"></a>
   <a href="https://opensource.org/license/0bsd"><img src="https://img.shields.io/badge/License-0BSD-orange.svg?" alt="License"></a>
-  <a href="https://github.com/llmrb/llm.rb/tags"><img src="https://img.shields.io/badge/version-5.0.0-green.svg?" alt="Version"></a>
+  <a href="https://github.com/llmrb/llm.rb/tags"><img src="https://img.shields.io/badge/version-5.1.0-green.svg?" alt="Version"></a>
 </p>
 
 ## About

data/lib/llm/context.rb

@@ -177,7 +177,7 @@ module LLM
       params = params.merge(messages: @messages.to_a)
       params = @params.merge(params)
       prompt, params = transform(prompt, params)
-      bind!(params[:stream], params[:model])
+      bind!(params[:stream], params[:model], params[:tools])
       res = @llm.complete(prompt, params)
       role = params[:role] || @llm.user_role
       role = @llm.tool_role if params[:role].nil? && [*prompt].grep(LLM::Function::Return).any?
@@ -205,7 +205,7 @@ module LLM
       compactor.compact!(prompt) if compactor.compact?(prompt)
       params = @params.merge(params)
       prompt, params = transform(prompt, params)
-      bind!(params[:stream], params[:model])
+      bind!(params[:stream], params[:model], params[:tools])
       res_id = params[:store] == false ? nil : @messages.find(&:assistant?)&.response&.response_id
       params = params.merge(previous_response_id: res_id, input: @messages.to_a).compact
       res = @llm.responses.create(prompt, params)
@@ -459,11 +459,12 @@ module LLM
 
     private
 
-    def bind!(stream, model)
+    def bind!(stream, model, tools)
       return unless LLM::Stream === stream
       stream.extra[:ctx] = self
       stream.extra[:tracer] = tracer
       stream.extra[:model] = model
+      stream.extra[:tools] = tools
     end
 
     def queue
@@ -494,7 +495,6 @@ module LLM
         message: warning
       })
     end
-
   end
 
   # Backward-compatible alias

data/lib/llm/providers/anthropic/stream_parser.rb

@@ -105,7 +105,7 @@ class LLM::Anthropic
     end
 
     def resolve_tool(tool)
-      registered = LLM::Function.find_by_name(tool["name"])
+      registered = @stream.find_tool(tool["name"])
       fn = (registered || LLM::Function.new(tool["name"])).dup.tap do |fn|
         fn.id = tool["id"]
         fn.arguments = LLM::Anthropic.parse_tool_input(tool["input"])

data/lib/llm/providers/google/stream_parser.rb

@@ -153,7 +153,7 @@ class LLM::Google
 
     def resolve_tool(part, cindex, pindex)
       call = part["functionCall"]
-      registered = LLM::Function.find_by_name(call["name"])
+      registered = @stream.find_tool(call["name"])
       fn = (registered || LLM::Function.new(call["name"])).dup.tap do |fn|
         fn.id = LLM::Google.tool_id(part:, cindex:, pindex:)
         fn.arguments = call["args"]

data/lib/llm/providers/openai/responses/stream_parser.rb

@@ -269,7 +269,7 @@ class LLM::OpenAI
     # @group Resolvers
 
     def resolve_tool(tool, arguments)
-      registered = LLM::Function.find_by_name(tool["name"])
+      registered = @stream.find_tool(tool["name"])
       fn = (registered || LLM::Function.new(tool["name"])).dup.tap do |fn|
         fn.id = tool["call_id"]
         fn.arguments = arguments

data/lib/llm/providers/openai/stream_parser.rb

@@ -185,7 +185,7 @@ class LLM::OpenAI
     end
 
     def resolve_tool(tool, function, arguments)
-      registered = LLM::Function.find_by_name(function["name"])
+      registered = @stream.find_tool(function["name"])
       fn = (registered || LLM::Function.new(function["name"])).dup.tap do |fn|
         fn.id = tool["id"]
         fn.arguments = arguments

data/lib/llm/stream.rb

@@ -83,12 +83,12 @@ module LLM
     #   `tool.mcp? ? ctx.spawn(tool, :task) : ctx.spawn(tool, :ractor)`.
     #   When a streamed tool cannot be resolved, `error` is passed as an
     #   {LLM::Function::Return}. It can be sent back to the model, allowing
-    #   the tool-call path to recover and the session to continue. Tool
-    #   resolution depends on
-    #   {LLM::Function.registry}, which includes {LLM::Tool LLM::Tool}
-    #   subclasses, including MCP tools, but not functions defined with
-    #   {LLM.function}. The current `:ractor` mode is for class-based tools
-    #   and does not support MCP tools.
+    #   the tool-call path to recover and the session to continue. Streamed
+    #   tool resolution now prefers the current request tools, so
+    #   {LLM.function}, MCP tools, bound tool instances, and normal
+    #   {LLM::Tool LLM::Tool} classes can all resolve through the same
+    #   request-local path. The current `:ractor` mode is for class-based
+    #   tools and does not support MCP tools.
     # @param [LLM::Function] tool
     #  The parsed tool call.
     # @param [LLM::Function::Return, nil] error
@@ -148,6 +148,34 @@ module LLM
       })
     end
 
+    ##
+    # Returns the tool definitions available for the current streamed request.
+    # This prefers request-local tools attached to the stream and falls back
+    # to the current context defaults when present.
+    # @return [Array<LLM::Function, LLM::Tool>]
+    def tools
+      extra[:tools] || ctx&.params&.dig(:tools) || []
+    end
+
+    ##
+    # Resolves a streamed tool call against the current request tools first,
+    # then falls back to the global function registry.
+    # @param [String] name
+    # @return [LLM::Function, nil]
+    def find_tool(name)
+      tool = tools.find do |candidate|
+        candidate_name =
+          if candidate.respond_to?(:function)
+            candidate.function.name
+          else
+            candidate.name
+          end
+        candidate_name.to_s == name.to_s
+      end
+      tool&.then { _1.respond_to?(:function) ? _1.function : _1 } ||
+        LLM::Function.find_by_name(name)
+    end
+
     # @endgroup
   end
 end

data/lib/llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LLM
-  VERSION = "5.0.0"
+  VERSION = "5.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Antar Azri