activeagent 0.2.5.202503060823 → 0.2.6.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f9e1274f4d7ed4546eef11619ca81ffa0def6713414fab764ae264753dfb90
-  data.tar.gz: 5c13b957ed730b58356a5fbb7c7e2ab4bc3032b8960cabd555f6e352ca74ff70
+  metadata.gz: 2b9c764679c8c11bbf82e3aa132c5d563fc0a6c3cd5c28da2f6804639d1c153b
+  data.tar.gz: ec6a3c3495d44071264665e88be075005a240e52afe9202c506819e89897b1f8
 SHA512:
-  metadata.gz: a94a933b7436f45d92cc75f6bf600428d0d7b2a6a62b8578fc2defbaec8637c1d28563eab9c4868bc8caac4d45d02a4beb8ba26decf9c8b7c1141103fc3fbb0b
-  data.tar.gz: ed85714725dada7f2911af809e1f4eb78af9db4ad73e8939964abea40861b39e9e5d7273be02aa58bd0ace6ce225c1f8f9d33e5740a56e00f72ae0299794ee13
+  metadata.gz: de1673c61fabca8b9bdcf5a4d72d963d7de1538fb96d72580af25cff5c074199cb2a325b3ef0ef34f5c05a8aa5ad642b09782c4655cd5e1b7a98de6a59b50d1a
+  data.tar.gz: b70d1f16c1056d7c54bf964f9b5d0202e8b63f027d2eb1457276fd1bb07dd7acf00c6bff1ae45a36c33253463a348fdb75a1b9906559544b58b1f853ec77983c

data/lib/active_agent/action_prompt/action.rb

@@ -1,16 +1,13 @@
 module ActiveAgent
   module ActionPrompt
     class Action
-      attr_accessor :agent_name, :name, :params
+      attr_accessor :agent_name, :id, :name, :params
 
       def initialize(attributes = {})
+        @id = attributes.fetch(:id, nil)
         @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/message.rb

@@ -3,10 +3,10 @@ module ActiveAgent
     class Message
       VALID_ROLES = %w[system assistant user tool function].freeze
 
-      attr_accessor :content, :role, :name, :action_requested, :requested_actions, :content_type, :charset
+      attr_accessor :action_id, :content, :role, :name, :action_requested, :requested_actions, :content_type, :charset
 
-      def initialize(attributes = {})
-        @agent_class = attributes[:agent_class]       
+      def initialize(attributes = {})        
+        @action_id = attributes[:action_id]
         @charset = attributes[:charset] || "UTF-8"
         @content = attributes[:content] || ""
         @content_type = attributes[:content_type] || "text/plain"
@@ -20,16 +20,22 @@ module ActiveAgent
       def to_h
         hash = {
           role: role, 
+          action_id: action_id,
           content: content,
-          content_type: content_type,
+          type: content_type,
           charset: charset
         }
+
         hash[:name] = name if name
         hash[:action_requested] = requested_actions.any?
         hash[:requested_actions] = requested_actions if requested_actions.any?
         hash
       end
 
+      def embed
+        @agent_class.embed(@content)
+      end
+
       private
 
       def validate_role

data/lib/active_agent/action_prompt/prompt.rb

@@ -22,7 +22,7 @@ module ActiveAgent
         @parts = attributes.fetch(:parts, [])
 
         set_message if attributes[:message].is_a?(String) || @body.is_a?(String) && @message&.content
-        set_messages if @messages.any? || @instructions.present?
+        set_messages
       end
 
       # Generate the prompt as a string (for debugging or sending to the provider)

data/lib/active_agent/base.rb

@@ -202,6 +202,12 @@ module ActiveAgent
 
     attr_internal :context
 
+    def embed
+      context.options.merge(options)
+      generation_provider.embed(context) if context && generation_provider
+      handle_response(generation_provider.response) 
+    end
+
     def perform_generation
       context.options.merge(options)
       generation_provider.generate(context) if context && generation_provider
@@ -215,20 +221,15 @@ module ActiveAgent
     end
 
     def update_context(response)
-      if response.prompt.message != response.prompt.messages.last
-        response = ActiveAgent::GenerationProvider::Response.new(
-          prompt: response.prompt, 
-          message: response.prompt.messages.last, 
-          raw_response: response.raw_response
-        )
-      end
-      context.message = response.message
+      context = response.prompt
       response
     end
 
     def perform_actions(requested_actions:)
       requested_actions.each do |action|
         perform_action(action)
+        prompt.messages.last.role = :tool
+        prompt.messages.last.action_id = action.id
       end
     end
 
@@ -248,7 +249,7 @@ module ActiveAgent
         action: method_name,
         args: args
       }
-
+      
       ActiveSupport::Notifications.instrument("process.active_agent", payload) do
         super
         @_context = ActiveAgent::ActionPrompt::Prompt.new unless @_prompt_was_called

data/lib/active_agent/generation_job.rb

@@ -23,7 +23,7 @@ module ActiveAgent
       agent = agent_class.new
       agent.params = params if params
       agent.process(action_name, *args)
-      agent.generate_now
+      agent.perform_generation
     end
 
     private

data/lib/active_agent/generation_provider/base.rb

@@ -25,6 +25,7 @@ module ActiveAgent
 
       def update_context(prompt:, message:, response:)
         prompt.message = message
+        prompt.messages << message
       end
 
       protected

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -17,9 +17,6 @@ module ActiveAgent
 
       def generate(prompt)
         @prompt = prompt
-        
-        # prompt_parameters(model: @model_name, messages: prompt.messages, tools: prompt.actions)
-        # parameters[:instructions] = prompt.instructions.content if prompt.instructions.present?
 
         chat_prompt(parameters: prompt_parameters)
       rescue => e
@@ -28,6 +25,7 @@ module ActiveAgent
 
       def chat_prompt(parameters: prompt_parameters)
         parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
+        
         chat_response(@client.chat(parameters: parameters))
       end
 
@@ -39,7 +37,7 @@ module ActiveAgent
         raise GenerationProviderError, e.message  
       end
 
-      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-ada-002")
+      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
         {
           model: model,
           input: input
@@ -76,24 +74,39 @@ module ActiveAgent
       def prompt_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
         {
           model: model,
-          messages: messages,
+          messages: provider_messages(messages),
           temperature: temperature,
           tools: tools.presence
         }
       end
 
+      def provider_messages(messages)
+        messages.map do |message|
+          provider_message {
+            role: message.role, 
+            tool_call_id: message.action_id.presence,
+            content: message.content,
+            type: message.content_type,
+            charset: message.charset
+        }.compact
+
+        if content_type == "image_url"
+          provider_message[:image_url] = { url: content }
+        end        
+        end
+      end
+
       def chat_response(response)
         return @response if prompt.options[:stream]
 
         message_json = response.dig("choices", 0, "message")
-
+        
         message = ActiveAgent::ActionPrompt::Message.new(
           content: message_json["content"],
           role: message_json["role"],
           action_requested: message_json["finish_reason"] == "tool_calls",
           requested_actions: handle_actions(message_json["tool_calls"])
         )
-
         update_context(prompt: prompt, message: message, response: response)
 
         @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
@@ -103,6 +116,7 @@ module ActiveAgent
         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"),

data/lib/active_agent/railtie.rb

@@ -2,7 +2,7 @@
 
 require "active_job/railtie"
 require "active_agent"
-require "active_agent/engine"
+# require "active_agent/engine"
 require "rails"
 require "abstract_controller/railties/routes_helpers"
 
@@ -10,7 +10,7 @@ module ActiveAgent
   class Railtie < Rails::Railtie # :nodoc:
     config.active_agent = ActiveSupport::OrderedOptions.new
     config.active_agent.preview_paths = []
-    config.eager_load_namespaces << ::ActiveAgent
+    config.eager_load_namespaces << ActiveAgent
 
     initializer "active_agent.deprecator", before: :load_environment_config do |app|
       app.deprecators[:active_agent] = ActiveAgent.deprecator
@@ -34,6 +34,8 @@ module ActiveAgent
       # make sure readers methods get compiled
       options.asset_host ||= app.config.asset_host
       options.relative_url_root ||= app.config.relative_url_root
+      
+      ActiveAgent.load_configuration(Rails.root.join('config', 'active_agent.yml'))
 
       ActiveSupport.on_load(:active_agent) do
         include AbstractController::UrlFor
@@ -46,20 +48,16 @@ module ActiveAgent
         self.view_paths = ["#{Rails.root}/app/views"]
         self.preview_paths |= options[:preview_paths]
 
-        if delivery_job = options.delete(:delivery_job)
-          self.delivery_job = delivery_job.constantize
-        end
-
-        if options.smtp_settings
-          self.smtp_settings = options.smtp_settings
+        if generation_job = options.delete(:generation_job)
+          self.generation_job = generation_job.constantize
         end
 
         options.each { |k, v| send(:"#{k}=", v) }
       end
 
       ActiveSupport.on_load(:action_dispatch_integration_test) do
-        include ActiveAgent::TestHelper
-        include ActiveAgent::TestCase::ClearTestDeliveries
+        # include ActiveAgent::TestHelper
+        # include ActiveAgent::TestCase::ClearTestDeliveries
       end
     end
 

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.2.5.202503060823"
+  VERSION = "0.2.6.rc2"
 end

data/lib/activeagent.rb

@@ -0,0 +1 @@
+require "active_agent"

data/lib/generators/active_agent/install_generator.rb

@@ -4,11 +4,7 @@ module ActiveAgent
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path("templates", __dir__)
-
-      def create_initializer
-        template "initializer.rb", "config/initializers/active_agent.rb"
-      end
-
+      
       def create_configuration
         template "active_agent.yml", "config/active_agent.yml"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.2.5.202503060823
+  version: 0.2.6.rc2
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -137,8 +137,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- Rakefile
 - lib/active_agent.rb
 - lib/active_agent/README.md
 - lib/active_agent/action_prompt.rb
@@ -172,6 +170,7 @@ files:
 - lib/active_agent/service.rb
 - lib/active_agent/test_case.rb
 - lib/active_agent/version.rb
+- lib/activeagent.rb
 - lib/generators/active_agent/USAGE
 - lib/generators/active_agent/agent_generator.rb
 - lib/generators/active_agent/install_generator.rb
@@ -182,11 +181,14 @@ 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
-- lib/generators/active_agent/templates/initializer.rb
-homepage: https://rubygems.org/gems/activeagent
+homepage: https://activeagents.ai
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/activeagents/activeagent/issues
+  documentation_uri: https://github.com/activeagents/activeagent
+  source_code_uri: https://github.com/activeagents/activeagent
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/README.md

@@ -1,188 +0,0 @@
-# Active Agent
-
-## Install
-
-### Gemfile
-`gem 'activeagent', require: 'active_agent'`
-
-### CLI
-`gem install activeagent`
-
-### Rails Generator
-After installing the gem, run the Rails installation generator:
-
-```bash
-$ rails generate active_agent:install
-```
-
-This will create:
-```
-create  config/initializers/active_agent.rb
-create  config/active_agent.yml
-create  app/agents/application_agent.rb
-create  app/agents
-```
-
-- An initializer that uses default configurations 
-```ruby
-# config/initializers/active_agent.rb
-ActiveAgent.load_configuration(Rails.root.join('config', 'active_agent.yml'))
-```
-- A YAML configuration file for provider settings, such as OpenAI and might include environment-specific configurations:
-```yaml
-# config/active_agent.yml
-development:
-  openai:
-    service: "OpenAI"
-    api_key: <%= Rails.application.credentials.dig(:openai, :api_key) %>
-    model: "gpt-3.5-turbo"
-    temperature: 0.7
-
-production:
-  openai:
-    service: "OpenAI"
-    api_key: <%= Rails.application.credentials.dig(:openai, :api_key) %>
-    model: "gpt-3.5-turbo"
-    temperature: 0.7
-
-```
-- A base application agent class
-```ruby
-# app/agents/application_agent.rb
-class ApplicationAgent < ActiveAgent::Base
-  layout 'agent'
-
-  def prompt
-    super { |format| format.text { render plain: params[:message] } }
-  end
-```
-- The agents directory structure
-
-## Agent
-Create agents that take instructions, prompts, and perform actions
-
-### Rails Generator
-To use the Rails Active Agent generator to create a new agent and the associated views for the requested action prompts:
-
-```bash
-$ rails generate active_agent:agent travel search book plans 
-```
-This will create:
-```
-create  app/agents/travel_agent.rb
-create  app/views/agents/travel/search.text.erb
-create  app/views/agents/travel/book.text.erb
-create  app/views/agents/travel/plans.text.erb
-```
-
-The generator creates:
-- An agent class inheriting from ApplicationAgent
-- Text template views for each action
-- Action methods in the agent class for processing prompts
-
-### Agent Actions
-```ruby
-class TravelAgent < ApplicationAgent
-  def search
-    
-    prompt { |format| format.text { render plain: "Searching for travel options" } }
-  end
-
-  def book
-    prompt { |format| format.text { render plain: "Booking travel plans" } }
-  end
-
-  def plans
-    prompt { |format| format.text { render plain: "Making travel plans" } }
-  end
-end
-```
-
-## Action Prompt
-
-Action Prompt provides the structured interface for composing AI interactions through messages, actions/tools, and conversation context. [Read more about Action Prompt](lib/active_agent/action_prompt/README.md)
-
-```ruby
-agent.prompt(message: "Find hotels in Paris", 
-      actions: [{name: "search", params: {query: "hotels paris"}}])
-```
-
-The prompt interface manages:
-- Message content and roles (system/user/assistant)
-- Action/tool definitions and requests
-- Headers and context tracking
-- Content types and multipart handling
-
-### Generation Provider 
-
-Generation Provider defines how prompts are sent to AI services for completion and embedding generation. [Read more about Generation Providers](lib/active_agent/generation_provider/README.md)
-
-```ruby
-class VacationAgent < ActiveAgent::Base
-  # Try not to get too model-rous with the parameters!
-  generate_with :openai, 
-  model: "gpt-4",
-  temperature: 0.7
-
-  # Embed yourself in the joy of vector search
-  embed_with :openai,
-  model: "text-embedding-ada-002" 
-end
-```
-
-Providers handle:
-- API client configuration
-- Prompt/completion generation
-- Stream processing
-- Embedding generation  
-- Context management
-- Error handling
-
-### Queue Generation
-
-Active Agent also supports queued generation with Active Job using a common Generation Job interface.
-
-### Perform actions
-
-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.
-
-## Actions
-
-```ruby
-def get_cat_image_base64  
-  uri = URI("https://cataas.com/cat")  
-  response = Net::HTTP.get_response(uri)
-
-  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
-
-class SupportAgent < ActiveAgent  
-  generate_with :openai,  
-    model: "gpt-4o",  
-    instructions: "Help people with their problems",  
-    temperature: 0.7
-
-   def get_cat_image  
-    prompt { |format| format.text { render plain: get_cat_image_base64 } }  
-  end  
-end  
-```
-
-## Prompts
-
-### Basic 
-
-#### Plain text prompt and response templates
-
-### HTML
-
-### Action Schema JSON
-
-response = SupportAgent.prompt(‘show me a picture of a cat’).generate_now
-
-response.message

data/Rakefile

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

data/lib/generators/active_agent/templates/initializer.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-ActiveAgent.load_configuration(Rails.root.join('config', 'active_agent.yml'))