llm.rb 15.0.0 → 15.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f32731cd1933be73ca1297c6733b25ccc3873cb2d617bfbf5ae4d556714aaca
-  data.tar.gz: cbe78b1776b8c4df9f60341b901436fbd69783fca251b3656cf4cd9851815b49
+  metadata.gz: 3ce996689c82e7a0d62a7f09ab2545d10b36462fc75cc2feeb57ce26f6523585
+  data.tar.gz: 74cf140b0fd11b077aea57bde027f0b00cf67f4e099ad35778bc5042b958469b
 SHA512:
-  metadata.gz: 01e6e7d10f5359ae9ba5f7643c4c0679ef22c99deed608e45b44d2afd52f42f2069a317b4c56abd76bc569d40f070d8dc74a5d981c727fc23871a5d4df69aea6
-  data.tar.gz: d2c61e22df6a2f5b4c206f4f13f3b8ec3b0e4014f1d0608ed78adadf598e00b576fd486c01040f655adec0af3efb8c3e1685fcb22ef31038a0917d13481072a2
+  metadata.gz: 4274138e7054d9db54e121dcad674f307b0e1bdbfc568ac16bb3b13181e873a77a57d19f4d2eef2479216555ba0ed9213fa7372cf051d4fa73f6fe73dae594cd
+  data.tar.gz: 12219c398f482c7f949bc9964038a2597e74a592b78023b101e96a337605c2e2fb8963f5526fbd4ca8f1ffd8b14b843e1a10334369d2f62a1e393eb409f4821d

data/CHANGELOG.md

@@ -15,6 +15,35 @@
 
 ## What's next
 
+## v15.0.1
+
+Changes since `v15.0.0`.
+
+This release fixes agent `set` handling of single `Symbol`/`Proc`
+values and resolves ORM options as `Symbol`s through the bound record
+instead of the `LLM::Agent` instance.
+
+### Agent
+
+* **agent: fix `set (skills|tools): Symbol|Proc`** <br>
+  The `skills`, `tools`, `confirm`, and `schema` class accessors now
+  consistently resolve a single `Symbol` or `Proc` lazily at agent
+  initialization, so `LLM::Agent.set(skills: proc { [...] })` and
+  `LLM::Agent.set(tools: :tools)` no longer raise. The `set` family
+  shares one `single_callable?` helper rather than each accessor
+  duplicating its own logic.
+
+### Fix
+
+* **orm: resolve a `Symbol` through the bound record** <br>
+  When an ORM model using `acts_as_agent` (ActiveRecord), `plugin :agent`
+  (Sequel), or `acts_as_llm` / `plugin :llm` configures an option as a
+  `Symbol`, that symbol is now resolved on the model instance (or its
+  bound record) instead of the `LLM::Agent` instance. The contexts and
+  agents built by the wrappers are now bound to the record, so a model like
+  `agent.set :tools` with a `tools` method on the record works as
+  expected.
+
 ## v15.0.0
 
 Changes since `v14.0.0`.

data/lib/llm/active_record/acts_as_agent.rb

@@ -126,7 +126,7 @@ module LLM::ActiveRecord
         @ctx ||= begin
           options = self.class.llm_plugin_options
           params = Utils.resolve_options(self, options[:context], EMPTY_HASH).dup
-          ctx = self.class.agent.new(llm, params.compact)
+          ctx = self.class.agent.new(llm, params.compact.merge(record: self))
           columns = Utils.columns(options)
           data = self[columns[:data_column]]
           if data.nil? || data == ""

data/lib/llm/active_record/acts_as_llm.rb

@@ -243,7 +243,7 @@ module LLM::ActiveRecord
           options = self.class.llm_plugin_options
           columns = Utils.columns(options)
           params = Utils.resolve_options(self, options[:context], EMPTY_HASH).dup
-          ctx = LLM::Context.new(llm, params.compact)
+          ctx = LLM::Context.new(llm, params.compact.merge(record: self))
           data = self[columns[:data_column]]
           if data.nil? || data == ""
             ctx

data/lib/llm/agent.rb

@@ -57,14 +57,16 @@ module LLM
     ##
     # Ugh :)
     # @api private
-    FIELDS = %i[name description
+    FIELDS = %i[record
+                name description
                 path tool_budget
                 retry_budget model
                 skills schema
                 tracer stream
                 tools concurrency
                 instructions confirm]
-    IVARS  =  %i[name description
+    IVARS  =  %i[record
+                 name description
                  path tool_budget
                  tracer concurrency
                  instructions confirm]
@@ -169,10 +171,21 @@ module LLM
     # @return [String, nil]
     #  Returns the current model when no argument is provided
     def self.model(model = nil, &block)
-      return @model if model.nil? && !block
+      return @model if model.nil? and !block
       @model = block || model
     end
 
+    ##
+    # Set or get the default schema
+    # @param [#to_json, nil] schema
+    #  The schema
+    # @return [#to_json, nil]
+    #  Returns the current schema when no argument is provided
+    def self.schema(schema = nil, &block)
+      return @schema if schema.nil? and !block
+      @schema = block || schema
+    end
+
     ##
     # Set or get the default tools
     # @param [Array<LLM::Function>, nil] tools
@@ -180,11 +193,13 @@ module LLM
     # @return [Array<LLM::Function>]
     #  Returns the current tools when no argument is provided
     def self.tools(*tools, &block)
-      return @tools || [] if tools.empty? && !block
-      if tools.size == 1 and tools.grep(Symbol).any?
+      return @tools || [] if tools.empty? and !block
+      if block
+        @tools = block
+      elsif single_callable?(tools)
         @tools = tools.first
       else
-        @tools = block || tools.flatten
+        @tools = tools.flatten
       end
     end
 
@@ -195,23 +210,46 @@ module LLM
     # @return [Array<String>, nil]
     #  Returns the current skills when no argument is provided
     def self.skills(*skills, &block)
-      return @skills if skills.empty? && !block
-      if skills.size == 1 and skills.grep(Symbol).any?
+      return @skills if skills.empty? and !block
+      if block
+        @skills = block
+      elsif single_callable?(skills)
         @skills = skills.first
       else
-        @skills = block || skills.flatten
+        @skills = skills.flatten
       end
     end
 
     ##
-    # Set or get the default schema
-    # @param [#to_json, nil] schema
-    #  The schema
-    # @return [#to_json, nil]
-    #  Returns the current schema when no argument is provided
-    def self.schema(schema = nil, &block)
-      return @schema if schema.nil? && !block
-      @schema = block || schema
+    # Set or get the tool names that require confirmation before they can run.
+    #
+    # When a single Symbol is given, it is stored as-is and resolved at
+    # initialization time by calling the method with that name on the agent
+    # instance. This allows dynamic tool confirmation lists.
+    #
+    # @example
+    #   class MyAgent < LLM::Agent
+    #     confirm :tools_that_need_confirmation
+    #
+    #     def tools_that_need_confirmation
+    #       some_condition ? %w[delete destroy] : %w[delete]
+    #     end
+    #   end
+    #
+    # @param [String, Symbol, Array<String, Symbol>, Proc] tool_names
+    #  One or more tool names.
+    # @param [Proc] block
+    #  An optional, lazy-evaluated Proc
+    # @return [Array<String>, Proc, Symbol, nil]
+    def self.confirm(*tool_names, &block)
+      return @confirm if tool_names.empty? and !block
+      if block
+        @confirm = block
+      elsif single_callable?(tool_names)
+        @confirm = tool_names.first
+      else
+        @confirm = tool_names.flatten.map(&:to_s)
+      end
     end
 
     ##
@@ -285,36 +323,6 @@ module LLM
       @stream = block || stream
     end
 
-    ##
-    # Set or get the tool names that require confirmation before they can run.
-    #
-    # When a single Symbol is given, it is stored as-is and resolved at
-    # initialization time by calling the method with that name on the agent
-    # instance. This allows dynamic tool confirmation lists.
-    #
-    # @example
-    #   class MyAgent < LLM::Agent
-    #     confirm :tools_that_need_confirmation
-    #
-    #     def tools_that_need_confirmation
-    #       some_condition ? %w[delete destroy] : %w[delete]
-    #     end
-    #   end
-    #
-    # @param [String, Symbol, Array<String, Symbol>, Proc] tool_names
-    #  One or more tool names.
-    # @param [Proc] block
-    #  An optional, lazy-evaluated Proc
-    # @return [Array<String>, Proc, Symbol, nil]
-    def self.confirm(*tool_names, &block)
-      return @confirm if tool_names.empty? && !block
-      if tool_names.size == 1 && tool_names.grep(Symbol).any?
-        @confirm = tool_names.first
-      else
-        @confirm = block || tool_names.flatten.map(&:to_s)
-      end
-    end
-
     ##
     # Set the file path where an agent's memory
     # can be restored from, and written to.
@@ -370,6 +378,13 @@ module LLM
       end
     end
 
+    ##
+    # @api private
+    def self.single_callable?(callable)
+      callable.size == 1 and (Proc === callable[0] or Symbol === callable[0])
+    end
+    private_class_method :single_callable?
+
     ##
     # @param [LLM::Provider] llm
     #  A provider
@@ -389,7 +404,7 @@ module LLM
       @llm = llm
       fields, fields_ivar = FIELDS, IVARS
       fields.each do |field|
-        resolvable = params.key?(field) ? params.delete(field) : self.class.public_send(field)
+        resolvable = params.key?(field) ? params.delete(field) : (self.class.respond_to?(field) ? self.class.public_send(field) : nil)
         resolve_symbol = !%i[concurrency].include?(field)
         resolved = resolvable != nil ? resolve_option(self, resolvable, resolve_symbol:) : resolvable
         resolved = [*resolved].map(&:to_s) if field == :confirm && resolved
@@ -420,6 +435,13 @@ module LLM
       @path
     end
 
+    ##
+    # Returns the ORM record this agent is bound to, or nil.
+    # @return [Object, nil]
+    def record
+      @record
+    end
+
     ##
     # Returns the agent's description
     # @return [String, nil]

data/lib/llm/context.rb

@@ -46,7 +46,7 @@ module LLM
     # @api private
     # @return [Array<Symbol>]
     def self.params
-      %w[guard retry_budget concurrency transformer compactor]
+      %w[guard retry_budget concurrency transformer compactor record]
     end
 
     ##
@@ -64,6 +64,11 @@ module LLM
     # @return [Symbol]
     attr_reader :mode
 
+    ##
+    # Returns the ORM record this context is bound to, or nil.
+    # @return [Object, nil]
+    attr_reader :record
+
     ##
     # @param [LLM::Provider] llm
     #  A provider
@@ -95,6 +100,7 @@ module LLM
     def initialize(llm, params = {})
       params = {}.merge!(params)
       @llm = llm
+      @record = params.delete(:record)
       @mode = params.delete(:mode) || (llm.name == :openai ? :responses : :completions)
       tools = [*params.delete(:tools), *load_skills(params.delete(:skills))]
       @params = {model: llm.default_model, schema: nil}.compact.merge!(params)

data/lib/llm/sequel/agent.rb

@@ -88,7 +88,7 @@ module LLM::Sequel
           options = self.class.llm_plugin_options
           columns = Agent::Utils.columns(options)
           params = Agent::Utils.resolve_options(self, options[:context], Agent::EMPTY_HASH).dup
-          ctx = self.class.agent.new(llm, params.compact)
+          ctx = self.class.agent.new(llm, params.compact.merge(record: self))
           data = self[columns[:data_column]]
           if data.nil? || data == ""
             ctx

data/lib/llm/sequel/plugin.rb

@@ -343,7 +343,7 @@ module LLM::Sequel
         options = self.class.llm_plugin_options
         columns = Utils.columns(options)
         params = Utils.resolve_options(self, options[:context], Plugin::EMPTY_HASH).dup
-        ctx = LLM::Context.new(llm, params.compact)
+        ctx = LLM::Context.new(llm, params.compact.merge(record: self))
         data = self[columns[:data_column]]
         if data.nil? || data == ""
           ctx

data/lib/llm/utils.rb

@@ -20,12 +20,34 @@ module LLM
     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 Symbol
+        if resolve_symbol
+          if obj.respond_to?(option, true) and record?(obj)
+            obj.send(option)
+          elsif obj.respond_to?(:record) and obj.record.respond_to?(option, true)
+            obj.record.send(option)
+          elsif obj.respond_to?(option, true)
+            obj.send(option)
+          else
+            raise ArgumentError, "unable to resolve #{option}"
+          end
+        else
+          option
+        end
       when Hash then option.dup
       else option
       end
     end
 
+    ##
+    # Returns true when `obj` is an ActiveRecord or Sequel model.
+    # @param [Object] obj
+    # @api private
+    def record?(obj)
+      (defined?(::ActiveRecord::Base) and ::ActiveRecord::Base === obj) or
+      (defined?(::Sequel::Model) and ::Sequel::Model === obj)
+    end
+
     ##
     # Normalizes an HTTP API base path.
     #

data/lib/llm/version.rb

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

data/llm.gemspec

@@ -21,7 +21,7 @@ DESCRIPTION
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.3.0"
 
-  spec.homepage = "https://r.uby.dev/llm/"
+  spec.homepage = "https://r.uby.dev"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/r-uby-dev/llm"
   spec.metadata["documentation_uri"] = spec.homepage
@@ -38,9 +38,15 @@ DESCRIPTION
   spec.executables = ["llm.rb"]
   spec.require_paths = ["lib"]
   spec.post_install_message = "\n" \
-                              "Learn more about llm.rb on GitHub:" \
+                              "Got a question about llm.rb? " \
                               "\n" \
-                              "https://github.com/r-uby-dev/llm#readme" \
+                              "Ask our chatbot." \
+                              "\n" \
+                              "It is connected to the official GitHub repository." \
+                              "\n" \
+                              "100% free to use." \
+                              "\n" \
+                              "https://r.uby.dev" \
                               "\n\n"
 
   spec.add_development_dependency "webmock", "~> 3.24.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.0.1
 platform: ruby
 authors:
 - Robert Gleeson
@@ -644,19 +644,16 @@ files:
 - lib/sequel/plugins/agent.rb
 - lib/sequel/plugins/llm.rb
 - llm.gemspec
-homepage: https://r.uby.dev/llm/
+homepage: https://r.uby.dev
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://r.uby.dev/llm/
+  homepage_uri: https://r.uby.dev
   source_code_uri: https://github.com/r-uby-dev/llm
-  documentation_uri: https://r.uby.dev/llm/
+  documentation_uri: https://r.uby.dev
   changelog_uri: https://github.com/r-uby-dev/llm/blob/main/CHANGELOG.md
-post_install_message: |2+
-
-  Learn more about llm.rb on GitHub:
-  https://github.com/r-uby-dev/llm#readme
-
+post_install_message: "\nGot a question about llm.rb? \nAsk our chatbot.\nIt is connected
+  to the official GitHub repository.\n100% free to use.\nhttps://r.uby.dev\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -675,4 +672,3 @@ rubygems_version: 4.0.16
 specification_version: 4
 summary: Ruby's capable AI runtime
 test_files: []
-...