llm.rb 9.0.0 → 10.0.0

data/lib/llm/sequel/plugin.rb

@@ -30,12 +30,7 @@ module LLM::Sequel
       # Resolves a single configured option against a model instance.
       # @return [Object]
       def self.resolve_option(obj, option)
-        case option
-        when Proc then obj.instance_exec(&option)
-        when Symbol then obj.send(option)
-        when Hash then option.dup
-        else option
-        end
+        LLM::Utils.resolve_option(obj, option)
       end
 
       ##

data/lib/llm/stream.rb

@@ -9,8 +9,7 @@ module LLM
   # subclass that overrides the callbacks it needs. For basic streaming,
   # llm.rb also accepts any object that implements `#<<`. {#queue} provides
   # a small helper for collecting asynchronous tool work started from a
-  # callback, and {#tool_not_found} returns an in-band tool error when a
-  # streamed tool cannot be resolved.
+  # callback.
   #
   # @note The `on_*` callbacks run inline with the streaming parser. They
   #   therefore block streaming progress and should generally return as
@@ -150,48 +149,24 @@ module LLM
 
     # @endgroup
 
-    # @group Error handlers
-
-    ##
-    # Returns a function return describing a streamed tool that could not
-    # be resolved.
-    # @note This is mainly useful as a fallback from {#on_tool_call}. It
-    #   should be uncommon in normal use, since streamed tool callbacks only
-    #   run for tools already defined in the context.
-    # @param [LLM::Function] tool
-    # @return [LLM::Function::Return]
-    def tool_not_found(tool)
-      LLM::Function::Return.new(tool.id, tool.name, {
-        error: true, type: LLM::NoSuchToolError.name, message: "tool not found"
-      })
-    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
+    # @group Finders
 
     ##
     # 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
+    def __find__(name)
+      tools = extra[:tools] || ctx&.params&.dig(:tools) || []
+      tool = tools.find do
+        candidate = _1.respond_to?(:function) ? _1.function.name : _1.name
+        candidate.to_s == name.to_s
       end
-      tool&.then { _1.respond_to?(:function) ? _1.function : _1 } ||
+      if tool
+        tool.respond_to?(:function) ? tool.function : tool
+      else
         LLM::Function.find_by_name(name)
+      end
     end
 
     # @endgroup

data/lib/llm/tool/param.rb

@@ -62,14 +62,7 @@ class LLM::Tool
       extend self
 
       def resolve(schema, type)
-        if LLM::Schema::Leaf === type
-          type
-        elsif Class === type && type.respond_to?(:object)
-          type.object
-        else
-          target = type.name.split("::").last.downcase
-          schema.public_send(target)
-        end
+        LLM::Schema::Utils.resolve(schema, type)
       end
 
       def setup(leaf, description, options)

data/lib/llm/utils.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module LLM
+  ##
+  # Shared utility methods used across the runtime.
+  module Utils
+    extend self
+
+    ##
+    # Resolves a configured option against an object instance.
+    #
+    # Proc values are evaluated with `instance_exec`, symbol values are
+    # optionally sent to the object as method calls, hashes are duplicated,
+    # and all other values are returned as-is.
+    #
+    # @param [Object] obj
+    # @param [Object] option
+    # @param [Boolean] resolve_symbol
+    # @return [Object]
+    def resolve_option(obj, option, resolve_symbol: true)
+      case option
+      when Proc then obj.instance_exec(&option)
+      when Symbol then resolve_symbol ? obj.send(option) : option
+      when Hash then option.dup
+      else option
+      end
+    end
+  end
+end

data/lib/llm/version.rb

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

data/lib/llm.rb

@@ -12,6 +12,7 @@ module LLM
   require_relative "llm/prompt"
   require_relative "llm/schema"
   require_relative "llm/object"
+  require_relative "llm/utils"
   require_relative "llm/model"
   require_relative "llm/version"
   require_relative "llm/message"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Antar Azri
@@ -287,7 +287,6 @@ files:
 - lib/llm/active_record/acts_as_agent.rb
 - lib/llm/active_record/acts_as_llm.rb
 - lib/llm/agent.rb
-- lib/llm/bot.rb
 - lib/llm/buffer.rb
 - lib/llm/compactor.rb
 - lib/llm/context.rb
@@ -305,6 +304,7 @@ files:
 - lib/llm/function.rb
 - lib/llm/function/array.rb
 - lib/llm/function/call_group.rb
+- lib/llm/function/call_task.rb
 - lib/llm/function/fiber_group.rb
 - lib/llm/function/fork.rb
 - lib/llm/function/fork/job.rb
@@ -467,6 +467,7 @@ files:
 - lib/llm/transport/response/http.rb
 - lib/llm/transport/stream_decoder.rb
 - lib/llm/usage.rb
+- lib/llm/utils.rb
 - lib/llm/version.rb
 - lib/sequel/plugins/agent.rb
 - lib/sequel/plugins/llm.rb
@@ -493,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Ruby's most capable AI runtime
 test_files: []

data/lib/llm/bot.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "context"