activeagent 0.4.1 → 0.4.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93bac60dcbdb44bfc6461435f84e79499682db83a93ea07526a5b546c2a1b63
-  data.tar.gz: c3a7a995862ef152661b1ede6c012e17747c190853cdc501e0a0f99445c7fe40
+  metadata.gz: 1ac9862cc06ad052e647933e771cb13ee76b4dbf43f5cdd61b871e017d685477
+  data.tar.gz: cf42d4608113a3ca73432fdd404c319f97ddde53919440c54a0247c1002b3f00
 SHA512:
-  metadata.gz: 5e2836e13ca5d353d221a33643c7c101320e2615982dceccf4dfdf25c9e9fe9bbdeb48503aa70d1a21ed1dd8cfdab0ec76348342dbbd29dc5cfb59f9306266f9
-  data.tar.gz: edaddc4339c00242935f0ba70fdc95f98547c12ccd6d4b4da9cd4081dd051e3521c6b4bdb5745fe6e7a382e462024b0dc0aec12eacd730b2ebc5f12a81315d35
+  metadata.gz: 23f7ccf62009efc9a46f0fb3e200866850519178bec86a36edb00e0d7252023bb1bbeb88da3087d2eaa565749ac0c3ae43e25e576615804fa7368617c6010c71
+  data.tar.gz: bda215bf93b1e86352871be452fec8bbb7c77d3638ffa608e44ca4694b87a5dd5f9cf08bd1d87687e6116e65347aa3253b50970b012b9b76522ae6c4e3070016

data/lib/active_agent/action_prompt/base.rb

@@ -204,11 +204,6 @@ module ActiveAgent
       # attr_accessor :context
 
       def perform_generation
-        context.options.merge(options)
-        if (action_methods - ActiveAgent::Base.descendants.first.action_methods).include? action_name
-          context.message = context.messages.last
-          context.actions = []
-        end
         generation_provider.generate(context) if context && generation_provider
         handle_response(generation_provider.response)
       end
@@ -244,7 +239,9 @@ module ActiveAgent
       def initialize
         super
         @_prompt_was_called = false
-        @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
+        @_context = ActiveAgent::ActionPrompt::Prompt.new(
+          instructions: prepare_instructions(options[:instructions]), options: options
+        )
       end
 
       def process(method_name, *args) # :nodoc:
@@ -298,10 +295,14 @@ module ActiveAgent
 
       def prompt(headers = {}, &block)
         return context if @_prompt_was_called && headers.blank? && !block
+
+        context.instructions = prepare_instructions(headers[:instructions]) if headers.has_key?(:instructions)
+        context.options.merge!(options)
         content_type = headers[:content_type]
         headers = apply_defaults(headers)
         context.messages = headers[:messages] || []
         context.context_id = headers[:context_id]
+        context.params = params
 
         context.charset = charset = headers[:charset]
 
@@ -325,6 +326,10 @@ module ActiveAgent
         context.charset = charset
         context.actions = headers[:actions] || action_schemas
 
+        if (action_methods - ActiveAgent::Base.descendants.first.action_methods).include? action_name
+          context.actions = (action_methods - [ action_name ])
+        end
+
         context
       end
 
@@ -448,6 +453,27 @@ module ActiveAgent
         context.add_part(message)
       end
 
+      def prepare_instructions(instructions)
+        case instructions
+        when Hash
+          raise ArgumentError, "Expected `:template` key in instructions hash" unless instructions[:template]
+          return unless lookup_context.exists?(instructions[:template], agent_name, false, [], formats: [ :text ])
+
+          template = lookup_context.find_template(instructions[:template], agent_name, false, [], formats: [ :text ])
+          render_to_string(template: template.virtual_path, locals: instructions[:locals] || {}, layout: false)
+        when String
+          instructions
+        when NilClass
+          default_template_name = "instructions"
+          return unless lookup_context.exists?(default_template_name, agent_name, false, [], formats: [ :text ])
+
+          template = lookup_context.find_template(default_template_name, agent_name, false, [], formats: [ :text ])
+          render_to_string(template: template.virtual_path, layout: false)
+        else
+          raise ArgumentError, "Instructions must be Hash, String or NilClass objects"
+        end
+      end
+
       # This and #instrument_name is for caching instrument
       def instrument_payload(key)
         {

data/lib/active_agent/action_prompt/prompt.rb

@@ -3,8 +3,8 @@ require_relative "message"
 module ActiveAgent
   module ActionPrompt
     class Prompt
-      attr_reader :messages
-      attr_accessor :actions, :body, :content_type, :context_id, :instructions, :message, :options, :mime_version, :charset, :context, :parts, :params, :action_choice, :agent_class
+      attr_reader :messages, :instructions
+      attr_accessor :actions, :body, :content_type, :context_id, :message, :options, :mime_version, :charset, :context, :parts, :params, :action_choice, :agent_class
 
       def initialize(attributes = {})
         @options = attributes.fetch(:options, {})
@@ -25,7 +25,7 @@ module ActiveAgent
         @parts = attributes.fetch(:parts, [])
         @messages = Message.from_messages(@messages)
         set_message if attributes[:message].is_a?(String) || @body.is_a?(String) && @message&.content
-        set_messages
+        set_messages if @instructions.present?
       end
 
       def messages=(messages)
@@ -33,16 +33,27 @@ module ActiveAgent
         set_messages
       end
 
+      def instructions=(instructions)
+        @instructions = instructions
+        if @messages[0].present? && @messages[0].role == :system
+          @messages[0] = instructions_message
+        else
+          set_messages
+        end
+      end
+
       # Generate the prompt as a string (for debugging or sending to the provider)
       def to_s
         @message.to_s
       end
 
       def add_part(message)
-        @message = message
-        set_message if @content_type == message.content_type && @message.content.present?
+        if @content_type == message.content_type && message.content.present?
+          @message = message
+          set_message
+        end
 
-        @parts << context
+        @parts << message
       end
 
       def multipart?
@@ -67,8 +78,12 @@ module ActiveAgent
 
       private
 
+      def instructions_message
+        Message.new(content: @instructions, role: :system)
+      end
+
       def set_messages
-        @messages = [ Message.new(content: @instructions, role: :system) ] + Message.from_messages(@messages) if @instructions.present?
+        @messages = [ instructions_message ] + @messages
       end
 
       def set_message
@@ -78,7 +93,7 @@ module ActiveAgent
           @message = Message.new(content: @body, role: :user)
         end
 
-        @messages << @message
+        @messages = @messages + [ @message ]
       end
     end
   end

data/lib/active_agent/generation.rb

@@ -6,24 +6,24 @@ module ActiveAgent
     def initialize(agent_class, action, *args)
       @agent_class, @action, @args = agent_class, action, args
       @processed_agent = nil
-      @prompt_context = nil
+      @context = nil
     end
     ruby2_keywords(:initialize)
 
     def __getobj__
-      @prompt_context ||= processed_agent.prompt_context
+      @context ||= processed_agent.context
     end
 
-    def __setobj__(prompt_context)
-      @prompt_context = prompt_context
+    def __setobj__(context)
+      @context = context
     end
 
-    def prompt_context
+    def context
       __getobj__
     end
 
     def processed?
-      @processed_agent || @prompt_context
+      @processed_agent || @context
     end
 
     def generate_later!(options = {})

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.4.1"
+  VERSION = "0.4.2.rc2"
 end

data/lib/generators/USAGE

@@ -0,0 +1,25 @@
+Description:
+    Sets up ActiveAgent in your Rails application by creating the necessary
+    configuration files and application agent class.
+
+    This generator creates:
+    - Configuration file (config/active_agent.yml)
+    - Application agent base class (app/agents/application_agent.rb)
+    - Layout templates for agent views (via template engine hooks)
+
+Examples:
+    `bin/rails generate active_agent:install`
+
+    creates the basic ActiveAgent setup:
+        Config:     config/active_agent.yml
+        Base Agent: app/agents/application_agent.rb
+        Layouts:    app/views/layouts/agent.html.erb
+                    app/views/layouts/agent.text.erb
+                    app/views/layouts/agent.json.erb
+
+    `bin/rails generate active_agent:install --template-engine=haml`
+
+    creates ActiveAgent setup with Haml layouts instead of ERB.
+
+    After running this generator, you can create individual agents with:
+    `bin/rails generate active_agent:agent AGENT_NAME ACTION_NAME`

data/lib/generators/active_agent/USAGE

@@ -1,18 +1,30 @@
 Description:
     Generates a new agent and its views. Passes the agent name, either
-    CamelCased or under_scored, and an optional list of prompts as arguments.
+    CamelCased or under_scored, and an optional list of actions as arguments.
 
-    This generates a agent class in app/agents and invokes your template
-    engine and test framework generators.
+    This generates an agent class in app/agents and invokes your template
+    engine and test framework generators. If no ApplicationAgent exists,
+    it will be created automatically.
+
+    Views are created for each action in three formats:
+    - HTML (.html.erb) - for rich text responses
+    - Text (.text.erb) - for plain text responses  
+    - JSON (.json.erb) - for structured function calling responses
 
 Examples:
-    `bin/rails generate agent inventory search`
+    `bin/rails generate active_agent:agent inventory search`
 
-    creates a sign up mailer class, views, and test:
-        Agent:     app/agents/inventory_agent.rb
-        Views:      app/views/inventory_agent/search.text.erb [...]
+    creates an inventory agent class, views, and test:
+        Agent:      app/agents/inventory_agent.rb
+        Views:      app/views/inventory_agent/search.html.erb
+                    app/views/inventory_agent/search.text.erb
+                    app/views/inventory_agent/search.json.erb
         Test:       test/agents/inventory_agent_test.rb
 
-    `bin/rails generate agent inventory search update report`
+    `bin/rails generate active_agent:agent inventory search update report`
 
     creates an inventory agent with search, update, and report actions.
+
+    `bin/rails generate active_agent:agent admin/user create --template-engine=haml`
+
+    creates a namespaced admin/user agent with Haml templates.

data/lib/generators/active_agent/install_generator.rb

@@ -3,6 +3,9 @@
 module ActiveAgent
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
+      def self.usage_path
+        @usage_path ||= File.expand_path("../USAGE", __dir__)
+      end
       source_root File.expand_path("templates", __dir__)
 
       hook_for :template_engine, :test_framework
@@ -10,6 +13,20 @@ module ActiveAgent
       def create_configuration
         template "active_agent.yml", "config/active_agent.yml"
       end
+
+      def create_application_agent
+        in_root do
+          if !File.exist?(application_agent_file_name)
+            template "application_agent.rb", application_agent_file_name
+          end
+        end
+      end
+
+      private
+
+      def application_agent_file_name
+        "app/agents/application_agent.rb"
+      end
     end
   end
 end

data/lib/generators/erb/agent_generator.rb

@@ -32,7 +32,7 @@ module Erb # :nodoc:
       private
 
       def formats
-        [ :text, :html ]
+        [ :text, :html, :json ]
       end
 
       def file_name

data/lib/generators/erb/install_generator.rb

@@ -10,6 +10,7 @@ module Erb # :nodoc:
       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"
+        template "layout.json.erb.tt", "app/views/layouts/agent.json.erb"
       end
     end
   end

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

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

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

@@ -0,0 +1,16 @@
+<%%= {
+  type: :function,
+  function: {
+    name: action_name,
+    description: "This action takes no params and gets a random cat image and returns it as a base64 string.",
+    parameters: {
+      type: :object,
+      properties: {
+        param_name: {
+          type: :string,
+          description: "The param_description"
+        }
+      }
+    }
+  }
+}.to_json.html_safe %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2.rc2
 platform: ruby
 authors:
 - Justin Bowen
@@ -184,6 +184,7 @@ files:
 - lib/active_agent/test_case.rb
 - lib/active_agent/version.rb
 - lib/activeagent.rb
+- lib/generators/USAGE
 - lib/generators/active_agent/USAGE
 - lib/generators/active_agent/agent_generator.rb
 - lib/generators/active_agent/install_generator.rb
@@ -194,8 +195,10 @@ files:
 - 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.json.erb.tt
 - lib/generators/erb/templates/layout.text.erb.tt
 - lib/generators/erb/templates/view.html.erb.tt
+- lib/generators/erb/templates/view.json.erb.tt
 - lib/generators/erb/templates/view.text.erb.tt
 - lib/generators/test_unit/agent_generator.rb
 - lib/generators/test_unit/install_generator.rb