activeagent 0.2.5 → 0.2.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbfba3a78246c1008e29842f64cfb2bd880e2a33800639590324844ce6045bcd
-  data.tar.gz: a52d61ba1dac3d01ae6b84db9d70d81cb230dc1a975897218b48e372392710c3
+  metadata.gz: b5be38e4a523b45e6456791eaa43e9a04ea377d0d6921c8c0e427b8bb06418f3
+  data.tar.gz: 191f478a1d79f5bfe65e2016f9ec4063dce945eb09912da2cd70d393f0fda3c5
 SHA512:
-  metadata.gz: a85609f0e5d816b9fabe84fdbf589d2da716c740aa2406386c3c6cf0898436ac1d57ee04adca0d99418d2b38fd4c88c700ff468d1a6040869c3b22b790c2c780
-  data.tar.gz: 040fb0a37075cb2fc691be6b42e0395b7b3ab664e869a984f6581ee3c7a7357864676699af852e6b3e76e2ae765ab403e6a6e04cff46aa544f83b2e156fa86aa
+  metadata.gz: 8f4749307fec6f7b9a7339486c09b9f20d61b05388a67f12f0c2e00267fc14979f6d193f649c64117f13b822baac75511b0269700a6362d0e3cb548c9d68c1df
+  data.tar.gz: 7b3adbd0b9372d037b6fd303f55103d06e54ae7693b3920c7746ee1b7efe95f14134c7998a0bf5034e044fd3548ab0e44bf69df7a64109a2a0e319201273cd84

data/lib/active_agent/action_prompt/action.rb

@@ -9,7 +9,7 @@ module ActiveAgent
       end
 
       def perform_action
-        agent_name.constantize
+        agent_name.constantize.new.process(name, params)
       end
     end
   end

data/lib/active_agent/action_prompt/prompt.rb

@@ -12,7 +12,7 @@ module ActiveAgent
         @instructions = attributes.fetch(:instructions, "")
         @body = attributes.fetch(:body, "")
         @content_type = attributes.fetch(:content_type, "text/plain")
-        @message = attributes.fetch(:message, Message.new)
+        @message = attributes.fetch(:message, nil)
         @messages = attributes.fetch(:messages, [])
         @params = attributes.fetch(:params, {})
         @mime_version = attributes.fetch(:mime_version, "1.0")
@@ -21,8 +21,8 @@ module ActiveAgent
         @headers = attributes.fetch(:headers, {})
         @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_message if attributes[:message].is_a?(String) || @body.is_a?(String) && @message&.content
+        set_messages
       end
 
       # Generate the prompt as a string (for debugging or sending to the provider)
@@ -30,12 +30,11 @@ module ActiveAgent
         @message.to_s
       end
 
-      def add_part(prompt_part)
-        @message = prompt_part.message
+      def add_part(message)
+        @message = message
+        set_message if @content_type == message.content_type && @message.content.present?
 
-        set_message if @content_type == prompt_part.content_type && @message.content.present?
-
-        @parts << prompt_part
+        @parts << context
       end
 
       def multipart?

data/lib/active_agent/base.rb

@@ -128,8 +128,8 @@ module ActiveAgent
       # Define how the agent should generate content
       def generate_with(provider, **options)
         self.generation_provider = provider
-        self.options = (options || {}).merge(options)
-        generation_provider.config.merge!(options)
+        self.options = (options || {}).merge(options)        
+        generation_provider.config.merge!(self.options)
       end
 
       def stream_with(&stream)
@@ -203,20 +203,20 @@ module ActiveAgent
     attr_internal :context
 
     def perform_generation
-      context.options.merge(options)      
+      context.options.merge(options)
       generation_provider.generate(context) if context && generation_provider
-      handle_response(generation_provider.response)      
-      generation_provider.response
+      handle_response(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)
+      
+      update_context(response)      
     end
 
     def update_context(response)
       context.message = response.message
-      context.messages << response.message
+      response
     end
 
     def perform_actions(requested_actions:)
@@ -232,7 +232,7 @@ module ActiveAgent
     def initialize
       super
       @_prompt_was_called = false
-      @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions])
+      @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
     end
 
     def process(method_name, *args) # :nodoc:
@@ -241,7 +241,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
@@ -332,7 +332,7 @@ module ActiveAgent
 
     def action_schemas
       action_methods.map do |action|
-        if action != "prompt"
+        if action != "text_prompt"
           JSON.parse render_to_string(locals: {action_name: action}, action: action, formats: :json)
         end
       end.compact
@@ -431,24 +431,22 @@ module ActiveAgent
 
     def create_parts_from_responses(context, responses)
       if responses.size > 1
-        prompt_container = ActiveAgent::ActionPrompt::Prompt.new
-        prompt_container.content_type = "multipart/alternative"
+        # prompt_container = ActiveAgent::ActionPrompt::Prompt.new
+        # prompt_container.content_type = "multipart/alternative"
         responses.each { |r| insert_part(context, r, context.charset) }
-        context.add_part(prompt_container)
+        # context.add_part(prompt_container)
       else
         responses.each { |r| insert_part(context, r, context.charset) }
       end
     end
 
-    def insert_part(container, response, charset)
-      prompt = ActiveAgent::ActionPrompt::Prompt.new
+    def insert_part(context, response, charset)
       message = ActiveAgent::ActionPrompt::Message.new(
         content: response[:body],
         content_type: response[:content_type],
         charset: charset
       )
-      prompt.message = message
-      container.add_part(prompt)
+      context.add_part(message)
     end
     # This and #instrument_name is for caching instrument
     def instrument_payload(key)

data/lib/active_agent/callbacks.rb

@@ -7,6 +7,7 @@ module ActiveAgent
     included do
       include ActiveSupport::Callbacks
       define_callbacks :generate, skip_after_callbacks_if_terminated: true
+      define_callbacks :stream, skip_after_callbacks_if_terminated: true
     end
 
     module ClassMethods
@@ -26,6 +27,18 @@ module ActiveAgent
       def around_generate(*filters, &)
         set_callback(:generate, :around, *filters, &)
       end
+      
+      # Defines a callback for handling streaming responses during generation
+      def on_stream(*filters, &)
+        set_callback(:stream, :before, *filters, &)
+      end
+    end
+    
+    # Helper method to run stream callbacks
+    def run_stream_callbacks(message, delta = nil, stop = false)
+      run_callbacks(:stream) do
+        yield(message, delta, stop) if block_given?
+      end
     end
   end
-end
+end

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
+      agent.perform_generation
     end
 
     private

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -17,7 +17,8 @@ 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)
@@ -60,19 +61,19 @@ module ActiveAgent
       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] || config["stream"]
+        agent_stream = prompt.options[:stream]
+        message = ActiveAgent::ActionPrompt::Message.new(content: "", role: :assistant)
+        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: ) 
+        
         proc do |chunk, bytesize|
-          # Provider parsing logic here
-          new_content = chunk.dig("choices", 0, "delta", "content")
-          message = @prompt.messages.find { |message| message.response_number == chunk.dig("choices", 0, "index") }
-          message.update(content: message.content + new_content) if new_content
-
-          # Call the custom stream_proc if provided
-          agent_stream.call(message) if agent_stream.respond_to?(:call)
+          if new_content = chunk.dig("choices", 0, "delta", "content")
+            message.content += new_content
+            agent_stream.call(message) if agent_stream.respond_to?(:call)
+          end          
         end
       end
 
-      def prompt_parameters(model: @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
+      def prompt_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
         {
           model: model,
           messages: messages,
@@ -82,14 +83,16 @@ module ActiveAgent
       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)

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"
+  VERSION = "0.2.6.rc1"
 end

data/lib/activeagent.rb

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

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

@@ -4,8 +4,8 @@ class ApplicationAgent < ActiveAgent::Base
   
   generate_with :openai, model: "gpt-4o-mini", instructions: "You are a helpful assistant."
   
-  def prompt
-    super { |format| format.text { render plain: params[:message] } }
+  def text_prompt
+    prompt { |format| format.text { render plain: params[:message] } }
   end
 end
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6.rc1
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-13 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'))