activeagent 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e5b0cec7ba170c446d1ed32ad5c9d0705ac8eae4fdc6e4e4a7d17bdae502a2
-  data.tar.gz: 28e12f0ef3727a97fc231e5f7ace15ad4cb020b379fc76c757c2206c89f2b2e6
+  metadata.gz: 881ca4e27488bd719dda01c80e6241bf6d17082876039033c22f9265d1e559aa
+  data.tar.gz: 62526259e8a48d5243a480cf3ac6f795c1672b20e8569f7804fcf13af4d25ec4
 SHA512:
-  metadata.gz: 9cd766d568ab510b043e4902c1c5fa73ce877a268761168509f2772190ab0f2d6f259fe62e4654aa2a002d20228f876fce82c7c2f5f3e1018cd6cb01935aed27
-  data.tar.gz: 197cab65243e11561c7216f08e9b30369819e3ef73627d0f6e72092a7fc74c16a278638f5044e11f292149a1a39dbe11cab9593a41e7289049a3a90c6232a0a0
+  metadata.gz: 0d135cc35623442cdf38df2d588e323fec82f7e16c7d9c8fcf90d2add91bbb55476e07fe548c70ddb2b22cc709e684ab8ccc53dd337c0650800f9d6dd268f547
+  data.tar.gz: 76a0b25ef5cf125e99399ff61cef131d2fe6ae6dade18173601f73f0ec7ecedde6bfc0738af99ac490444b1a067cd136dc2caac34cc1f1cd6c01996cbdddf841

data/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.2] - 2026-09-29
+
+Releases `activeagent` and `actionagent` 1.7.2 from one tag. A patch on 1.7.1:
+the RubyLLM provider runs on ruby_llm 1.16 and 2.x, where 1.7.1 required 1.x.
+Apps on the RubyLLM provider need ruby_llm 1.16 or later; earlier 1.x
+releases lack the APIs the provider calls. No migrations.
+
+### Changed
+
+- **The RubyLLM provider supports ruby_llm 1.16 and 2.x** (`activeagent`).
+  The adapter handles 2.x's tool interface, token limits, embedding model
+  objects, usage and finish reasons while keeping the 1.16 API working.
+  Requiring `>= 1.16, < 3` prevents Bundler from selecting an older 1.x
+  release without the APIs the adapter calls. Rails main can now resolve
+  RubyLLM 2.x alongside Active Storage's Marcel 2 dependency. CI also runs
+  the full suite with RubyLLM 1.16 to retain coverage of that version.
+  Unsupported-version errors name the loaded version and both bounds (#508).
+
 ## [1.7.1] - 2026-09-29
 
 Releases `activeagent` and `actionagent` 1.7.1 from one tag. A patch on 1.7.0:

data/lib/active_agent/providers/_base_provider.rb

@@ -10,8 +10,8 @@ require_relative "concerns/tool_choice_clearing"
 GEM_LOADERS = {
   anthropic: [ "anthropic", "~> 1.12", "anthropic" ],
   openai:    [ "openai",    "~> 0.34", "openai" ],
-  # ruby_llm 2.0 renamed the APIs RubyLLMProvider calls.
-  ruby_llm:  [ "ruby_llm",  "~> 1.0",  "ruby_llm" ]
+  # Keep a tested floor: 1.2 lacks the provider APIs this adapter uses.
+  ruby_llm:  [ "ruby_llm",  [ ">= 1.16", "< 3" ], "ruby_llm" ]
 }
 
 # Requires a provider's gem dependency.
@@ -23,16 +23,17 @@ GEM_LOADERS = {
 #   version is outside the supported range
 def require_gem!(type, file_name)
   gem_name, requirement, package_name = GEM_LOADERS.fetch(type)
+  requirements = Array(requirement)
   provider_name = file_name.split("/").last.delete_suffix(".rb").camelize
 
   begin
-    gem(gem_name, requirement)
+    gem(gem_name, *requirements)
     require(package_name)
   rescue LoadError
     loaded = Gem.loaded_specs[gem_name]
     if loaded && !Gem::Requirement.new(requirement).satisfied_by?(loaded.version)
-      raise LoadError, "#{provider_name} supports the '#{gem_name}' gem #{requirement}, but #{loaded.version} is loaded. " \
-                       "Add `gem \"#{gem_name}\", \"#{requirement}\"` to your Gemfile and run `bundle update #{gem_name}`."
+      raise LoadError, "#{provider_name} supports the '#{gem_name}' gem #{requirements.join(', ')}, but #{loaded.version} is loaded. " \
+                       "Add `gem \"#{gem_name}\", #{requirements.map(&:inspect).join(', ')}` to your Gemfile and run `bundle update #{gem_name}`."
     end
 
     raise LoadError, "The '#{gem_name}' gem is required for #{provider_name}. Please add it to your Gemfile and run `bundle install`."

data/lib/active_agent/providers/ruby_llm/tool_proxy.rb

@@ -27,6 +27,11 @@ module ActiveAgent
           {}
         end
 
+        # RubyLLM 2 names for the same tool interface.
+        alias_method :parameters_schema, :params_schema
+        alias_method :declared_parameters, :parameters
+        alias_method :provider_options, :provider_params
+
         private
 
         def deep_stringify(obj)

data/lib/active_agent/providers/ruby_llm_provider.rb

@@ -62,14 +62,19 @@ module ActiveAgent
         schema = ruby_llm_schema(parameters[:response_format])
         kwargs[:schema] = schema if schema
 
-        # Pass extra params (max_tokens, etc.) via RubyLLM's params: deep-merge
+        # RubyLLM 2 renamed params: and exposes a provider-neutral token limit.
         max_tokens = parameters[:max_tokens] || options.max_tokens
         if max_tokens
-          kwargs[:params] = { max_tokens: max_tokens }
+          if ruby_llm_v2?
+            kwargs[:max_output_tokens] = max_tokens
+          else
+            kwargs[:params] = { max_tokens: max_tokens }
+          end
         end
 
         if parameters[:stream]
           stream_proc = parameters[:stream]
+          @stream_tool_calls = {}
 
           # For streaming, pass a block that forwards chunks
           @ruby_llm_provider.complete(messages, **kwargs) do |chunk|
@@ -95,7 +100,8 @@ module ActiveAgent
         inputs = input.is_a?(Array) ? input : [ input ]
 
         data = inputs.map.with_index do |text, index|
-          embedding = @ruby_llm_provider.embed(text, model: model_id, dimensions: parameters[:dimensions])
+          embedding_model = ruby_llm_v2? ? @ruby_llm_model : model_id
+          embedding = @ruby_llm_provider.embed(text, model: embedding_model, dimensions: parameters[:dimensions])
 
           {
             object: "embedding",
@@ -138,12 +144,15 @@ module ActiveAgent
         # Handle tool calls in chunk
         if chunk.tool_calls&.any?
           message[:tool_calls] ||= []
-          chunk.tool_calls.each do |_id, tool_call|
-            existing = message[:tool_calls].find { |tc| tc[:id] == tool_call.id }
+          chunk.tool_calls.each do |key, tool_call|
+            # RubyLLM 2 keys OpenAI deltas by index; only the first delta
+            # includes the call ID and name. Keep each index tied to its call.
+            existing = message[:tool_calls].find { |tc| tool_call.id && tc[:id] == tool_call.id }
+            existing ||= @stream_tool_calls[key]
             if existing
               existing[:function][:arguments] += tool_call.arguments.to_s if tool_call.arguments
             else
-              message[:tool_calls] << {
+              existing = {
                 id: tool_call.id,
                 type: "function",
                 function: {
@@ -151,7 +160,9 @@ module ActiveAgent
                   arguments: tool_call.arguments.to_s
                 }
               }
+              message[:tool_calls] << existing
             end
+            @stream_tool_calls[key] = existing
           end
         end
 
@@ -254,6 +265,10 @@ module ActiveAgent
 
       private
 
+      def ruby_llm_v2?
+        Gem.loaded_specs.fetch("ruby_llm").version.segments.first >= 2
+      end
+
       # Resolves and caches the RubyLLM provider for the given model.
       #
       # Reuses the cached provider if the model hasn't changed (e.g., during
@@ -447,6 +462,8 @@ module ActiveAgent
         # Add stop_reason if available
         if response.respond_to?(:stop_reason) && response.stop_reason
           hash[:stop_reason] = response.stop_reason
+        elsif response.respond_to?(:finish_reason) && response.finish_reason
+          hash[:stop_reason] = { stop: "end_turn", tool_calls: "tool_use" }.fetch(response.finish_reason, response.finish_reason.to_s)
         elsif response.tool_calls&.any?
           hash[:stop_reason] = "tool_use"
         else
@@ -454,7 +471,10 @@ module ActiveAgent
         end
 
         # Add usage info if available
-        if response.respond_to?(:input_tokens) && response.input_tokens
+        if response.respond_to?(:tokens)
+          tokens = response.tokens
+          hash[:usage] = { input_tokens: tokens.input, output_tokens: tokens.output } if tokens.input
+        elsif response.respond_to?(:input_tokens) && response.input_tokens
           hash[:usage] = {
             input_tokens: response.input_tokens,
             output_tokens: response.output_tokens

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Justin Bowen
@@ -204,16 +204,22 @@ dependencies:
   name: ruby_llm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement