activeagent 0.3 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6889f20afa4e61e46ab6edbe801186aee0d3fe85284f3ce6379509a6a76bc4
-  data.tar.gz: 3340dcc2d65740cea5a98f4c0640ac806e1686bb48bee2a3260cf3e65b5478b2
+  metadata.gz: b5296fe177a73f49b3514b6d82ad8dc45efdf5455b50aed3fb411103551fb308
+  data.tar.gz: 889c307af88851d5bb8022f4701af49a96a9701f862cecf1b01bfd625f2568d2
 SHA512:
-  metadata.gz: 8c63eaaad2c5049fac65902d5d5676f976580fffd40477287b149d29695c15b75143e1bbf8e60128c04adfc23531770c9ab1c7893a6cf73bd4f258315a93e251
-  data.tar.gz: 0be4d79a4755d23d1c7e2c659871d8e0480c05583e6fe1d6eae48571fd1d2540cc88ea53a827192109bf76476e237e8c09f1bbc64f97bca429416b3c7503154c
+  metadata.gz: '0806180976fb672856ce7396c813659d7ee1edf9e3393e9dbba970b724daa343c0da0397b3edfed9aae6d60b08ee1ac2dd744933b4e177d0c829a3c26e6c63ce'
+  data.tar.gz: d59653e4a7e97488b864bcdc0b93558b07920f6ea069ef16070dba7dfe0c36e5876de928008f7b02d848bbb5d2f86d7bf025c52d33be8090f08f1da5fc8c6e9e

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.3.2] - 2025-04-15
+
+### Added
+- CI configuration for stable GitHub releases moving forward.
+- Test coverage for core features: ActionPrompt rendering, tool calls, and embeddings.
+- Enhance streaming to support tool calls during stream. Previously, streaming mode blocked tool call execution.
+- Fix layout rendering bug when no block is passed and views now render correctly without requiring a block.
+
+### Removed 
+- Generation Provider module and Action Prompt READMEs have been removed, but will be updated along with the main README in the next release.

data/lib/active_agent/action_prompt/README.md

@@ -1,111 +0,0 @@
-# Active Agent: Action Prompt
-
-Action Prompt provides a structured way to create and manage prompts for AI interactions. It enables composing messages, handling actions/tools, and managing conversation context through several key components.
-
-Action Prompt manages the overall prompt structure including:
-
-- Messages list with system/user/assistant roles
-- Action/tool definitions
-- Headers and context tracking
-- Content type and encoding 
-- Multipart message handling
-
-```ruby
-prompt = ActionPrompt::Prompt.new(
-  instructions: "System guidance",
-  message: "User input",
-  actions: [tool_definition, action_schema],
-  context: messages
-)
-```
-
-## ActionPrompt::Message 
-
-Represents individual messages with:
-
-### Content and Role
-```ruby
-message = ActionPrompt::Message.new(
-  content: "Search for a hotel",
-  role: :user
-)
-```
-
-- Content stores the actual message text
-- Role defines the message sender type (system/user/assistant/function/tool)
-- Messages form interactions between roles in a Context
-
-### Action Requests and Responses
-```ruby
-message = ActionPrompt::Message.new(
-  content: "Search for a hotel",
-  role: :tool,
-  requested_actions: [{name: "search", params: {query: "hotel"}}]
-)
-```
-
-- Tracks if message requests actions/tools
-- Maintains list of requested_actions
-- Action responses include function call results
-- Handles tool execution state
-
-### Content Type and Encoding
-- Default content_type is "text/plain"
-- Supports multiple content types for rich messages
-- Default charset is UTF-8
-- Handles content encoding/decoding
-
-### Role Validation
-- Enforces valid roles via VALID_ROLES constant
-- Validates on message creation
-- Raises ArgumentError for invalid roles
-- Supported roles: system, assistant, user, tool, function
-
-```ruby
-message = ActionPrompt::Message.new(
-  content: "Hello",
-  role: :user,
-  content_type: "text/plain",
-  charset: "UTF-8"
-)
-```
-
-### ActionPrompt::Action
-
-Defines callable tools/functions:
-
-- Name and parameters schema
-- Validation and type checking
-- Response handling
-- Action execution
-
-## Usage with Base Agents
-
-```ruby
-class MyAgent < ActiveAgent::Base
-  # Define available actions
-  def action_schemas
-    [
-      {name: "search", params: {query: :string}}
-    ]
-  end
-
-  # Handle action responses
-  def perform_action(action) 
-    case action.name
-    when "search"
-      search_service.query(action.params[:query])
-    end
-  end
-end
-```
-
-The Base agent integrates with ActionPrompt to:
-
-1. Create prompts with context
-2. Register available actions
-3. Process action requests
-4. Handle responses and update context
-5. Manage the conversation flow
-
-See Base.rb for full agent integration details.

data/lib/active_agent/action_prompt/message.rb

@@ -16,6 +16,10 @@ module ActiveAgent
         validate_role
       end
 
+      def to_s
+        @content.to_s
+      end
+
       def to_h
         hash = {
           role: role,

data/lib/active_agent/action_prompt/prompt.rb

@@ -3,7 +3,8 @@ require_relative "message"
 module ActiveAgent
   module ActionPrompt
     class Prompt
-      attr_accessor :actions, :body, :content_type, :context_id, :instructions, :message, :messages, :options, :mime_version, :charset, :context, :parts
+      attr_reader :messages
+      attr_accessor :actions, :body, :content_type, :context_id, :instructions, :message, :options, :mime_version, :charset, :context, :parts, :params, :action_choice, :agent_class
 
       def initialize(attributes = {})
         @options = attributes.fetch(:options, {})
@@ -27,6 +28,11 @@ module ActiveAgent
         set_messages
       end
 
+      def messages=(messages)
+        @messages = messages
+        set_messages
+      end
+
       # Generate the prompt as a string (for debugging or sending to the provider)
       def to_s
         @message.to_s
@@ -62,7 +68,7 @@ module ActiveAgent
       private
 
       def set_messages
-        @messages = [Message.new(content: @instructions, role: :system)] + @messages
+        @messages = [ Message.new(content: @instructions, role: :system) ] + @messages if @instructions.present?
       end
 
       def set_message
@@ -71,6 +77,7 @@ module ActiveAgent
         elsif @body.is_a?(String) && @message.content.blank?
           @message = Message.new(content: @body, role: :user)
         end
+
         @messages << @message
       end
     end

data/lib/active_agent/action_prompt.rb

@@ -34,90 +34,6 @@ module ActiveAgent
       # }.freeze
     end
 
-    # # def self.prompt(headers = {}, &)
-    # #   new.prompt(headers, &)
-    # # end
-
-    # def prompt(headers = {}, &block)
-    #   return @_message if @_prompt_was_called && headers.blank? && !block
-
-    #   headers = apply_defaults(headers)
-
-    #   @_message = ActiveAgent::ActionPrompt::Prompt.new
-
-    #   assign_headers_to_message(@_message, headers)
-
-    #   responses = collect_responses(headers, &block)
-
-    #   @_prompt_was_called = true
-
-    #   create_parts_from_responses(@_message, responses)
-
-    #   @_message
-    # end
-
-    private
-
-    def apply_defaults(headers)
-      headers.reverse_merge(self.class.default_params)
-    end
-
-    def assign_headers_to_message(message, headers)
-      assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
-      assignable.each { |k, v| message.send(:"#{k}=", v) }
-    end
-
-    def collect_responses(headers, &block)
-      if block
-        collect_responses_from_block(headers, &block)
-      elsif headers[:body]
-        collect_responses_from_text(headers)
-      else
-        collect_responses_from_templates(headers)
-      end
-    end
-
-    def collect_responses_from_block(headers, &block)
-      templates_name = headers[:template_name] || action_name
-      collector = ActiveAgent::ActionPrompt::Collector.new(lookup_context) { render(templates_name) }
-      yield(collector)
-      collector.responses
-    end
-
-    def collect_responses_from_text(headers)
-      [{
-        body: headers.delete(:body),
-        content_type: headers[:content_type] || "text/plain"
-      }]
-    end
-
-    def collect_responses_from_templates(headers)
-      templates_path = headers[:template_path] || self.class.name.sub(/Agent$/, "").underscore
-      templates_name = headers[:template_name] || action_name
-      each_template(Array(templates_path), templates_name).map do |template|
-        format = template.format || formats.first
-        {
-          body: render(template: template, formats: [format]),
-          content_type: Mime[format].to_s
-        }
-      end
-    end
-
-    def each_template(paths, name, &)
-      templates = lookup_context.find_all(name, paths)
-      if templates.empty?
-        raise ActionView::MissingTemplate.new(paths, name, paths, false, "prompt")
-      else
-        templates.uniq(&:format).each(&)
-      end
-    end
-
-    def create_parts_from_responses(message, responses)
-      responses.each do |response|
-        message.add_part(response[:body], content_type: response[:content_type])
-      end
-    end
-
     class TestAgent
       class << self
         attr_accessor :generations

data/lib/active_agent/base.rb

@@ -2,7 +2,7 @@
 
 require "active_agent/prompt_helper"
 require "active_agent/action_prompt/prompt"
-require "active_agent/action_prompt/collector"
+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"
@@ -53,7 +53,7 @@ module ActiveAgent
 
     include ActionView::Layouts
 
-    PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout]
+    PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [ :@_action_has_layout ]
 
     helper ActiveAgent::PromptHelper
 
@@ -63,7 +63,7 @@ module ActiveAgent
       mime_version: "1.0",
       charset: "UTF-8",
       content_type: "text/plain",
-      parts_order: ["text/plain", "text/enriched", "text/html"]
+      parts_order: [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
     class << self
@@ -212,6 +212,20 @@ module ActiveAgent
       handle_response(generation_provider.response)
     end
 
+    # Add embedding capability to Message class
+    ActiveAgent::ActionPrompt::Message.class_eval do
+      def embed
+        agent_class = ActiveAgent::Base.descendants.first
+        agent = agent_class.new
+        agent.prompt_context = ActiveAgent::ActionPrompt::Prompt.new(message: self)
+        agent.embed
+        self
+      end
+    end
+
+    # Make prompt_context accessible for chaining
+    # attr_accessor :prompt_context
+
     def perform_generation
       prompt_context.options.merge(options)
       generation_provider.generate(prompt_context) if prompt_context && generation_provider
@@ -219,15 +233,14 @@ module ActiveAgent
     end
 
     def handle_response(response)
-      perform_actions(requested_actions: response.message.requested_actions) if response.message.requested_actions.present?
-
+      return response unless response.message.requested_actions.present?
+      perform_actions(requested_actions: response.message.requested_actions)
       update_prompt_context(response)
     end
 
     def update_prompt_context(response)
-      # response.prompt = prompt_context
-      # response.message = response.messages.last
-      response
+      prompt_context.message = prompt_context.messages.last
+      ActiveAgent::GenerationProvider::Response.new(prompt: prompt_context)
     end
 
     def perform_actions(requested_actions:)
@@ -237,9 +250,12 @@ module ActiveAgent
     end
 
     def perform_action(action)
+      current_context = prompt_context.clone
       process(action.name, *action.params)
       prompt_context.messages.last.role = :tool
       prompt_context.messages.last.action_id = action.id
+      current_context.messages << prompt_context.messages.last
+      self.prompt_context = current_context
     end
 
     def initialize
@@ -299,15 +315,11 @@ module ActiveAgent
 
     def prompt(headers = {}, &block)
       return prompt_context if @_prompt_was_called && headers.blank? && !block
-
       content_type = headers[:content_type]
-
       headers = apply_defaults(headers)
-
+      prompt_context.messages = headers[:messages] || []
       prompt_context.context_id = headers[:context_id]
 
-      prompt_context.options = options.merge(headers[:options] || {})
-
       prompt_context.charset = charset = headers[:charset]
 
       responses = collect_responses(headers, &block)
@@ -319,13 +331,14 @@ module ActiveAgent
       prompt_context.content_type = set_content_type(prompt_context, content_type, headers[:content_type])
       prompt_context.charset = charset
       prompt_context.actions = headers[:actions] || action_schemas
+
       prompt_context
     end
 
     def action_schemas
       action_methods.map do |action|
         if action != "text_prompt"
-          JSON.parse render_to_string(locals: {action_name: action}, action: action, formats: :json)
+          JSON.parse render_to_string(locals: { action_name: action }, action: action, formats: :json)
         end
       end.compact
     end
@@ -346,7 +359,7 @@ module ActiveAgent
     # If the subject has interpolations, you can pass them through the +interpolations+ parameter.
     def default_i18n_subject(interpolations = {}) # :doc:
       agent_scope = self.class.agent_name.tr("/", ".")
-      I18n.t(:subject, **interpolations.merge(scope: [agent_scope, action_name], default: action_name.humanize))
+      I18n.t(:subject, **interpolations.merge(scope: [ agent_scope, action_name ], default: action_name.humanize))
     end
 
     def apply_defaults(headers)
@@ -385,16 +398,16 @@ module ActiveAgent
 
     def collect_responses_from_block(headers)
       templates_name = headers[:template_name] || action_name
-      collector = ActiveAgent::ActionPrompt::Collector.new(lookup_context) { render(templates_name) }
+      collector = Collector.new(lookup_context) { render(templates_name) }
       yield(collector)
       collector.responses
     end
 
     def collect_responses_from_text(headers)
-      [{
+      [ {
         body: headers.delete(:body),
         content_type: headers[:content_type] || "text/plain"
-      }]
+      } ]
     end
 
     def collect_responses_from_templates(headers)
@@ -406,7 +419,7 @@ module ActiveAgent
 
         format = template.format || formats.first
         {
-          body: render(template: template, formats: [format]),
+          body: render(template: template, formats: [ format ]),
           content_type: Mime[format].to_s
         }
       end.compact

data/lib/active_agent/collector.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "abstract_controller/collector"
+require "active_support/core_ext/hash/reverse_merge"
+require "active_support/core_ext/array/extract_options"
+
+module ActiveAgent
+  class Collector
+    include AbstractController::Collector
+    attr_reader :responses
+
+    def initialize(context, &block)
+      @context = context
+      @responses = []
+      @default_render = block
+    end
+
+    def any(*args, &block)
+      options = args.extract_options!
+      raise ArgumentError, "You have to supply at least one format" if args.empty?
+      args.each { |type| send(type, options.dup, &block) }
+    end
+    alias_method :all, :any
+
+    def custom(mime, options = {})
+      options.reverse_merge!(content_type: mime.to_s)
+      @context.formats = [ mime.to_sym ]
+      options[:body] = block_given? ? yield : @default_render.call
+      @responses << options
+    end
+  end
+end

data/lib/active_agent/generation_provider/README.md

@@ -1,72 +0,0 @@
-# Active Agent: Generation Provider
-
-This README provides information about the generation provider interfaces and implementations in the ActiveAgent library.
-
-## Main Components
-
-- Base class - Abstract class for implementing generation providers
-- OpenAI Provider - Reference implementation using OpenAI's API
-- Response class - Standardized response wrapper
-- Module - For including generation provider functionality in agents
-
-## Core Concepts
-
-### Base Provider Class
-
-The `ActiveAgent::GenerationProvider::Base` class defines the core interface that all providers must implement:
-
-```ruby
-def generate(prompt)
-  raise NotImplementedError
-end
-```
-
-### OpenAI Provider Implementation
-
-The OpenAI provider shows how to implement a concrete generation provider:
-
-- Handles authentication and client setup
-- Implements prompt/completion generation
-- Supports streaming responses
-- Handles embeddings generation
-- Manages context updates
-- Processes tool/action calls
-
-### Provider Features
-
-- Configuration - Providers accept config options for API keys, models, etc
-- Streaming - Optional streaming support for realtime responses
-- Action handling - Support for function/tool calling
-- Error handling - Standardized error handling via GenerationProviderError
-- Context management - Tracks conversation context and message history
-
-### Response Handling
-
-The Response class wraps provider responses with a consistent interface:
-
-```ruby
-Response.new(
-  prompt: prompt,    # Original prompt
-  message: message,  # Generated response
-  raw_response: raw  # Provider-specific response
-)
-```
-
-## Usage Example
-
-```ruby
-# Configure provider
-provider = ActiveAgent::GenerationProvider::OpenAIProvider.new(
-  "api_key" => ENV["OPENAI_API_KEY"],
-  "model" => "gpt-4"
-)
-
-# Generate completion
-response = provider.generate(prompt)
-
-# Access response
-response.message.content    # Generated text
-response.raw_response      # Raw provider response
-```
-
-See the OpenAI provider implementation for a complete reference example.

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -23,12 +23,6 @@ module ActiveAgent
         raise GenerationProviderError, e.message
       end
 
-      def chat_prompt(parameters: prompt_parameters)
-        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
-
-        chat_response(@client.chat(parameters: parameters))
-      end
-
       def embed(prompt)
         @prompt = prompt
 
@@ -37,39 +31,25 @@ module ActiveAgent
         raise GenerationProviderError, e.message
       end
 
-      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
-        {
-          model: model,
-          input: input
-        }
-      end
-
-      def embeddings_response(response)
-        message = Message.new(content: response.dig("data", 0, "embedding"), role: "assistant")
-
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
-      end
-
-      def embeddings_prompt(parameters:)
-        embeddings_response(@client.embeddings(parameters: embeddings_parameters))
-      end
-
       private
 
       def provider_stream
-        # prompt.options[:stream] will define a proc found in prompt at runtime
-        # config[:stream] will define a proc found in config. stream would come from an Agent class's generate_with or stream_with method calls
         agent_stream = prompt.options[:stream]
         message = ActiveAgent::ActionPrompt::Message.new(content: "", role: :assistant)
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message:)
 
+        @response = ActiveAgent::GenerationProvider::Response.new(prompt:, message:)
         proc do |chunk, bytesize|
-          if (new_content = chunk.dig("choices", 0, "delta", "content"))
+          new_content = chunk.dig("choices", 0, "delta", "content")
+          if new_content && !new_content.blank
             message.content += new_content
 
             agent_stream.call(message, new_content, false) do |message, new_content|
               yield message, new_content if block_given?
             end
+          elsif chunk.dig("choices", 0, "delta", "tool_calls") && !chunk.dig("choices", 0, "delta", "tool_calls").empty?
+            message = handle_message(chunk.dig("choices", 0, "delta"))
+            prompt.messages << message
+            @response = ActiveAgent::GenerationProvider::Response.new(prompt:, message:)
           end
 
           agent_stream.call(message, nil, true) do |message|
@@ -98,42 +78,68 @@ module ActiveAgent
           }.compact
 
           if message.content_type == "image_url"
-            provider_message[:image_url] = {url: message.content}
+            provider_message[:image_url] = { url: message.content }
           end
           provider_message
         end
       end
 
       def chat_response(response)
-        binding.irb
         return @response if prompt.options[:stream]
 
         message_json = response.dig("choices", 0, "message")
 
-        message = ActiveAgent::ActionPrompt::Message.new(
+        message = handle_message(message_json)
+
+        update_context(prompt: prompt, message: message, response: response)
+
+        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
+      end
+
+      def handle_message(message_json)
+        ActiveAgent::ActionPrompt::Message.new(
           content: message_json["content"],
-          role: message_json["role"],
+          role: message_json["role"].intern,
           action_requested: message_json["finish_reason"] == "tool_calls",
           requested_actions: handle_actions(message_json["tool_calls"])
         )
-        update_context(prompt: prompt, message: message, response: response)
+      end
+
+      def handle_actions(tool_calls)
+        return [] if tool_calls.nil? || tool_calls.empty?
+
+        tool_calls.map do |tool_call|
+          next if tool_call["function"].nil? || tool_call["function"]["name"].blank?
+          args = tool_call["function"]["arguments"].blank? ? nil : JSON.parse(tool_call["function"]["arguments"], { symbolize_names: true })
+
+          ActiveAgent::ActionPrompt::Action.new(
+            id: tool_call["id"],
+            name: tool_call.dig("function", "name"),
+            params: args
+          )
+        end.compact
+      end
+
+      def chat_prompt(parameters: prompt_parameters)
+        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
+        chat_response(@client.chat(parameters: parameters))
+      end
+
+      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
+        {
+          model: model,
+          input: input
+        }
+      end
+
+      def embeddings_response(response)
+        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)
       end
 
-      def handle_actions(tool_calls)
-        if tool_calls
-          tool_calls.map do |tool_call|
-            ActiveAgent::ActionPrompt::Action.new(
-              id: tool_call["id"],
-              name: tool_call.dig("function", "name"),
-              params: JSON.parse(
-                tool_call.dig("function", "arguments"),
-                {symbolize_names: true}
-              )
-            )
-          end
-        end
+      def embeddings_prompt(parameters:)
+        embeddings_response(@client.embeddings(parameters: embeddings_parameters))
       end
     end
   end

data/lib/active_agent/generation_provider/response.rb

@@ -5,9 +5,9 @@ module ActiveAgent
     class Response
       attr_reader :message, :prompt, :raw_response
 
-      def initialize(prompt:, message:, raw_response: nil)
-        @message = message
+      def initialize(prompt:, message: nil, raw_response: nil)
         @prompt = prompt
+        @message = message || prompt.message
         @raw_response = raw_response
       end
     end

data/lib/active_agent/generation_provider.rb

@@ -24,7 +24,7 @@ module ActiveAgent
         require "active_agent/generation_provider/#{config["service"].underscore}_provider"
         ActiveAgent::GenerationProvider.const_get("#{config["service"].camelize}Provider").new(config)
       rescue LoadError
-        raise "Missing generation provider for #{config["service"].inspect}"
+        raise "Missing generation provider configuration for #{config["service"].inspect}"
       end
 
       def generation_provider

data/lib/active_agent/preview.rb

@@ -11,7 +11,7 @@ module ActiveAgent
 
       mattr_accessor :show_previews, instance_writer: false
 
-      mattr_accessor :preview_interceptors, instance_writer: false, default: [ActiveAgent::InlinePreviewInterceptor]
+      mattr_accessor :preview_interceptors, instance_writer: false, default: [ ActiveAgent::InlinePreviewInterceptor ]
     end
 
     module ClassMethods

data/lib/active_agent/railtie.rb

@@ -29,7 +29,7 @@ module ActiveAgent
       options.stylesheets_dir ||= paths["public/stylesheets"].first
       options.show_previews = Rails.env.development? if options.show_previews.nil?
       options.cache_store ||= Rails.cache
-      options.preview_paths |= ["#{Rails.root}/test/agents/previews"]
+      options.preview_paths |= [ "#{Rails.root}/test/agents/previews" ]
 
       # make sure readers methods get compiled
       options.asset_host ||= app.config.asset_host
@@ -45,7 +45,7 @@ module ActiveAgent
         register_interceptors(options.delete(:interceptors))
         register_preview_interceptors(options.delete(:preview_interceptors))
         register_observers(options.delete(:observers))
-        self.view_paths = ["#{Rails.root}/app/views"]
+        self.view_paths = [ "#{Rails.root}/app/views" ]
         self.preview_paths |= options[:preview_paths]
 
         if (generation_job = options.delete(:generation_job))

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.3"
+  VERSION = "0.3.2"
 end

data/lib/active_agent.rb

@@ -12,7 +12,6 @@ require "active_support/core_ext/class"
 require "active_support/core_ext/module/attr_internal"
 require "active_support/core_ext/string/inflections"
 require "active_support/lazy_load_hooks"
-
 module ActiveAgent
   extend ActiveSupport::Autoload
 

data/lib/generators/active_agent/agent_generator.rb

@@ -19,57 +19,8 @@ module ActiveAgent
         end
       end
 
-      def create_test_file
-        if test_framework == :rspec
-          template "agent_spec.rb", File.join("spec/agents", class_path, "#{file_name}_agent_spec.rb")
-        else
-          template "agent_test.rb", File.join("test/agents", class_path, "#{file_name}_agent_test.rb")
-        end
-      end
-
-      def create_view_files
-        actions.each do |action|
-          @action = action
-          
-          # Use configured template engines or fall back to defaults
-          json_template_engine = json_template_engine_for_views || "jbuilder"
-          html_template_engine = html_template_engine_for_views || "erb"
-          
-          @schema_path = File.join("app/views", class_path, file_name, "#{action}.json.#{json_template_engine}")
-          @view_path = File.join("app/views", class_path, file_name, "#{action}.html.#{html_template_engine}")
-          
-          template "action.json.#{json_template_engine}", @schema_path
-          template "action.html.#{html_template_engine}", @view_path
-        end
-      end
-
-      def create_layout_files
-        # Create the application agent layouts
-        template "layout.text.erb", "app/views/layouts/agent.text.erb"
-        template "layout.html.erb", "app/views/layouts/agent.html.erb"
-      end
-
       private
 
-      def test_framework
-        ::Rails.application.config.generators.options[:rails][:test_framework]
-      end
-
-      def template_engine
-        ::Rails.application.config.generators.options[:rails][:template_engine]
-      end
-
-      def json_template_engine_for_views
-        # Check if there's a specific JSON template engine configured
-        json_engine = ::Rails.application.config.generators.options[:rails][:json_template_engine]
-        json_engine || "jbuilder" # Default to jbuilder if not specified
-      end
-      
-      def html_template_engine_for_views
-        # Use the configured template engine or default to erb
-        template_engine || "erb"
-      end
-
       def file_name # :doc:
         @_file_name ||= super + "_agent"
       end

data/lib/generators/active_agent/install_generator.rb

@@ -13,7 +13,8 @@ module ActiveAgent
         template "application_agent.rb", "app/agents/application_agent.rb"
       end
 
-      def create_agent_layout_template
+      def create_agent_layouts
+        template "agent.html.erb", "app/views/layouts/agent.html.erb"
         template "agent.text.erb", "app/views/layouts/agent.text.erb"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.2
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -138,19 +138,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - lib/active_agent.rb
 - lib/active_agent/README.md
 - lib/active_agent/action_prompt.rb
 - lib/active_agent/action_prompt/README.md
 - lib/active_agent/action_prompt/action.rb
-- lib/active_agent/action_prompt/base.rb
-- lib/active_agent/action_prompt/collector.rb
 - lib/active_agent/action_prompt/message.rb
 - lib/active_agent/action_prompt/prompt.rb
 - lib/active_agent/base.rb
 - lib/active_agent/callbacks.rb
+- lib/active_agent/collector.rb
 - lib/active_agent/deprecator.rb
-- lib/active_agent/engine.rb
 - lib/active_agent/generation.rb
 - lib/active_agent/generation_job.rb
 - lib/active_agent/generation_methods.rb
@@ -162,7 +161,6 @@ files:
 - lib/active_agent/generation_provider/response.rb
 - lib/active_agent/inline_preview_interceptor.rb
 - lib/active_agent/log_subscriber.rb
-- lib/active_agent/operation.rb
 - lib/active_agent/parameterized.rb
 - lib/active_agent/preview.rb
 - lib/active_agent/prompt_helper.rb
@@ -179,13 +177,12 @@ files:
 - lib/generators/active_agent/templates/action.html.erb.tt
 - lib/generators/active_agent/templates/action.json.jbuilder.tt
 - lib/generators/active_agent/templates/active_agent.yml
+- lib/generators/active_agent/templates/agent.html.erb
 - lib/generators/active_agent/templates/agent.rb.tt
 - lib/generators/active_agent/templates/agent.text.erb
 - lib/generators/active_agent/templates/agent_spec.rb.tt
 - lib/generators/active_agent/templates/agent_test.rb.tt
 - lib/generators/active_agent/templates/application_agent.rb.tt
-- lib/generators/active_agent/templates/layout.html.erb
-- lib/generators/active_agent/templates/layout.text.erb
 - lib/tasks/activeagent_tasks.rake
 homepage: https://activeagents.ai
 licenses:

data/lib/active_agent/action_prompt/base.rb

@@ -1,127 +0,0 @@
-# require "abstract_controller"
-# require "active_support/core_ext/string/inflections"
-
-# module ActiveAgent
-#   module ActionPrompt
-#     extend ::ActiveSupport::Autoload
-
-#     eager_autoload do
-#       autoload :Collector
-#       autoload :Message
-#       autoload :Prompt
-#       autoload :PromptHelper
-#     end
-
-#     autoload :Base
-
-#     extend ActiveSupport::Concern
-
-#     included do
-#       include AbstractController::Rendering
-#       include AbstractController::Layouts
-#       include AbstractController::Helpers
-#       include AbstractController::Translation
-#       include AbstractController::AssetPaths
-#       include AbstractController::Callbacks
-#       include AbstractController::Caching
-
-#       include ActionView::Layouts
-
-#       helper ActiveAgent::PromptHelper
-#       # class_attribute :default_params, default: {
-#       #   content_type: "text/plain",
-#       #   parts_order: ["text/plain", "text/html", "application/json"]
-#       # }.freeze
-#     end
-
-#     # # def self.prompt(headers = {}, &)
-#     # #   new.prompt(headers, &)
-#     # # end
-
-#     # def prompt(headers = {}, &block)
-#     #   return @_message if @_prompt_was_called && headers.blank? && !block
-
-#     #   headers = apply_defaults(headers)
-
-#     #   @_message = ActiveAgent::ActionPrompt::Prompt.new
-
-#     #   assign_headers_to_message(@_message, headers)
-
-#     #   responses = collect_responses(headers, &block)
-
-#     #   @_prompt_was_called = true
-
-#     #   create_parts_from_responses(@_message, responses)
-
-#     #   @_message
-#     # end
-
-#     private
-
-#     def apply_defaults(headers)
-#       headers.reverse_merge(self.class.default_params)
-#     end
-
-#     def assign_headers_to_message(message, headers)
-#       assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
-#       assignable.each { |k, v| message.send(:"#{k}=", v) }
-#     end
-
-#     def collect_responses(headers, &block)
-#       if block
-#         collect_responses_from_block(headers, &block)
-#       elsif headers[:body]
-#         collect_responses_from_text(headers)
-#       else
-#         collect_responses_from_templates(headers)
-#       end
-#     end
-
-#     def collect_responses_from_block(headers, &block)
-#       templates_name = headers[:template_name] || action_name
-#       collector = ActiveAgent::ActionPrompt::Collector.new(lookup_context) { render(templates_name) }
-#       yield(collector)
-#       collector.responses
-#     end
-
-#     def collect_responses_from_text(headers)
-#       [{
-#         body: headers.delete(:body),
-#         content_type: headers[:content_type] || "text/plain"
-#       }]
-#     end
-
-#     def collect_responses_from_templates(headers)
-#       templates_path = headers[:template_path] || self.class.name.sub(/Agent$/, "").underscore
-#       templates_name = headers[:template_name] || action_name
-#       each_template(Array(templates_path), templates_name).map do |template|
-#         format = template.format || formats.first
-#         {
-#           body: render(template: template, formats: [format]),
-#           content_type: Mime[format].to_s
-#         }
-#       end
-#     end
-
-#     def each_template(paths, name, &)
-#       templates = lookup_context.find_all(name, paths)
-#       if templates.empty?
-#         raise ActionView::MissingTemplate.new(paths, name, paths, false, "prompt")
-#       else
-#         templates.uniq(&:format).each(&)
-#       end
-#     end
-
-#     def create_parts_from_responses(message, responses)
-#       responses.each do |response|
-#         message.add_part(response[:body], content_type: response[:content_type])
-#       end
-#     end
-
-#     class TestAgent
-#       class << self
-#         attr_accessor :generations
-#       end
-#     end
-#   end
-# end

data/lib/active_agent/action_prompt/collector.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "abstract_controller/collector"
-require "active_support/core_ext/hash/reverse_merge"
-require "active_support/core_ext/array/extract_options"
-
-module ActiveAgent
-  module ActionPrompt
-    class Collector
-      include AbstractController::Collector
-      attr_reader :responses
-
-      def initialize(context, &block)
-        @context = context
-        @responses = []
-        @default_render = block
-      end
-
-      def any(*args, &block)
-        options = args.extract_options!
-        raise ArgumentError, "You have to supply at least one format" if args.empty?
-        args.each { |type| send(type, options.dup, &block) }
-      end
-      alias_method :all, :any
-
-      def custom(mime, options = {})
-        options.reverse_merge!(content_type: mime.to_s)
-        @context.formats = [mime.to_sym]
-        options[:body] = block_given? ? yield : @default_render.call
-        @responses << options
-      end
-    end
-  end
-end

data/lib/active_agent/engine.rb

@@ -1,14 +0,0 @@
-# require "rails/engine"
-
-# module ActiveAgent
-#   class Engine < ::Rails::Engine
-#     isolate_namespace ActiveAgent
-
-#     initializer "active_agent.view_paths" do |app|
-#       # Adding your gem's view path to Rails lookup paths
-#       ActiveSupport.on_load(:action_controller) do
-#         append_view_path Engine.root.join("app/views")
-#       end
-#     end
-#   end
-# end

data/lib/active_agent/operation.rb

@@ -1,13 +0,0 @@
-module ActiveAgent
-  class Operation < AbstractController::Base
-    include AbstractController::Rendering
-    include ActionView::Rendering  # Allows rendering of ERB templates without a view context tied to a request
-    append_view_path "app/views"  # Ensure the controller knows where to look for view templates
-
-    def process_tool(tool_name, params)
-      send(tool_name, params)  # Dynamically calls the method corresponding to tool_name
-    rescue NoMethodError
-      "Tool not found: #{tool_name}"
-    end
-  end
-end

data/lib/generators/active_agent/templates/layout.text.erb

@@ -1 +0,0 @@
-<%= yield %>