activeagent 0.6.0rc2 → 0.6.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9496edf8536e904969a006a14d65bd69c3257f4db22d80e859a977646a02513
-  data.tar.gz: 0b35eb065fe146ee027d72789826ea3af793e57140d8aefead79d73586548e6e
+  metadata.gz: 805b4d2cce3173788f3bb281e40973d8782891937b5220654b7dad53a9f701ec
+  data.tar.gz: 968f534f94d4e32541f1d87e21854add0f4bf8c9e851ba75f7599291a0b384b9
 SHA512:
-  metadata.gz: 65ce7639ce9106b99e827600b7582776413cdeb69b7de28cf7ed80e0e496ebc1be6ea613ab9f67e944bb7837344458d3709a2065eb2725fc9b7263c08146f08d
-  data.tar.gz: c702c8618b701979dee4871ab200e7fd60d5c09fc2670926a9f77e1c0975ab14e2a5e9b30df2eccce9276440f5e6baf396d16320aabff67a1fbbd332a88b5379
+  metadata.gz: ec13c2dd2d8deb4fd4adb1a6f302de6a7bb5057fad1cd45f27fdecc6b8bea7b5496f3078e7a1f40168de9b4efaa8e4a2abf1cf1bd2865fa929912c58adce561c
+  data.tar.gz: a564772159ac558c8350d770977fc9b7b509c814435a748cac61af89bd87dc196614b45cc9f33db7bce8951568f659730bfe4cf95fd274f145ae00bb78510af6

data/lib/active_agent/action_prompt/base.rb

@@ -2,6 +2,8 @@ require "active_agent/collector"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/hash/except"
 require "active_support/core_ext/module/anonymous"
+require "active_agent/action_prompt/message"
+require "active_agent/action_prompt/action"
 
 # require "active_agent/log_subscriber"
 require "active_agent/rescuable"
@@ -10,6 +12,7 @@ module ActiveAgent
     class Base < AbstractController::Base
       include Callbacks
       include GenerationProvider
+      include Streaming
       include QueuedGeneration
       include Rescuable
       include Parameterized
@@ -217,7 +220,8 @@ module ActiveAgent
       def handle_response(response)
         return response unless response.message.requested_actions.present?
 
-        # Perform the requested actions
+        # The assistant message with tool_calls is already added by update_context in the provider
+        # Now perform the requested actions which will add tool response messages
         perform_actions(requested_actions: response.message.requested_actions)
 
         # Continue generation with updated context
@@ -241,9 +245,9 @@ module ActiveAgent
       end
 
       def perform_action(action)
-        current_context = context.clone
-        # Merge action params with original params to preserve context
-        original_params = current_context.params || {}
+        # Save the current messages to preserve conversation history
+        original_messages = context.messages.dup
+        original_params = context.params || {}
 
         if action.params.is_a?(Hash)
           self.params = original_params.merge(action.params)
@@ -251,14 +255,26 @@ module ActiveAgent
           self.params = original_params
         end
 
+        # Save the current prompt_was_called state and reset it so the action can render
+        original_prompt_was_called = @_prompt_was_called
+        @_prompt_was_called = false
+
+        # Process the action, which will render the view and populate context
         process(action.name)
-        context.message.role = :tool
-        context.message.action_id = action.id
-        context.message.action_name = action.name
-        context.message.generation_id = action.id
-        current_context.message = context.message
-        current_context.messages << context.message
-        self.context = current_context
+
+        # The action should have called prompt which populates context.message
+        # Create a tool message from the rendered response
+        tool_message = context.message.dup
+        tool_message.role = :tool
+        tool_message.action_id = action.id
+        tool_message.action_name = action.name
+        tool_message.generation_id = action.id
+
+        # Restore the messages with the new tool message
+        context.messages = original_messages + [ tool_message ]
+
+        # Restore the prompt_was_called state
+        @_prompt_was_called = original_prompt_was_called
       end
 
       def initialize # :nodoc:
@@ -425,7 +441,10 @@ module ActiveAgent
         # Extract runtime options from prompt_options (exclude instructions as it has special template logic)
         runtime_options = prompt_options.slice(
           :model, :temperature, :max_tokens, :stream, :top_p, :frequency_penalty,
-          :presence_penalty, :response_format, :seed, :stop, :tools_choice, :data_collection, :plugins
+          :presence_penalty, :response_format, :seed, :stop, :tools_choice, :plugins,
+
+          # OpenRouter Provider Settings
+          :data_collection, :require_parameters, :only, :ignore, :quantizations, :sort, :max_price
         )
         # Handle explicit options parameter
         explicit_options = prompt_options[:options] || {}

data/lib/active_agent/action_prompt/prompt.rb

@@ -30,7 +30,12 @@ module ActiveAgent
         @action_name = attributes.fetch(:action_name, nil)
         @mcp_servers = attributes.fetch(:mcp_servers, [])
         set_message if attributes[:message].is_a?(String) || @body.is_a?(String) && @message&.content
-        set_messages if @instructions.present?
+        # Ensure we have a system message with instructions at the start
+        if @messages.empty? || @messages[0].role != :system
+          @messages.unshift(instructions_message)
+        elsif @instructions.present?
+          @messages[0] = instructions_message
+        end
       end
 
       def multimodal?
@@ -39,17 +44,22 @@ module ActiveAgent
 
       def messages=(messages)
         @messages = messages
-        set_messages
+        # Only add system message if we have instructions and don't already have a system message
+        if @instructions.present? && (@messages.empty? || @messages.first&.role != :system)
+          set_messages
+        end
       end
 
       def instructions=(instructions)
-        return if instructions.blank?
+        # Store the instructions even if blank (will use empty string)
+        @instructions = instructions || ""
 
-        @instructions = instructions
+        # Update or add the system message
         if @messages[0].present? && @messages[0].role == :system
           @messages[0] = instructions_message
-        else
-          set_messages
+        elsif @messages.empty? || @messages[0].role != :system
+          # Only add system message if we don't have one at the start
+          @messages.unshift(instructions_message)
         end
       end
 

data/lib/active_agent/callbacks.rb

@@ -7,7 +7,6 @@ module ActiveAgent
     included do
       include ActiveSupport::Callbacks
       define_callbacks :generation, skip_after_callbacks_if_terminated: true
-      define_callbacks :stream, skip_after_callbacks_if_terminated: true
     end
 
     module ClassMethods
@@ -20,20 +19,6 @@ module ActiveAgent
           end
         end
       end
-
-      # Defines a callback for handling streaming responses during generation
-      def on_stream(*names, &blk)
-        _insert_callbacks(names, blk) do |name, options|
-          set_callback(:stream, :before, name, options)
-        end
-      end
-    end
-
-    # Helper method to run stream callbacks
-    def run_stream_callbacks(message, delta = nil, stop = false)
-      run_callbacks(:stream) do
-        yield(message, delta, stop) if block_given?
-      end
     end
   end
 end

data/lib/active_agent/generation_provider/anthropic_provider.rb

@@ -36,9 +36,12 @@ module ActiveAgent
       end
 
       def chat_prompt(parameters: prompt_parameters)
-        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
+        if prompt.options[:stream] || config["stream"]
+          parameters[:stream] = provider_stream
+          @streaming_request_params = parameters
+        end
 
-        chat_response(@client.messages(parameters: parameters))
+        chat_response(@client.messages(parameters: parameters), parameters)
       end
 
       protected
@@ -120,7 +123,7 @@ module ActiveAgent
         end
       end
 
-      def chat_response(response)
+      def chat_response(response, request_params = nil)
         return @response if prompt.options[:stream]
 
         content = response["content"].first["text"]
@@ -137,7 +140,8 @@ module ActiveAgent
         @response = ActiveAgent::GenerationProvider::Response.new(
           prompt: prompt,
           message: message,
-          raw_response: response
+          raw_response: response,
+          raw_request: request_params
         )
       end
 

data/lib/active_agent/generation_provider/message_formatting.rb

@@ -94,12 +94,12 @@ module ActiveAgent
       def format_single_tool_call(action)
         # Default tool call format (OpenAI style)
         {
+          id: action.id,
           type: "function",
           function: {
             name: action.name,
             arguments: action.params.is_a?(String) ? action.params : action.params.to_json
-          },
-          id: action.id
+          }
         }
       end
     end

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -1,5 +1,5 @@
 begin
-  gem "ruby-openai", "~> 8.2.0"
+  gem "ruby-openai", ">= 8.1.0"
   require "openai"
 rescue LoadError
   raise LoadError, "The 'ruby-openai' gem is required for OpenAIProvider. Please add it to your Gemfile and run `bundle install`."
@@ -69,7 +69,12 @@ module ActiveAgent
         elsif chunk.dig("choices", 0, "delta", "tool_calls") && chunk.dig("choices", 0, "delta", "role")
           message = handle_message(chunk.dig("choices", 0, "delta"))
           prompt.messages << message
-          @response = ActiveAgent::GenerationProvider::Response.new(prompt:, message:)
+          @response = ActiveAgent::GenerationProvider::Response.new(
+            prompt:,
+            message:,
+            raw_response: chunk,
+            raw_request: @streaming_request_params
+          )
         end
 
         if chunk.dig("choices", 0, "finish_reason")
@@ -92,7 +97,7 @@ module ActiveAgent
       # The format_tools method comes from ToolManagement module
       # The provider_messages method comes from MessageFormatting module
 
-      def chat_response(response)
+      def chat_response(response, request_params = nil)
         return @response if prompt.options[:stream]
         message_json = response.dig("choices", 0, "message")
         message_json["id"] = response.dig("id") if message_json["id"].blank?
@@ -100,10 +105,15 @@ module ActiveAgent
 
         update_context(prompt: prompt, message: message, response: response)
 
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
+        @response = ActiveAgent::GenerationProvider::Response.new(
+          prompt: prompt,
+          message: message,
+          raw_response: response,
+          raw_request: request_params
+        )
       end
 
-      def responses_response(response)
+      def responses_response(response, request_params = nil)
         message_json = response["output"].find { |output_item| output_item["type"] == "message" }
         message_json["id"] = response.dig("id") if message_json["id"].blank?
 
@@ -116,7 +126,12 @@ module ActiveAgent
           content_type: prompt.output_schema.present? ? "application/json" : "text/plain",
         )
 
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
+        @response = ActiveAgent::GenerationProvider::Response.new(
+          prompt: prompt,
+          message: message,
+          raw_response: response,
+          raw_request: request_params
+        )
       end
 
       def handle_message(message_json)
@@ -133,13 +148,16 @@ module ActiveAgent
       # handle_actions is now provided by ToolManagement module
 
       def chat_prompt(parameters: prompt_parameters)
-        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
-        chat_response(@client.chat(parameters: parameters))
+        if prompt.options[:stream] || config["stream"]
+          parameters[:stream] = provider_stream
+          @streaming_request_params = parameters
+        end
+        chat_response(@client.chat(parameters: parameters), parameters)
       end
 
       def responses_prompt(parameters: responses_parameters)
         # parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
-        responses_response(@client.responses.create(parameters: parameters))
+        responses_response(@client.responses.create(parameters: parameters), parameters)
       end
 
       def responses_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @prompt.options[:temperature] || @config["temperature"] || 0.7, tools: @prompt.actions, structured_output: @prompt.output_schema)
@@ -158,14 +176,20 @@ module ActiveAgent
         }
       end
 
-      def embeddings_response(response)
+      def embeddings_response(response, request_params = nil)
         message = ActiveAgent::ActionPrompt::Message.new(content: response.dig("data", 0, "embedding"), role: "assistant")
 
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
+        @response = ActiveAgent::GenerationProvider::Response.new(
+          prompt: prompt,
+          message: message,
+          raw_response: response,
+          raw_request: request_params
+        )
       end
 
       def embeddings_prompt(parameters:)
-        embeddings_response(@client.embeddings(parameters: embeddings_parameters))
+        params = embeddings_parameters
+        embeddings_response(@client.embeddings(parameters: params), params)
       end
     end
   end

data/lib/active_agent/generation_provider/open_router_provider.rb

@@ -23,12 +23,22 @@ module ActiveAgent
         # Data collection preference (allow, deny, or specific provider list)
         @data_collection = config["data_collection"] || @provider_preferences["data_collection"] || "allow"
 
+        # Require parameters preference (defaults to false)
+        @require_parameters = config["require_parameters"] || @provider_preferences["require_parameters"] || false
+
+        # Additional OpenRouter provider routing options
+        @only_providers = config["only"] || @provider_preferences["only"]
+        @ignore_providers = config["ignore"] || @provider_preferences["ignore"]
+        @quantizations = config["quantizations"] || @provider_preferences["quantizations"]
+        @sort_preference = config["sort"] || @provider_preferences["sort"]
+        @max_price = config["max_price"] || @provider_preferences["max_price"]
+
         # Initialize OpenAI client with OpenRouter base URL
         @client = OpenAI::Client.new(
           uri_base: "https://openrouter.ai/api/v1",
           access_token: @access_token,
           log_errors: Rails.env.development?,
-          default_headers: openrouter_headers
+          extra_headers: openrouter_headers
         )
       end
 
@@ -144,9 +154,15 @@ module ActiveAgent
         parameters[:transforms] = @transforms if @transforms.present?
 
         # Add provider preferences (always include if we have data_collection or other settings)
-        # Check both configured and runtime data_collection values
+        # Check both configured and runtime data_collection/require_parameters values
         runtime_data_collection = prompt&.options&.key?(:data_collection)
-        if @provider_preferences.present? || @data_collection != "allow" || runtime_data_collection
+        runtime_require_parameters = prompt&.options&.key?(:require_parameters)
+        runtime_provider_options = prompt&.options&.keys&.any? { |k| [ :only, :ignore, :quantizations, :sort, :max_price ].include?(k) }
+
+        if @provider_preferences.present? || @data_collection != "allow" || @require_parameters != false ||
+           @only_providers.present? || @ignore_providers.present? || @quantizations.present? ||
+           @sort_preference.present? || @max_price.present? ||
+           runtime_data_collection || runtime_require_parameters || runtime_provider_options
           parameters[:provider] = build_provider_preferences
         end
 
@@ -160,7 +176,12 @@ module ActiveAgent
       def build_provider_preferences
         prefs = {}
         prefs[:order] = @provider_preferences["order"] if @provider_preferences["order"]
-        prefs[:require_parameters] = @provider_preferences["require_parameters"] if @provider_preferences.key?("require_parameters")
+
+        # Require parameters can be overridden at runtime
+        require_parameters = prompt.options[:require_parameters] if prompt&.options&.key?(:require_parameters)
+        require_parameters = @require_parameters if require_parameters.nil?
+        prefs[:require_parameters] = require_parameters if require_parameters != false
+
         prefs[:allow_fallbacks] = @enable_fallbacks
 
         # Data collection can be:
@@ -172,6 +193,27 @@ module ActiveAgent
         data_collection ||= @data_collection
         prefs[:data_collection] = data_collection
 
+        # Additional OpenRouter provider routing options - check runtime overrides first
+        only_providers = prompt.options[:only] if prompt&.options&.key?(:only)
+        only_providers ||= @only_providers
+        prefs[:only] = only_providers if only_providers.present?
+
+        ignore_providers = prompt.options[:ignore] if prompt&.options&.key?(:ignore)
+        ignore_providers ||= @ignore_providers
+        prefs[:ignore] = ignore_providers if ignore_providers.present?
+
+        quantizations = prompt.options[:quantizations] if prompt&.options&.key?(:quantizations)
+        quantizations ||= @quantizations
+        prefs[:quantizations] = quantizations if quantizations.present?
+
+        sort_preference = prompt.options[:sort] if prompt&.options&.key?(:sort)
+        sort_preference ||= @sort_preference
+        prefs[:sort] = sort_preference if sort_preference.present?
+
+        max_price = prompt.options[:max_price] if prompt&.options&.key?(:max_price)
+        max_price ||= @max_price
+        prefs[:max_price] = max_price if max_price.present?
+
         prefs.compact
       end
 
@@ -186,9 +228,15 @@ module ActiveAgent
         params[:transforms] = @transforms if @transforms.present?
 
         # Add provider configuration (always include if we have data_collection or other settings)
-        # Check both configured and runtime data_collection values
+        # Check both configured and runtime data_collection/require_parameters values
         runtime_data_collection = prompt&.options&.key?(:data_collection)
-        if @provider_preferences.present? || @data_collection != "allow" || runtime_data_collection
+        runtime_require_parameters = prompt&.options&.key?(:require_parameters)
+        runtime_provider_options = prompt&.options&.keys&.any? { |k| [ :only, :ignore, :quantizations, :sort, :max_price ].include?(k) }
+
+        if @provider_preferences.present? || @data_collection != "allow" || @require_parameters != false ||
+           @only_providers.present? || @ignore_providers.present? || @quantizations.present? ||
+           @sort_preference.present? || @max_price.present? ||
+           runtime_data_collection || runtime_require_parameters || runtime_provider_options
           params[:provider] = build_provider_preferences
         end
 

data/lib/active_agent/generation_provider/response.rb

@@ -3,13 +3,14 @@
 module ActiveAgent
   module GenerationProvider
     class Response
-      attr_reader :message, :prompt, :raw_response
+      attr_reader :message, :prompt, :raw_response, :raw_request
       attr_accessor :metadata
 
-      def initialize(prompt:, message: nil, raw_response: nil, metadata: nil)
+      def initialize(prompt:, message: nil, raw_response: nil, raw_request: nil, metadata: nil)
         @prompt = prompt
         @message = message || prompt.message
         @raw_response = raw_response
+        @raw_request = sanitize_request(raw_request)
         @metadata = metadata || {}
       end
 
@@ -17,14 +18,9 @@ module ActiveAgent
       def usage
         return nil unless @raw_response
 
-        # OpenAI/OpenRouter format
+        # Most providers store usage in the same format
         if @raw_response.is_a?(Hash) && @raw_response["usage"]
           @raw_response["usage"]
-        # Anthropic format
-        elsif @raw_response.is_a?(Hash) && @raw_response["usage"]
-          @raw_response["usage"]
-        else
-          nil
         end
       end
 
@@ -40,6 +36,40 @@ module ActiveAgent
       def total_tokens
         usage&.dig("total_tokens")
       end
+
+      private
+
+      def sanitize_request(request)
+        return nil if request.nil?
+        return request unless request.is_a?(Hash)
+
+        # Deep clone the request to avoid modifying the original
+        sanitized = request.deep_dup
+
+        # Sanitize any string values in the request
+        sanitize_hash_values(sanitized)
+      end
+
+      def sanitize_hash_values(hash)
+        hash.each do |key, value|
+          case value
+          when String
+            # Use ActiveAgent's sanitize_credentials to replace sensitive data
+            hash[key] = ActiveAgent.sanitize_credentials(value)
+          when Hash
+            sanitize_hash_values(value)
+          when Array
+            value.each_with_index do |item, index|
+              if item.is_a?(String)
+                value[index] = ActiveAgent.sanitize_credentials(item)
+              elsif item.is_a?(Hash)
+                sanitize_hash_values(item)
+              end
+            end
+          end
+        end
+        hash
+      end
     end
   end
 end

data/lib/active_agent/streaming.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ActiveAgent
+  module Streaming
+    extend ActiveSupport::Concern
+
+    class StreamChunk < Data.define(:delta, :stop)
+    end
+
+    attr_accessor :stream_chunk
+
+    included do
+      include ActiveSupport::Callbacks
+      define_callbacks :stream, skip_after_callbacks_if_terminated: true
+    end
+
+    module ClassMethods
+      # Defines a callback for handling streaming responses during generation
+      def on_stream(*names, &blk)
+        _insert_callbacks(names, blk) do |name, options|
+          set_callback(:stream, :before, name, options)
+        end
+      end
+    end
+
+    # Helper method to run stream callbacks
+    def run_stream_callbacks(message, delta = nil, stop = false)
+      @stream_chunk = StreamChunk.new(delta, stop)
+      run_callbacks(:stream) do
+        yield(message, delta, stop) if block_given?
+      end
+    end
+  end
+end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.6.0rc2"
+  VERSION = "0.6.0rc4"
 end

data/lib/active_agent.rb

@@ -23,6 +23,7 @@ module ActiveAgent
 
   autoload :Base
   autoload :Callbacks
+  autoload :Streaming
   autoload :InlinePreviewInterceptor
   autoload :PromptHelper
   autoload :Generation

data/lib/generators/erb/install_generator.rb

@@ -9,7 +9,6 @@ module Erb # :nodoc:
       def create_agent_layouts
         if behavior == :invoke
           formats.each do |format|
-            puts format
             layout_path = File.join("app/views/layouts", filename_with_extensions("agent", format))
             template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.6.0rc2
+  version: 0.6.0rc4
 platform: ruby
 authors:
 - Justin Bowen
@@ -141,16 +141,16 @@ dependencies:
   name: ruby-openai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.0
+        version: 8.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-anthropic
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,7 @@ files:
 - lib/active_agent/rescuable.rb
 - lib/active_agent/sanitizers.rb
 - lib/active_agent/service.rb
+- lib/active_agent/streaming.rb
 - lib/active_agent/test_case.rb
 - lib/active_agent/version.rb
 - lib/activeagent.rb