activeagent 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8567895dba91f6a677d35693b104e3a85f138cfcba9d6e5a2e0b50d536d435c9
-  data.tar.gz: 5debb8cd50b84a5d4859df01fefcd4b9161c30aae75a0dd1a53e08054331b554
+  metadata.gz: c93bac60dcbdb44bfc6461435f84e79499682db83a93ea07526a5b546c2a1b63
+  data.tar.gz: c3a7a995862ef152661b1ede6c012e17747c190853cdc501e0a0f99445c7fe40
 SHA512:
-  metadata.gz: d1aabd80bf2ee0e66141de25f799beb042aa662006a8c2bc96d083f86dfd02fd3518732da58dedc8ad09347ee7262c16c1b0244b433bbbe556d980e8ed6027d6
-  data.tar.gz: ab612e4af865564a94fed7cb8bf0626e696a5a54b3302b14505f36f58a4d55e3716340175b815a020430f903e2e8fe8f61f2d50ef4ca6ac4d027780952964cd0
+  metadata.gz: 5e2836e13ca5d353d221a33643c7c101320e2615982dceccf4dfdf25c9e9fe9bbdeb48503aa70d1a21ed1dd8cfdab0ec76348342dbbd29dc5cfb59f9306266f9
+  data.tar.gz: edaddc4339c00242935f0ba70fdc95f98547c12ccd6d4b4da9cd4081dd051e3521c6b4bdb5745fe6e7a382e462024b0dc0aec12eacd730b2ebc5f12a81315d35

data/lib/active_agent/action_prompt/base.rb

@@ -173,7 +173,7 @@ module ActiveAgent
         end
       end
 
-      attr_internal :prompt_context
+      attr_internal :context
 
       def agent_stream
         proc do |message, delta, stop|
@@ -184,8 +184,8 @@ module ActiveAgent
       end
 
       def embed
-        prompt_context.options.merge(options)
-        generation_provider.embed(prompt_context) if prompt_context && generation_provider
+        context.options.merge(options)
+        generation_provider.embed(context) if context && generation_provider
         handle_response(generation_provider.response)
       end
 
@@ -194,34 +194,34 @@ module ActiveAgent
         def embed
           agent_class = ActiveAgent::Base.descendants.first
           agent = agent_class.new
-          agent.prompt_context = ActiveAgent::ActionPrompt::Prompt.new(message: self)
+          agent.context = ActiveAgent::ActionPrompt::Prompt.new(message: self)
           agent.embed
           self
         end
       end
 
-      # Make prompt_context accessible for chaining
-      # attr_accessor :prompt_context
+      # Make context accessible for chaining
+      # attr_accessor :context
 
       def perform_generation
-        prompt_context.options.merge(options)
+        context.options.merge(options)
         if (action_methods - ActiveAgent::Base.descendants.first.action_methods).include? action_name
-          prompt_context.message = prompt_context.messages.last
-          prompt_context.actions = []
+          context.message = context.messages.last
+          context.actions = []
         end
-        generation_provider.generate(prompt_context) if prompt_context && generation_provider
+        generation_provider.generate(context) if context && generation_provider
         handle_response(generation_provider.response)
       end
 
       def handle_response(response)
         return response unless response.message.requested_actions.present?
         perform_actions(requested_actions: response.message.requested_actions)
-        update_prompt_context(response)
+        update_context(response)
       end
 
-      def update_prompt_context(response)
-        prompt_context.message = prompt_context.messages.last
-        ActiveAgent::GenerationProvider::Response.new(prompt: prompt_context)
+      def update_context(response)
+        context.message = context.messages.last
+        ActiveAgent::GenerationProvider::Response.new(prompt: context)
       end
 
       def perform_actions(requested_actions:)
@@ -231,20 +231,20 @@ module ActiveAgent
       end
 
       def perform_action(action)
-        current_context = prompt_context.clone
+        current_context = context.clone
         process(action.name, *action.params)
-        prompt_context.messages.last.role = :tool
-        prompt_context.messages.last.action_id = action.id
-        prompt_context.messages.last.action_name = action.name
-        prompt_context.messages.last.generation_id = action.id
-        current_context.messages << prompt_context.messages.last
-        self.prompt_context = current_context
+        context.messages.last.role = :tool
+        context.messages.last.action_id = action.id
+        context.messages.last.action_name = action.name
+        context.messages.last.generation_id = action.id
+        current_context.messages << context.messages.last
+        self.context = current_context
       end
 
       def initialize
         super
         @_prompt_was_called = false
-        @_prompt_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
+        @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
       end
 
       def process(method_name, *args) # :nodoc:
@@ -256,7 +256,7 @@ module ActiveAgent
 
         ActiveSupport::Notifications.instrument("process.active_agent", payload) do
           super
-          @_prompt_context = ActiveAgent::ActionPrompt::Prompt.new unless @_prompt_was_called
+          @_context = ActiveAgent::ActionPrompt::Prompt.new unless @_prompt_was_called
         end
       end
       ruby2_keywords(:process)
@@ -286,24 +286,24 @@ module ActiveAgent
 
       def headers(args = nil)
         if args
-          @_prompt_context.headers(args)
+          @_context.headers(args)
         else
-          @_prompt_context
+          @_context
         end
       end
 
       def prompt_with(*)
-        prompt_context.update_prompt_context(*)
+        context.update_context(*)
       end
 
       def prompt(headers = {}, &block)
-        return prompt_context if @_prompt_was_called && headers.blank? && !block
+        return 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]
+        context.messages = headers[:messages] || []
+        context.context_id = headers[:context_id]
 
-        prompt_context.charset = charset = headers[:charset]
+        context.charset = charset = headers[:charset]
 
         if headers[:message].present? && headers[:message].is_a?(ActiveAgent::ActionPrompt::Message)
           headers[:body] = headers[:message].content
@@ -314,25 +314,27 @@ module ActiveAgent
         end
 
         # wrap_generation_behavior!(headers[:generation_method], headers[:generation_method_options])
-        # assign_headers_to_prompt_context(prompt_context, headers)
+        # assign_headers_to_context(context, headers)
         responses = collect_responses(headers, &block)
 
         @_prompt_was_called = true
 
-        create_parts_from_responses(prompt_context, responses)
+        create_parts_from_responses(context, responses)
 
-        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
+        context.content_type = set_content_type(context, content_type, headers[:content_type])
+        context.charset = charset
+        context.actions = headers[:actions] || action_schemas
 
-        prompt_context
+        context
+      end
+
+      def action_methods
+        super - ActiveAgent::Base.public_instance_methods(false).map(&:to_s)
       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)
-          end
+          JSON.parse render_to_string(locals: { action_name: action }, action: action, formats: :json)
         end.compact
       end
 
@@ -342,7 +344,7 @@ module ActiveAgent
         if user_content_type.present?
           user_content_type
         else
-          prompt_context.content_type || class_default
+          context.content_type || class_default
         end
       end
 
@@ -373,11 +375,11 @@ module ActiveAgent
         end
       end
 
-      def assign_headers_to_prompt_context(prompt_context, headers)
+      def assign_headers_to_context(context, headers)
         assignable = headers.except(:parts_order, :content_type, :body, :role, :template_name,
           :template_path, :delivery_method, :delivery_method_options)
 
-        assignable.each { |k, v| prompt_context.send(k, v) if prompt_context.respond_to?(k) }
+        assignable.each { |k, v| context.send(k, v) if context.respond_to?(k) }
       end
 
       def collect_responses(headers, &)
@@ -426,24 +428,24 @@ module ActiveAgent
         end
       end
 
-      def create_parts_from_responses(prompt_context, responses)
+      def create_parts_from_responses(context, responses)
         if responses.size > 1
           # prompt_container = ActiveAgent::ActionPrompt::Prompt.new
           # prompt_container.content_type = "multipart/alternative"
-          responses.each { |r| insert_part(prompt_context, r, prompt_context.charset) }
-          # prompt_context.add_part(prompt_container)
+          responses.each { |r| insert_part(context, r, context.charset) }
+          # context.add_part(prompt_container)
         else
-          responses.each { |r| insert_part(prompt_context, r, prompt_context.charset) }
+          responses.each { |r| insert_part(context, r, context.charset) }
         end
       end
 
-      def insert_part(prompt_context, response, charset)
+      def insert_part(context, response, charset)
         message = ActiveAgent::ActionPrompt::Message.new(
           content: response[:body],
           content_type: response[:content_type],
           charset: charset
         )
-        prompt_context.add_part(message)
+        context.add_part(message)
       end
 
       # This and #instrument_name is for caching instrument

data/lib/active_agent/base.rb

@@ -28,8 +28,8 @@ module ActiveAgent
     # It is built on top of ActionPrompt which provides methods for generating content, handling actions, and managing prompts.
     # ActiveAgent::Base is designed to be extended by specific agent implementations.
     # It provides a common set of agent actions for self-contained agents that can determine their own actions using all available actions.
-    # Base actions include: text_prompt, continue, reasoning, reiterate, and conclude
-    def text_prompt
+    # Base actions include: prompt_context, continue, reasoning, reiterate, and conclude
+    def prompt_context
       prompt(stream: params[:stream], messages: params[:messages], message: params[:message], context_id: params[:context_id])
     end
   end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/generators/active_agent/agent_generator.rb

@@ -7,10 +7,10 @@ module ActiveAgent
 
       argument :actions, type: :array, default: [], banner: "method method"
 
-      check_class_collision
+      check_class_collision suffix: "Agent"
 
       def create_agent_file
-        template "agent.rb", File.join("app/agents", class_path, "#{file_name}.rb")
+        template "agent.rb", File.join("app/agents", class_path, "#{file_name}_agent.rb")
 
         in_root do
           if behavior == :invoke && !File.exist?(application_agent_file_name)
@@ -19,10 +19,12 @@ module ActiveAgent
         end
       end
 
+      hook_for :template_engine, :test_framework
+
       private
 
       def file_name # :doc:
-        @_file_name ||= super + "_agent"
+        @_file_name ||= super.sub(/_agent\z/i, "")
       end
 
       def application_agent_file_name

data/lib/generators/active_agent/install_generator.rb

@@ -5,18 +5,11 @@ module ActiveAgent
     class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path("templates", __dir__)
 
+      hook_for :template_engine, :test_framework
+
       def create_configuration
         template "active_agent.yml", "config/active_agent.yml"
       end
-
-      def create_application_agent
-        template "application_agent.rb", "app/agents/application_agent.rb"
-      end
-
-      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
   end
 end

data/lib/generators/active_agent/templates/agent.rb.tt

@@ -1,5 +1,5 @@
 <% module_namespacing do -%>
-class <%= class_name %> < ApplicationAgent
+class <%= class_name %>Agent < ApplicationAgent
 <% actions.each_with_index do |action, index| -%>
 <% if index != 0 -%>
 

data/lib/generators/erb/agent_generator.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "rails/generators/erb"
+
+module Erb # :nodoc:
+  module Generators # :nodoc:
+    class AgentGenerator < Base # :nodoc:
+      source_root File.expand_path("templates", __dir__)
+      argument :actions, type: :array, default: [], banner: "method method"
+
+      def copy_view_files
+        view_base_path = File.join("app/views", class_path, file_name + "_agent")
+        empty_directory view_base_path
+
+        if behavior == :invoke
+          formats.each do |format|
+            layout_path = File.join("app/views/layouts", class_path, filename_with_extensions("agent", format))
+            template filename_with_extensions(:layout, format), layout_path unless File.exist?(layout_path)
+          end
+        end
+
+        actions.each do |action|
+          @action = action
+
+          formats.each do |format|
+            @path = File.join(view_base_path, filename_with_extensions(action, format))
+            template filename_with_extensions(:view, format), @path
+          end
+        end
+      end
+
+      private
+
+      def formats
+        [ :text, :html ]
+      end
+
+      def file_name
+        @_file_name ||= super.sub(/_agent\z/i, "")
+      end
+    end
+  end
+end

data/lib/generators/erb/install_generator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+
+module Erb # :nodoc:
+  module Generators # :nodoc:
+    class InstallGenerator < ::Rails::Generators::Base # :nodoc:
+      source_root File.expand_path("templates", __dir__)
+
+      def create_agent_layouts
+        template "layout.html.erb.tt", "app/views/layouts/agent.html.erb"
+        template "layout.text.erb.tt", "app/views/layouts/agent.text.erb"
+      end
+    end
+  end
+end

data/lib/generators/erb/templates/application_agent.rb.tt

@@ -0,0 +1,7 @@
+<% module_namespacing do -%>
+class ApplicationAgent < ActiveAgent::Base
+  layout 'agent'
+  
+  generate_with :openai, model: "gpt-4o-mini", instructions: "You are a helpful assistant."
+end
+<% end %>

data/lib/generators/erb/templates/layout.html.erb.tt

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

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

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

data/lib/generators/erb/templates/view.html.erb.tt

@@ -0,0 +1,5 @@
+<h1><%= class_name %>#<%= @action %></h1>
+
+<p>
+  <%%= @message %>, find me in <%= @path %>
+</p>

data/lib/generators/erb/templates/view.text.erb.tt

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= @action %>
+
+<%%= @message %>, find me in <%= @path %>

data/lib/generators/test_unit/agent_generator.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "rails/generators/test_unit"
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class AgentGenerator < Base # :nodoc:
+      source_root File.expand_path("templates", __dir__)
+      argument :actions, type: :array, default: [], banner: "method method"
+
+      def check_class_collision
+        class_collisions "#{class_name}AgentTest", "#{class_name}AgentPreview"
+      end
+
+      def create_test_files
+        template "functional_test.rb", File.join("test/agents", class_path, "#{file_name}_agent_test.rb")
+      end
+
+      def create_preview_files
+        template "preview.rb", File.join("test/agents/previews", class_path, "#{file_name}_agent_preview.rb")
+      end
+
+      private
+
+      def file_name
+        @_file_name ||= super.sub(/_agent\z/i, "")
+      end
+    end
+  end
+end

data/lib/generators/test_unit/install_generator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "rails/generators/test_unit"
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class InstallGenerator < Base # :nodoc:
+      # TestUnit install generator for ActiveAgent
+      # This can be used to create additional test-specific files during installation
+      # Currently no additional files are needed for TestUnit setup
+    end
+  end
+end

data/lib/generators/test_unit/templates/functional_test.rb.tt

@@ -0,0 +1,20 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>AgentTest < ActiveAgent::TestCase
+<% actions.each_with_index do |action, index| -%>
+<% if index != 0 -%>
+
+<% end -%>
+  test "<%= action %>" do
+    agent = <%= class_name %>Agent.<%= action %>
+    assert_equal <%= action.to_s.humanize.inspect %>, agent.prompt_context
+  end
+<% end -%>
+<% if actions.blank? -%>
+  # test "the truth" do
+  #   assert true
+  # end
+<% end -%>
+end
+<% end -%>

data/lib/generators/test_unit/templates/preview.rb.tt

@@ -0,0 +1,14 @@
+<% module_namespacing do -%>
+# Preview all agent views/prompts templates at http://localhost:3000/active_agent/agents/<%= file_path %>_agent
+class <%= class_name %>AgentPreview < ActiveAgent::Preview
+<% actions.each_with_index do |action, index| -%>
+<% if index != 0 -%>
+
+<% end -%>
+  # Preview this email at http://localhost:3000/active_agent/agents/<%= file_path %>_agent/<%= action %>
+  def <%= action %>
+    <%= class_name %>Agent.<%= action %>
+  end
+<% end -%>
+end
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Bowen
@@ -187,15 +187,20 @@ files:
 - lib/generators/active_agent/USAGE
 - lib/generators/active_agent/agent_generator.rb
 - lib/generators/active_agent/install_generator.rb
-- 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/erb/agent_generator.rb
+- lib/generators/erb/install_generator.rb
+- lib/generators/erb/templates/application_agent.rb.tt
+- lib/generators/erb/templates/layout.html.erb.tt
+- lib/generators/erb/templates/layout.text.erb.tt
+- lib/generators/erb/templates/view.html.erb.tt
+- lib/generators/erb/templates/view.text.erb.tt
+- lib/generators/test_unit/agent_generator.rb
+- lib/generators/test_unit/install_generator.rb
+- lib/generators/test_unit/templates/functional_test.rb.tt
+- lib/generators/test_unit/templates/preview.rb.tt
 - lib/tasks/activeagent_tasks.rake
 homepage: https://activeagents.ai
 licenses:

data/lib/generators/active_agent/templates/action.json.jbuilder.tt

@@ -1,14 +0,0 @@
-json.type :function
-json.function do
-  json.name action_name
-  json.description "TODO: Write a description for this action"
-  json.parameters do
-    json.type :object
-    json.properties do
-      json.param_name do
-        json.type :string
-        json.description "The param_description"
-      end
-    end
-  end
-end

data/lib/generators/active_agent/templates/agent.html.erb

@@ -1 +0,0 @@
-<%= yield if block_given? %>

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

@@ -1 +0,0 @@
-<%= yield if block_given? %>