llm.rb 4.10.0 → 4.11.0

data/lib/llm/tool.rb

@@ -20,6 +20,7 @@
 class LLM::Tool
   require_relative "tool/param"
   extend LLM::Tool::Param
+  extend LLM::Function::Registry
 
   types = [
     :Leaf, :String, :Enum,
@@ -39,58 +40,51 @@ class LLM::Tool
   # @return [Class<LLM::Tool>]
   #  Returns a subclass of LLM::Tool
   def self.mcp(mcp, tool)
-    klass = Class.new(LLM::Tool) do
-      name tool["name"]
-      description tool["description"]
-      params { tool["inputSchema"] || {type: "object", properties: {}} }
-
-      define_singleton_method(:inspect) do
-        "<LLM::Tool:0x#{object_id.to_s(16)} name=#{tool["name"]} (mcp)>"
-      end
-      singleton_class.alias_method :to_s, :inspect
-
-      define_singleton_method(:mcp?) do
-        true
-      end
-
-      define_method(:call) do |**args|
-        mcp.call_tool(tool["name"], args)
-      end
-    end
-    unregister(klass)
-  end
-
-  ##
-  # Returns all subclasses of LLM::Tool
-  # @note
-  #  This method excludes tools who haven't defined a name
-  #  as well as tools defined via MCP.
-  # @return [Array<LLM::Tool>]
-  def self.registry
     lock do
-      @registry.select(&:name)
+      @mcp = true
+      klass = Class.new(LLM::Tool) do
+        name tool["name"]
+        description tool["description"]
+        params { tool["inputSchema"] || {type: "object", properties: {}} }
+
+        define_singleton_method(:inspect) do
+          "<LLM::Tool:0x#{object_id.to_s(16)} name=#{tool["name"]} (mcp)>"
+        end
+        singleton_class.alias_method :to_s, :inspect
+
+        define_singleton_method(:mcp?) do
+          true
+        end
+
+        define_method(:call) do |**args|
+          mcp.call_tool(tool["name"], args)
+        end
+      end
+      @mcp = false
+      register(klass)
+      klass
+    ensure
+      @mcp = false
     end
   end
-  @registry = []
 
   ##
   # Clear the registry
   # @return [void]
   def self.clear_registry!
     lock do
-      @registry.clear
-      nil
+      @__registry.each_value { LLM::Function.unregister(_1.function) }
+      super
     end
   end
 
   ##
-  # Register a tool in the registry
+  # Registers a tool and its function.
   # @param [LLM::Tool] tool
   # @api private
   def self.register(tool)
-    lock do
-      @registry << tool
-    end
+    super
+    LLM::Function.register(tool.function)
   end
 
   ##
@@ -99,7 +93,9 @@ class LLM::Tool
   # @api private
   def self.unregister(tool)
     lock do
-      @registry.delete(tool)
+      LLM::Function.unregister(tool.function)
+      super
+      tool
     end
   end
 
@@ -111,7 +107,7 @@ class LLM::Tool
     LLM.lock(:inherited) do
       tool.instance_eval { @__monitor ||= Monitor.new }
       tool.function.register(tool)
-      LLM::Tool.register(tool)
+      LLM::Tool.register(tool) unless lock { @mcp }
     end
   end
 
@@ -125,6 +121,22 @@ class LLM::Tool
     end
   end
 
+  ##
+  # Returns all registered tool classes with definitions.
+  # @return [Array<Class<LLM::Tool>>]
+  def self.registry
+    super.select(&:name)
+  end
+
+  ##
+  # Finds a registered tool by name.
+  # @param [String] name
+  # @return [Class<LLM::Tool>]
+  # @raise [LLM::NoSuchToolError]
+  def self.find_by_name!(name)
+    find_by_name(name) || raise(LLM::NoSuchToolError, "no such tool #{name.inspect}")
+  end
+
   ##
   # Returns (or sets) the tool description
   # @param [String, nil] desc The tool description
@@ -153,13 +165,6 @@ class LLM::Tool
     end
   end
 
-  ##
-  # @api private
-  def self.lock(&)
-    @__monitor.synchronize(&)
-  end
-  @__monitor = Monitor.new
-
   ##
   # Returns true if the tool is an MCP tool
   # @return [Boolean]

data/lib/llm/version.rb

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

data/lib/llm.rb

@@ -20,6 +20,7 @@ module LLM
   require_relative "llm/mime"
   require_relative "llm/multipart"
   require_relative "llm/file"
+  require_relative "llm/stream"
   require_relative "llm/provider"
   require_relative "llm/context"
   require_relative "llm/agent"
@@ -29,10 +30,11 @@ module LLM
   require_relative "llm/eventhandler"
   require_relative "llm/tool"
   require_relative "llm/server_tool"
+  require_relative "llm/mcp"
 
   ##
   # Thread-safe monitors for different contexts
-  @monitors = {require: Monitor.new, clients: Monitor.new, inherited: Monitor.new, registry: Monitor.new}
+  @monitors = {require: Monitor.new, clients: Monitor.new, inherited: Monitor.new, registry: Monitor.new, mcp: Monitor.new}
 
   ##
   # Model registry
@@ -161,7 +163,6 @@ module LLM
   #  The working directory for the MCP process
   # @return [LLM::MCP]
   def mcp(llm = nil, **)
-    lock(:require) { require_relative "llm/mcp" unless defined?(LLM::MCP) }
     LLM::MCP.new(llm, **)
   end
 

data/llm.gemspec

@@ -63,7 +63,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir[
     "README.md", "LICENSE",
     "lib/*.rb", "lib/**/*.rb",
-    "data/*.json",
+    "data/*.json", "CHANGELOG.md",
     "llm.gemspec"
   ]
   spec.require_paths = ["lib"]
@@ -81,4 +81,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "net-http-persistent", "~> 4.0"
   spec.add_development_dependency "opentelemetry-sdk", "~> 1.10"
   spec.add_development_dependency "logger", "~> 1.7"
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Antar Azri
@@ -235,6 +235,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - data/anthropic.json
@@ -262,6 +263,8 @@ files:
 - lib/llm/function.rb
 - lib/llm/function/array.rb
 - lib/llm/function/fiber_group.rb
+- lib/llm/function/registry.rb
+- lib/llm/function/task.rb
 - lib/llm/function/task_group.rb
 - lib/llm/function/thread_group.rb
 - lib/llm/function/tracing.rb
@@ -317,6 +320,7 @@ files:
 - lib/llm/providers/google/response_adapter/models.rb
 - lib/llm/providers/google/response_adapter/web_search.rb
 - lib/llm/providers/google/stream_parser.rb
+- lib/llm/providers/google/utils.rb
 - lib/llm/providers/llamacpp.rb
 - lib/llm/providers/ollama.rb
 - lib/llm/providers/ollama/error_handler.rb
@@ -376,6 +380,8 @@ files:
 - lib/llm/schema/version.rb
 - lib/llm/server_tool.rb
 - lib/llm/session.rb
+- lib/llm/stream.rb
+- lib/llm/stream/queue.rb
 - lib/llm/tool.rb
 - lib/llm/tool/param.rb
 - lib/llm/tracer.rb