activeagent 0.6.0rc1 → 0.6.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b5ef5633bece3cdce9d9dba58e499b48c57d80c3a461ceda58adbff738e36a
-  data.tar.gz: 9cc9065b10e9bbf0f8fdeba420fe7b9518b7e97f2d32e3bf11af55babd697009
+  metadata.gz: 805b4d2cce3173788f3bb281e40973d8782891937b5220654b7dad53a9f701ec
+  data.tar.gz: 968f534f94d4e32541f1d87e21854add0f4bf8c9e851ba75f7599291a0b384b9
 SHA512:
-  metadata.gz: 6849b7f94803261d8049ed092aaa8176003b85d5353202aa1a96160860bb07dd98fc9171308c5ed4ea3c9644b6aa68cf09c9c5c827ec7a45300eb14b44e9f1e0
-  data.tar.gz: db67a92dd9f9344fd50234caae1641bb70d57ca61200bbea98a177a175c791de886ee3ac42bc807e0e824d95c94adb6e7765908fec3f50cfc4f73aeb66e21c4f
+  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
@@ -104,7 +107,6 @@ module ActiveAgent
         # Define how the agent should generate content
         def generate_with(provider, **options)
           self.generation_provider = provider
-
           if options.has_key?(:instructions) || (self.options || {}).empty?
             # Either instructions explicitly provided, or no inherited options exist
             self.options = (self.options || {}).merge(options)
@@ -218,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
@@ -242,22 +245,36 @@ 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)
         else
           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:
@@ -373,6 +390,10 @@ module ActiveAgent
         if headers[:message].present? && headers[:message].is_a?(ActiveAgent::ActionPrompt::Message)
           headers[:body] = headers[:message].content
           headers[:role] = headers[:message].role
+        elsif headers[:message].present? && headers[:message].is_a?(Array)
+          # Handle array of multipart content like [{type: "text", text: "..."}, {type: "file", file: {...}}]
+          headers[:body] = headers[:message]
+          headers[:role] = :user
         elsif headers[:message].present? && headers[:message].is_a?(String)
           headers[:body] = headers[:message]
           headers[:role] = :user
@@ -394,7 +415,6 @@ module ActiveAgent
             ActiveAgent::ActionPrompt::Message.new(content: headers[:body], content_type: "input_text")
           ]
         end
-
         headers
       end
 
@@ -421,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
+          :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/message.rb

@@ -27,7 +27,7 @@ module ActiveAgent
         @metadata = attributes[:metadata] || {}
         @charset = attributes[:charset] || "UTF-8"
         @content = attributes[:content] || ""
-        @content_type = attributes[:content_type] || "text/plain"
+        @content_type = detect_content_type(attributes)
         @role = attributes[:role] || :user
         @raw_actions = attributes[:raw_actions]
         @requested_actions = attributes[:requested_actions] || []
@@ -85,6 +85,22 @@ module ActiveAgent
 
       private
 
+      def detect_content_type(attributes)
+        # If content_type is explicitly provided, use it
+        return attributes[:content_type] if attributes[:content_type]
+
+        # If content is an array with multipart/mixed content, set appropriate type
+        if attributes[:content].is_a?(Array)
+          # Check if it contains multimodal content (text, image_url, file, etc.)
+          has_multimodal = attributes[:content].any? do |item|
+            item.is_a?(Hash) && (item[:type] || item["type"])
+          end
+          has_multimodal ? "multipart/mixed" : "array"
+        else
+          "text/plain"
+        end
+      end
+
       def validate_role
         unless VALID_ROLES.include?(role.to_s)
           raise ArgumentError, "Invalid role: #{role}. Valid roles are: #{VALID_ROLES.join(", ")}"

data/lib/active_agent/action_prompt/prompt.rb

@@ -30,26 +30,36 @@ 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?
-        @multimodal ||= @message&.content.is_a?(Array) || @messages.any? { |m| m.content.is_a?(Array) }
+        @multimodal ||= @message&.content.is_a?(Array) || @messages.any? { |m| m&.content.is_a?(Array) }
       end
 
       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/base.rb

@@ -10,6 +10,7 @@ module ActiveAgent
       include ParameterBuilder
 
       class GenerationProviderError < StandardError; end
+
       attr_reader :client, :config, :prompt, :response, :access_token, :model_name
 
       def initialize(config)

data/lib/active_agent/generation_provider/error_handling.rb

@@ -46,7 +46,6 @@ module ActiveAgent
 
       def handle_generation_error(error)
         error_message = format_error_message(error)
-
         # Create new error with original backtrace preserved
         new_error = ActiveAgent::GenerationProvider::Base::GenerationProviderError.new(error_message)
         new_error.set_backtrace(error.backtrace) if error.respond_to?(:backtrace)
@@ -61,7 +60,9 @@ module ActiveAgent
       end
 
       def format_error_message(error)
-        message = if error.respond_to?(:message)
+        message = if error.respond_to?(:response)
+          error.response[:body]
+        elsif error.respond_to?(:message)
           error.message
         elsif error.respond_to?(:to_s)
           error.to_s

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`."
@@ -25,7 +25,13 @@ module ActiveAgent
         @access_token ||= config["api_key"] || config["access_token"] || OpenAI.configuration.access_token || ENV["OPENAI_ACCESS_TOKEN"]
         @organization_id = config["organization_id"] || OpenAI.configuration.organization_id || ENV["OPENAI_ORGANIZATION_ID"]
         @admin_token = config["admin_token"] || OpenAI.configuration.admin_token || ENV["OPENAI_ADMIN_TOKEN"]
-        @client = OpenAI::Client.new(access_token: @access_token, uri_base: @host, organization_id: @organization_id)
+        @client = OpenAI::Client.new(
+          access_token: @access_token,
+          uri_base: @host,
+          organization_id: @organization_id,
+          admin_token: @admin_token,
+          log_errors: Rails.env.development?
+          )
 
         @model_name = config["model"] || "gpt-4o-mini"
       end
@@ -63,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")
@@ -86,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?
@@ -94,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?
 
@@ -110,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)
@@ -127,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)
@@ -152,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

@@ -4,31 +4,6 @@ require_relative "open_ai_provider"
 module ActiveAgent
   module GenerationProvider
     class OpenRouterProvider < OpenAIProvider
-      # Vision-capable models on OpenRouter
-      VISION_MODELS = [
-        "openai/gpt-4-vision-preview",
-        "openai/gpt-4o",
-        "openai/gpt-4o-mini",
-        "anthropic/claude-3-5-sonnet",
-        "anthropic/claude-3-opus",
-        "anthropic/claude-3-sonnet",
-        "anthropic/claude-3-haiku",
-        "google/gemini-pro-1.5",
-        "google/gemini-pro-vision"
-      ].freeze
-
-      # Models that support structured output
-      STRUCTURED_OUTPUT_MODELS = [
-        "openai/gpt-4o",
-        "openai/gpt-4o-2024-08-06",
-        "openai/gpt-4o-mini",
-        "openai/gpt-4o-mini-2024-07-18",
-        "openai/gpt-4-turbo",
-        "openai/gpt-4-turbo-2024-04-09",
-        "openai/gpt-3.5-turbo-0125",
-        "openai/gpt-3.5-turbo-1106"
-      ].freeze
-
       def initialize(config)
         @config = config
         @access_token = config["api_key"] || config["access_token"] ||
@@ -48,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: true,
-          default_headers: openrouter_headers
+          log_errors: Rails.env.development?,
+          extra_headers: openrouter_headers
         )
       end
 
@@ -69,15 +54,6 @@ module ActiveAgent
         handle_openrouter_error(e)
       end
 
-      # Helper methods for checking model capabilities
-      def supports_vision?(model = @model_name)
-        VISION_MODELS.include?(model)
-      end
-
-      def supports_structured_output?(model = @model_name)
-        STRUCTURED_OUTPUT_MODELS.include?(model)
-      end
-
       protected
 
       def build_provider_parameters
@@ -88,6 +64,32 @@ module ActiveAgent
         add_openrouter_params(params)
       end
 
+      def format_content_item(item)
+        # Handle OpenRouter-specific content formats
+        if item.is_a?(Hash)
+          case item[:type] || item["type"]
+          when "file"
+            # Convert file type to image_url for OpenRouter PDF support
+            file_data = item.dig(:file, :file_data) || item.dig("file", "file_data")
+            if file_data
+              {
+                type: "image_url",
+                image_url: {
+                  url: file_data
+                }
+              }
+            else
+              item
+            end
+          else
+            # Use default formatting for other types
+            super
+          end
+        else
+          super
+        end
+      end
+
       private
 
       def default_app_name
@@ -152,19 +154,34 @@ 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
 
+        # Add plugins (e.g., for PDF processing)
+
+        parameters[:plugins] = prompt.options[:plugins] if prompt.options[:plugins].present?
+        parameters[:models] = prompt.options[:fallback_models] if prompt.options[:enable_fallbacks] && prompt.options[:fallback_models].present?
         parameters
       end
 
       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:
@@ -176,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
 
@@ -190,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
 
@@ -208,7 +252,6 @@ module ActiveAgent
         parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
 
         response = @client.chat(parameters: parameters)
-
         # Log if fallback was used
         if response.respond_to?(:headers) && response.headers["x-model"] != @model_name
           Rails.logger.info "[OpenRouter] Fallback model used: #{response.headers['x-model']}" if defined?(Rails)
@@ -229,7 +272,6 @@ module ActiveAgent
         message = handle_message(message_json) if message_json
 
         update_context(prompt: prompt, message: message, response: response) if message
-
         # Create response with OpenRouter metadata
         @response = ActiveAgent::GenerationProvider::Response.new(
           prompt: prompt,
@@ -315,7 +357,7 @@ module ActiveAgent
           handle_timeout_error(error)
         else
           # Fall back to parent error handling
-          super(error) if defined?(super)
+          raise GenerationProviderError, error, error.backtrace
         end
       end
 

data/lib/active_agent/generation_provider/parameter_builder.rb

@@ -46,7 +46,7 @@ module ActiveAgent
         options = {}
 
         # Common options that map directly
-        [ :stream, :top_p, :frequency_penalty, :presence_penalty, :seed, :stop, :user ].each do |key|
+        [ :stream, :top_p, :frequency_penalty, :presence_penalty, :seed, :stop, :user, :plugins ].each do |key|
           options[key] = @prompt.options[key] if @prompt.options.key?(key)
         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/railtie.rb

@@ -68,7 +68,13 @@ module ActiveAgent
 
     initializer "active_agent.compile_config_methods" do
       ActiveSupport.on_load(:active_agent) do
-        config.compile_methods! if config.respond_to?(:compile_methods!)
+        config.compile_methods! if config.class.respond_to?(:compile_methods!)
+      end
+    end
+
+    initializer "active_agent.inflections" do
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.acronym "AI"
       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.0rc1"
+  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.0rc1
+  version: 0.6.0rc4
 platform: ruby
 authors:
 - Justin Bowen
@@ -18,7 +18,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +38,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,35 +108,147 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-openai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.1.0
+- !ruby/object:Gem::Dependency
+  name: ruby-anthropic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails-omakase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The only agent-oriented AI framework designed for Rails, where Agents
   are Controllers. Build AI features with less complexity using the MVC conventions
   you love.
@@ -186,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