activeagent 0.1.1 → 0.2.6.9

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
@@ -11,57 +12,127 @@ module ActiveAgent
         super
         @api_key = config["api_key"]
         @model_name = config["model"] || "gpt-4o-mini"
-        @client = OpenAI::Client.new(api_key: @api_key)
+        @client = OpenAI::Client.new(access_token: @api_key, log_errors: true)
       end
 
       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"]
 
-        response = @client.chat(parameters: parameters)
-        handle_response(response)
+        chat_response(@client.chat(parameters: parameters))
+      end
+
+      def embed(prompt)
+        @prompt = prompt
+
+        embeddings_prompt(parameters: embeddings_parameters)
       rescue => e
         raise GenerationProviderError, e.message
       end
 
+      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
+        {
+          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:)
+        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]
+        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
+          if (new_content = chunk.dig("choices", 0, "delta", "content"))
+            message.content += new_content
 
-          # Call the custom stream_proc if provided
-          agent_stream.call(message) if agent_stream.respond_to?(:call)
+            agent_stream.call(message, new_content, false) do |message, new_content|
+              yield message, new_content if block_given?
+            end
+          end
+
+          agent_stream.call(message, nil, true) do |message|
+            yield message, nil if block_given?
+          end
         end
       end
 
-      def prompt_parameters
+      def prompt_parameters(model: @prompt.options[: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: provider_messages(messages),
+          temperature: temperature,
+          tools: tools.presence
         }
       end
 
-      def handle_response(response)
+      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 message.content_type == "image_url"
+            provider_message[:image_url] = {url: message.content}
+          end
+          provider_message
+        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_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(
+              id: tool_call["id"],
+              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

@@ -13,10 +13,9 @@ module ActiveAgent
 
     module ClassMethods
       def configuration(provider_name, **options)
-        config = ActiveAgent.config[provider_name.to_s] || ActiveAgent.config[ENV["RAILS_ENV"]][provider_name.to_s]
+        config = ActiveAgent.config[provider_name.to_s] || ActiveAgent.config.dig(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/operation.rb

@@ -2,12 +2,12 @@ module ActiveAgent
   class Operation < AbstractController::Base
     include AbstractController::Rendering
     include ActionView::Rendering  # Allows rendering of ERB templates without a view context tied to a request
-    append_view_path 'app/views'  # Ensure the controller knows where to look for view templates
-  
+    append_view_path "app/views"  # Ensure the controller knows where to look for view templates
+
     def process_tool(tool_name, params)
       send(tool_name, params)  # Dynamically calls the method corresponding to tool_name
     rescue NoMethodError
       "Tool not found: #{tool_name}"
     end
   end
-end
+end

data/lib/active_agent/queued_generation.rb

@@ -9,4 +9,4 @@ module ActiveAgent
       class_attribute :generate_later_queue_name, default: :agents
     end
   end
-end
+end

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
@@ -35,6 +35,8 @@ module ActiveAgent
       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
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes, false)
@@ -46,25 +48,21 @@ 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
 
     initializer "active_agent.set_autoload_paths", before: :set_autoload_paths do |app|
-      options = app.config.active_agent
+      # options = app.config.active_agent
       # app.config.paths["test/agents/previews"].concat(options.preview_paths)
     end
 

data/lib/active_agent/service.rb

@@ -22,4 +22,4 @@ module ActiveAgent
       raise NotImplementedError
     end
   end
-end
+end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.1.1"
+  VERSION = "0.2.6.9"
 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)
@@ -47,9 +49,11 @@ module ActiveAgent
     end
 
     def load_configuration(file)
-      config_file = YAML.load_file(file, aliases: true)
-      env = ENV["RAILS_ENV"] || ENV["ENV"] || "development"
-      @config = config_file[env] || config_file
+      if File.exist?(file)
+        config_file = YAML.load(ERB.new(File.read(file)).result)
+        env = ENV["RAILS_ENV"] || ENV["ENV"] || "development"
+        @config = config_file[env] || config_file
+      end
     end
   end
 end

data/lib/activeagent.rb

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

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)
@@ -31,33 +31,33 @@ module ActiveAgent
         actions.each do |action|
           @action = action
           @schema_path = File.join("app/views", class_path, file_name, "#{action}.json.jbuilder")
-          @view_path = File.join("app/views", class_path, file_name, "#{action}.html.#{template_engine}")
+          @view_path = File.join("app/views", class_path, file_name, "#{action}.html.erb")
           template "action.json.jbuilder", @schema_path
-          template "action.html.#{template_engine}", @view_path
+          template "action.html.erb", @view_path
         end
       end
-      
 
       private
-        def test_framework
-          ::Rails.application.config.generators.options[:rails][:test_framework]
-        end
-        
-        def template_engine
-          ::Rails.application.config.generators.options[:rails][:template_engine]
-        end
-        
-        def file_name # :doc:
-          @_file_name ||= super + "_agent"
-        end
 
-        def application_agent_file_name
-          @_application_agent_file_name ||= if mountable_engine?
-            "app/agents/#{namespaced_path}/application_agent.rb"
-          else
-            "app/agents/application_agent.rb"
-          end
+      def test_framework
+        ::Rails.application.config.generators.options[:rails][:test_framework]
+      end
+
+      def template_engine
+        ::Rails.application.config.generators.options[:rails][:template_engine]
+      end
+
+      def file_name # :doc:
+        @_file_name ||= super + "_agent"
+      end
+
+      def application_agent_file_name
+        @_application_agent_file_name ||= if mountable_engine?
+          "app/agents/#{namespaced_path}/application_agent.rb"
+        else
+          "app/agents/application_agent.rb"
         end
+      end
     end
   end
 end

data/lib/generators/active_agent/install_generator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActiveAgent
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      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_layout_template
+        template "agent.text.erb", "app/views/layouts/agent.text.erb"
+      end
+    end
+  end
+end

data/lib/generators/active_agent/templates/active_agent.yml

@@ -0,0 +1,6 @@
+development:
+  openai:
+    service: "OpenAI"
+    api_key: <%%= Rails.application.credentials.dig(:openai, :api_key) %>
+    model: "gpt-4o-mini"
+    temperature: 0.7

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/agent.text.erb

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

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

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

metadata

@@ -1,112 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.6.9
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2025-03-26 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'
-description: A simple way to perform long running LLM background jobs and streaming
-  responses
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+description: The only agent-oriented AI framework designed for Rails, where Agents
+  are Controllers. Build AI features with less complexity using the MVC conventions
+  you love.
 email: jusbowen@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- Rakefile
 - lib/active_agent.rb
 - 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
@@ -120,6 +156,7 @@ files:
 - lib/active_agent/generation_methods.rb
 - lib/active_agent/generation_provider.rb
 - lib/active_agent/generation_provider/README.md
+- lib/active_agent/generation_provider/anthropic_provider.rb
 - lib/active_agent/generation_provider/base.rb
 - lib/active_agent/generation_provider/open_ai_provider.rb
 - lib/active_agent/generation_provider/response.rb
@@ -135,18 +172,26 @@ 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
 - 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.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
-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: