activeagent 0.1.1 → 0.2.1.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67bb51f0a98d5b2291b53e30b629adae069a3f24e19edfc74702a918bc3c1086
-  data.tar.gz: 04cb6ba122dac00b145c3baf1f54157d5e443470639d16f22d614bfaaba92b49
+  metadata.gz: b07eb2c788cd8528cbb804f01ecddb3d0c1cb543bc8151df1db7351e5d7e21a3
+  data.tar.gz: 7cd9fe9ea001ea362af387f86b8270d53dfd5446a791e9c444739f87abcc31c1
 SHA512:
-  metadata.gz: 9835738ac1bb5570c900dd9a9942591a28c8b17b6ce26afbd622f764d5bb4ee178d0fc1089824a84d924824cc0c9a291680b1a1b1df5e41f5bfff1e91700a382
-  data.tar.gz: 78e3fd95e02a950cd2c47bf52891156d861f926374333efaeee51578fc0c96f65a94a123ec104cd0a5c32c9ea130ac85075a9904478191904936ea80381df714
+  metadata.gz: 2ad62fd71161308a780d7558d0b283a99ec3e07310955906da6b7add4c347bea20d9896b5a92ceb6f87eb010b0b86e4e8166c70459ea27a84de4f847c892e655
+  data.tar.gz: 8754c59f6606cceefa745c038a32af7fc037b359223baec64838a03a07dbd34b74b6780b86166697947e3b955306ff1d653afa2f67cc08d0e36ebbb106ab5f4e

data/README.md

@@ -1,153 +1,89 @@
-# ActiveAgent
+# Active Agent: README.md
 
-ActiveAgent is a Rails framework for creating and managing AI agents. It provides a structured way to interact with AI services through agents that can generate text, images, speech-to-text, and text-to-speech. It includes modules for defining prompts, actions, and rendering generative UI, as well as scaling with asynchronous jobs and streaming.
+# Active Agent
 
-## Installation
+## Agent
 
-Add this line to your application's Gemfile:
+Create agents that take instructions, prompts, and perform actions
 
-```ruby
-gem 'active_agent'
-```
-
-And then execute:
+### Generation Provider
 
-```sh
-bundle install
+```ruby  
+class SupportAgent < ActiveAgent::Base  
+  generate_with :openai, model: ‘gpt-o3-mini’,  temperature: 0.7  
+end  
 ```
-## Getting Started
 
-## Usage
+`generate_with` sets the generation provider’s completion generation model and parameters.
 
-### Generating an Agent
-```
-rails generate agent inventory search
-```
+`completion_response = SupportAgent.prompt(‘Help me!’).generate_now`
 
-This will generate the following files:
-```
-app/agents/application_agent.rb
-app/agents/inventory_agent.rb
-app/views/inventory_agent/search.text.erb
-app/views/inventory_agent/search.json.jbuilder
+```ruby  
+class SupportAgent < ActiveAgent::Base  
+  generate_with :openai, model: ‘gpt-o3-mini’,  temperature: 0.7  
+  embed_with :openai, model: ‘text-embedding-3-small’  
+end  
 ```
 
-### Define Agents
+`embed_with` sets the generation provider’s embedding generation model and parameters.
 
-Agents are the core of ActiveAgent. An agent takes prompts and can perform actions to generate content. Agents are defined by a simple Ruby class that inherits from `ActiveAgent::Base` and are located in the `app/agents` directory.
+`embedding_response = SupportAgent.prompt(‘Help me!’).embed_now`
 
-```ruby
-# 
+### Instructions
 
-inventory_agent.rb
+Instructions are system prompts that predefine the agent’s intention.
 
+### Prompt
 
-class InventoryAgent < ActiveAgent::Base
-  generate_with :openai, model: 'gpt-4o-mini', temperature: 0.5, instructions: :inventory_operations
+Action Prompt allows Active Agents to render plain text and HTML prompt templates. Calling generate on a prompt will send the prompt to the agent’s Generation Provider.
 
-  def search
-    @items = Item.search(params[:query])
-  end
+`SupportAgent.prompt(“What does CRUD and REST mean?”)`
 
-  def inventory_operations
-    @organization = Organization.find(params[:account_id])
-    prompt
-  end
-end
-```
+### Queue Generation
 
-### Interact with AI Services
+Active Agent also supports queued generation with Active Job using a common Generation Job interface.
 
-ActiveAgent allows you to interact with various AI services to generate text, images, speech-to-text, and text-to-speech.
+### Perform actions
 
-```ruby
-class SupportAgent < ActiveAgent::Base
-  generate_with :openai, model: 'gpt-4o-mini', instructions: :instructions
+Active Agents can define methods that are autoloaded as callable tools. These actions’ default schema will be provided to the agent’s context as part of the prompt request to the Generation Provider.
 
-  def perform(content, context)
-    @content = content
-    @context = context
-  end
+## Actions
 
-  def generate_message
-    provider_instance.generate(self)
-  end
+```  
+def get_cat_image_base64  
+  uri = URI("https://cataas.com/cat")  
+  response = Net::HTTP.get_response(uri)
 
-  private
-
-  def after_generate
-    broadcast_message
-  end
-
-  def broadcast_message
-    broadcast_append_later_to(
-      broadcast_stream,
-      target: broadcast_target,
-      partial: 'support_agent/message',
-      locals: { message: @message }
-    )
-  end
-
-  def broadcast_stream
-    "#{dom_id(@chat)}_messages"
-  end
+  if response.is_a?(Net::HTTPSuccess)  
+    image_data = response.body  
+    Base64.strict_encode64(image_data)  
+  else  
+    raise "Failed to fetch cat image. Status code: #{response.code}"  
+  end  
 end
-```
-
-### Render Generative UI
-
-ActiveAgent uses Action Prompt both for rendering `instructions` prompt views as well as rendering action views. Prompts are Action Views that provide instructions for the agent to generate content.
 
-```erb
-<!-- 
+class SupportAgent < ActiveAgent  
+  generate_with :openai,  
+    model: "gpt-4o",  
+    instructions: "Help people with their problems",  
+    temperature: 0.7
 
-instructions.text.erb
-
- -->
-INSTRUCTIONS: You are an inventory manager for <%= @organization.name %>. You can search for inventory or reconcile inventory using <%= assigned_actions %>
-```
-
-### Scale with Asynchronous Jobs and Streaming
-
-ActiveAgent supports asynchronous job processing and streaming for scalable AI interactions.
-
-#### Asynchronous Jobs
-
-Use the `generate_later` method to enqueue a job for later processing.
-
-```ruby
-InventoryAgent.with(query: query).search.generate_later
+   def get_cat_image  
+    prompt { |format| format.text { render plain: get_cat_image_base64 } }  
+  end  
+end  
 ```
 
-#### Streaming
-
-Use the `stream_with` method to handle streaming responses.
-
-```ruby
-class InventoryAgent < ActiveAgent::Base
-  generate_with :openai, model: 'gpt-4o-mini', stream: :broadcast_results
+## Prompts
 
-  private
+### Basic 
 
-  def broadcast_results
-    proc do |chunk, _bytesize|
-      @message.content = @message.content + chunk
-      broadcast_append_to(
-        "#{dom_id(chat)}_messages",
-        partial: "messages/message",
-        locals: { message: @message, scroll_to: true },
-        target: "#{dom_id(chat)}_messages"
-      )
-    end
-  end
-end
-```
+#### Plain text prompt and response templates
 
-## Contributing
+### HTML
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/yourusername/active_agent.
+### Action Schema JSON
 
-## License
+response = SupportAgent.prompt(‘show me a picture of a cat’).generate_now
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-```
+response.message

data/Rakefile

@@ -1,3 +1,2 @@
-require "bundler/setup"
-
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"

data/lib/active_agent/action_prompt/action.rb

@@ -0,0 +1,16 @@
+module ActiveAgent
+  module ActionPrompt
+    class Action
+      attr_accessor :agent_name, :name, :params
+
+      def initialize(attributes = {})
+        @name = attributes.fetch(:name, "")
+        @params = attributes.fetch(:params, {})
+      end
+
+      def perform_action
+        agent_name.constantize
+      end
+    end
+  end
+end

data/lib/active_agent/action_prompt/base.rb

@@ -0,0 +1,127 @@
+# 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/message.rb

@@ -7,31 +7,22 @@ module ActiveAgent
 
       def initialize(attributes = {})
         @content = attributes[:content] || ""
-        @role = attributes[:role] || "user"
+        @role = attributes[:role] || :user
         @name = attributes[:name]
-        @action_requested = attributes[:function_call]
-        @requested_actions = attributes[:tool_calls] || []
+        @agent_class = attributes[:agent_class]
+        @requested_actions = attributes[:requested_actions] || []
+        @action_requested = @requested_actions.any?
         validate_role
       end
 
       def to_h
         hash = {role: role, content: content}
         hash[:name] = name if name
-        hash[:action_requested] = action_requested if action_requested
+        hash[:action_requested] = requested_actions.any?
         hash[:requested_actions] = requested_actions if requested_actions.any?
         hash
       end
 
-      def perform_actions
-        requested_actions.each do |action|
-          action.call(self) if action.respond_to?(:call)
-        end
-      end
-
-      def action_requested?
-        action_requested.present? || requested_actions.any?
-      end
-
       private
 
       def validate_role

data/lib/active_agent/action_prompt/prompt.rb

@@ -1,10 +1,9 @@
-# lib/active_agent/action_prompt/prompt.rb
 require_relative "message"
 
 module ActiveAgent
   module ActionPrompt
     class Prompt
-      attr_accessor :actions, :body, :content_type, :instructions, :message, :messages, :options, :mime_version, :charset, :context
+      attr_accessor :actions, :body, :content_type, :instructions, :message, :messages, :options, :mime_version, :charset, :context, :parts
 
       def initialize(attributes = {})
         @options = attributes.fetch(:options, {})
@@ -31,11 +30,10 @@ module ActiveAgent
         @message.to_s
       end
 
-      def add_part(part)
-        message = Message.new(content: part[:body], role: :user)
-        prompt_part = self.class.new(message: message, content: message.content, content_type: part[:content_type], chartset: part[:charset])
+      def add_part(prompt_part)
+        @message = prompt_part.message
 
-        set_message if @content_type == part[:content_type] && @message.content
+        set_message if @content_type == prompt_part.content_type && @message.content.present?
 
         @parts << prompt_part
       end
@@ -67,12 +65,12 @@ module ActiveAgent
       end
 
       def set_message
-        if @body.is_a?(String) && !@message.content
-          @message = Message.new(content: @body, role: :user)
-        elsif @message.is_a? String
+        if @message.is_a? String
           @message = Message.new(content: @message, role: :user)
+        elsif @body.is_a?(String) && @message.content.blank?
+          @message = Message.new(content: @body, role: :user)
         end
-        @messages = [@message]
+        @messages << @message
       end
     end
   end

data/lib/active_agent/base.rb

@@ -67,11 +67,7 @@ module ActiveAgent
     }.freeze
 
     class << self
-      def prompt(...)
-        new.prompt(...)
-      end
-
-      # Register one or more Observers which will be notified when mail is delivered.
+      # Register one or more Observers which will be notified when prompt is generated.
       def register_observers(*observers)
         observers.flatten.compact.each { |observer| register_observer(observer) }
       end
@@ -81,7 +77,7 @@ module ActiveAgent
         observers.flatten.compact.each { |observer| unregister_observer(observer) }
       end
 
-      # Register one or more Interceptors which will be called before mail is sent.
+      # Register one or more Interceptors which will be called before prompt is sent.
       def register_interceptors(*interceptors)
         interceptors.flatten.compact.each { |interceptor| register_interceptor(interceptor) }
       end
@@ -91,32 +87,32 @@ module ActiveAgent
         interceptors.flatten.compact.each { |interceptor| unregister_interceptor(interceptor) }
       end
 
-      # Register an Observer which will be notified when mail is delivered.
+      # Register an Observer which will be notified when prompt is generated.
       # Either a class, string, or symbol can be passed in as the Observer.
       # If a string or symbol is passed in it will be camelized and constantized.
       def register_observer(observer)
-        Mail.register_observer(observer_class_for(observer))
+        Prompt.register_observer(observer_class_for(observer))
       end
 
       # Unregister a previously registered Observer.
       # Either a class, string, or symbol can be passed in as the Observer.
       # If a string or symbol is passed in it will be camelized and constantized.
       def unregister_observer(observer)
-        Mail.unregister_observer(observer_class_for(observer))
+        Prompt.unregister_observer(observer_class_for(observer))
       end
 
-      # Register an Interceptor which will be called before mail is sent.
+      # Register an Interceptor which will be called before prompt is sent.
       # Either a class, string, or symbol can be passed in as the Interceptor.
       # If a string or symbol is passed in it will be camelized and constantized.
       def register_interceptor(interceptor)
-        Mail.register_interceptor(observer_class_for(interceptor))
+        Prompt.register_interceptor(observer_class_for(interceptor))
       end
 
       # Unregister a previously registered Interceptor.
       # Either a class, string, or symbol can be passed in as the Interceptor.
       # If a string or symbol is passed in it will be camelized and constantized.
       def unregister_interceptor(interceptor)
-        Mail.unregister_interceptor(observer_class_for(interceptor))
+        Prompt.unregister_interceptor(observer_class_for(interceptor))
       end
 
       def observer_class_for(value) # :nodoc:
@@ -133,6 +129,7 @@ module ActiveAgent
       def generate_with(provider, **options)
         self.generation_provider = provider
         self.options = (options || {}).merge(options)
+        generation_provider.config.merge!(options)
       end
 
       def stream_with(&stream)
@@ -208,6 +205,35 @@ module ActiveAgent
     def perform_generation
       context.options.merge(options)
       generation_provider.generate(context) if context && generation_provider
+      handle_response(generation_provider.response)
+      # perform_actions(requested_actions: context.message.requested_actions)
+      # update_context(context)
+      # if context.requested_actions.present?
+      #   context.requested_actions.each do |action|
+      #     perform_action(action)
+      #   end
+      # end
+      generation_provider.response
+    end
+
+    def handle_response(response)
+      perform_actions(requested_actions: response.message.requested_actions) if response.message.requested_actions.present?
+      update_context(response)
+    end
+
+    def update_context(response)
+      context.message = response.message
+      context.messages << response.message
+    end
+
+    def perform_actions(requested_actions:)
+      requested_actions.each do |action|
+        perform_action(action)
+      end
+    end
+
+    def perform_action(action)
+      process(action.name, *action.params)
     end
 
     def initialize
@@ -286,6 +312,10 @@ module ActiveAgent
       end
     end
 
+    def prompt_with(*)
+      context.update_context(*)
+    end
+
     def prompt(headers = {}, &block)
       return context if @_prompt_was_called && headers.blank? && !block
 
@@ -296,6 +326,7 @@ module ActiveAgent
       context.charset = charset = headers[:charset]
 
       responses = collect_responses(headers, &block)
+
       @_prompt_was_called = true
 
       create_parts_from_responses(context, responses)
@@ -303,14 +334,15 @@ module ActiveAgent
       context.content_type = set_content_type(context, content_type, headers[:content_type])
       context.charset = charset
       context.actions = headers[:actions] || action_schemas
-      binding.irb
       context
     end
-    
+
     def action_schemas
       action_methods.map do |action|
-        JSON.parse render_to_string(locals: {action_name: action}, action: action, formats: :json)
-      end
+        if action != "prompt"
+          JSON.parse render_to_string(locals: {action_name: action}, action: action, formats: :json)
+        end
+      end.compact
     end
 
     private
@@ -385,12 +417,14 @@ module ActiveAgent
       templates_name = headers[:template_name] || action_name
 
       each_template(Array(templates_path), templates_name).map do |template|
+        next if template.format == :json
+
         format = template.format || formats.first
         {
           body: render(template: template, formats: [format]),
           content_type: Mime[format].to_s
         }
-      end
+      end.compact
     end
 
     def each_template(paths, name, &)
@@ -403,7 +437,7 @@ module ActiveAgent
     end
 
     def create_parts_from_responses(context, responses)
-      if responses.size > 1 && false
+      if responses.size > 1
         prompt_container = ActiveAgent::ActionPrompt::Prompt.new
         prompt_container.content_type = "multipart/alternative"
         responses.each { |r| insert_part(context, r, context.charset) }
@@ -415,7 +449,8 @@ module ActiveAgent
 
     def insert_part(container, response, charset)
       response[:charset] ||= charset
-      container.add_part(response)
+      prompt = ActiveAgent::ActionPrompt::Prompt.new(response)
+      container.add_part(prompt)
     end
 
     # This and #instrument_name is for caching instrument

data/lib/active_agent/generation.rb

@@ -37,7 +37,7 @@ module ActiveAgent
     def generate_now!
       processed_agent.handle_exceptions do
         processed_agent.run_callbacks(:generate) do
-          processed_agent..perform_generation
+          processed_agent.perform_generation!
         end
       end
     end

data/lib/active_agent/generation_provider/base.rb

@@ -4,7 +4,7 @@ module ActiveAgent
   module GenerationProvider
     class Base
       class GenerationProviderError < StandardError; end
-      attr_reader :client, :config, :prompt
+      attr_reader :client, :config, :prompt, :response
 
       def initialize(config)
         @config = config
@@ -19,10 +19,15 @@ module ActiveAgent
       private
 
       def handle_response(response)
-        ActiveAgent::GenerationProvider::Response.new(message:, raw_response: response)
+        @response = ActiveAgent::GenerationProvider::Response.new(message:, raw_response: response)
         raise NotImplementedError, "Subclasses must implement the 'handle_response' method"
       end
 
+      def update_context(prompt:, message:, response:)
+        prompt.message = message
+        prompt.messages << message
+      end
+
       protected
 
       def prompt_parameters

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -1,8 +1,9 @@
 # lib/active_agent/generation_provider/open_ai_provider.rb
 
-require_relative "base"
 require "openai"
-require "active_agent/generation_provider/response"
+require "active_agent/action_prompt/action"
+require_relative "base"
+require_relative "response"
 
 module ActiveAgent
   module GenerationProvider
@@ -16,24 +17,53 @@ module ActiveAgent
 
       def generate(prompt)
         @prompt = prompt
-        parameters = prompt_parameters.merge(model: @model_name)
 
         # parameters[:instructions] = prompt.instructions.content if prompt.instructions.present?
 
+        chat_prompt(parameters: prompt_parameters)
+      rescue => e
+        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
 
-        response = @client.chat(parameters: parameters)
-        handle_response(response)
+      def embed(prompt)
+        @prompt = prompt
+
+        embeddings_prompt(parameters: embeddings_parameters)
       rescue => e
-        raise GenerationProviderError, e.message
+        raise GenerationProviderError, e.message  
+      end
+
+      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-ada-002")
+        {
+          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: )
+        binding.irb
+        
+
+
+        embeddings_response(@client.embeddings(parameters: embeddings_parameters))
       end
 
       private
 
       def provider_stream
-        # prompt.config[: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.config[:stream] || config["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] || config["stream"]
         proc do |chunk, bytesize|
           # Provider parsing logic here
           new_content = chunk.dig("choices", 0, "delta", "content")
@@ -45,23 +75,41 @@ module ActiveAgent
         end
       end
 
-      def prompt_parameters
+      def prompt_parameters(model: @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
         {
-          messages: @prompt.messages,
-          temperature: @config["temperature"] || 0.7,
-          tools: @prompt.actions
+          model: model,
+          messages: messages,
+          temperature: temperature,
+          tools: tools
         }
       end
 
-      def handle_response(response)
+      def chat_response(response)
         message_json = response.dig("choices", 0, "message")
         message = ActiveAgent::ActionPrompt::Message.new(
           content: message_json["content"],
           role: message_json["role"],
-          action_reqested: message_json["function_call"],
-          requested_actions: message_json["tool_calls"]
+          action_requested: message_json["finish_reason"] == "tool_calls",
+          requested_actions: handle_actions(message_json["tool_calls"])
         )
-        ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
+
+        update_context(prompt: prompt, message: message, response: response)
+
+        @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(
+              name: tool_call.dig("function", "name"),
+              params: JSON.parse(
+                tool_call.dig("function", "arguments"),
+                {symbolize_names: true}
+              )
+            )
+          end
+        end
       end
     end
   end

data/lib/active_agent/generation_provider.rb

@@ -16,7 +16,6 @@ module ActiveAgent
         config = ActiveAgent.config[provider_name.to_s] || ActiveAgent.config[ENV["RAILS_ENV"]][provider_name.to_s]
 
         raise "Configuration not found for provider: #{provider_name}" unless config
-
         config.merge!(options)
         configure_provider(config)
       end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.1.1"
+  VERSION = "0.2.1-rc1"
 end

data/lib/active_agent.rb

@@ -1,5 +1,7 @@
 require "yaml"
 require "abstract_controller"
+require "active_agent/action_prompt"
+require "active_agent/generation_provider"
 require "active_agent/version"
 require "active_agent/deprecator"
 require "active_agent/railtie" if defined?(Rails)

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 suffix: "Agent"
+      check_class_collision
 
       def create_agent_file
-        template "agent.rb", File.join("app/agents", class_path, "#{file_name}_agent.rb")
+        template "agent.rb", File.join("app/agents", class_path, "#{file_name}.rb")
 
         in_root do
           if behavior == :invoke && !File.exist?(application_agent_file_name)

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

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

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

@@ -1,4 +1,5 @@
 <% module_namespacing do -%>
 class ApplicationAgent < ActiveAgent::Base
+  layout 'agent'
 end
 <% end %>

metadata

@@ -1,99 +1,135 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1.pre.rc1
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 description: A simple way to perform long running LLM background jobs and streaming
   responses
 email: jusbowen@gmail.com
@@ -107,6 +143,7 @@ files:
 - 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
@@ -143,10 +180,12 @@ files:
 - 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
-homepage: https://rubygems.org/gems/activeagent
+homepage: https://activeagents.ai
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/activeagents/activeagent
+  bug_tracker_uri: https://github.com/activeagents/activeagent/issues
 post_install_message:
 rdoc_options: []
 require_paths: