activeagent 0.5.0rc3 → 0.6.0rc1

data/lib/active_agent/log_subscriber.rb

@@ -20,25 +20,25 @@
 #         end
 #       end
 
-#       debug { event.payload[:mail] }
+#       debug { event.payload[:prompt] }
 #     end
 #     subscribe_log_level :deliver, :debug
 
-#     # An email was generated.
+#     # A prompt was rendered.
 #     def process(event)
 #       debug do
 #         agent = event.payload[:agent]
 #         action = event.payload[:action]
-#         "#{agent}##{action}: processed outbound mail in #{event.duration.round(1)}ms"
+#         "#{agent}##{action}: processed outbound prompt in #{event.duration.round(1)}ms"
 #       end
 #     end
 #     subscribe_log_level :process, :debug
 
-#     # Use the logger configured for ActionMailer::Base.
+#     # Use the logger configured for ActiveAgent::Base.
 #     def logger
-#       ActionMailer::Base.logger
+#       ActiveAgent::Base.logger
 #     end
 #   end
 # end
 
-# ActionMailer::LogSubscriber.attach_to :action_mailer
+# ActiveAgent::LogSubscriber.attach_to :active_agent

data/lib/active_agent/parameterized.rb

@@ -15,15 +15,16 @@ module ActiveAgent
     module ClassMethods
       def with(params = {})
         # Separate runtime options from regular params
-        runtime_options = params.extract!(:model, :temperature, :max_tokens, :stream, :top_p,
-                                          :frequency_penalty, :presence_penalty, :response_format,
-                                          :seed, :stop, :tools_choice, :user)
+        # runtime_options = params.extract!(:model, :temperature, :max_tokens, :stream, :top_p,
+        #                                   :frequency_penalty, :presence_penalty, :response_format,
+        #                                   :seed, :stop, :tools_choice, :user)
 
-        # Pass runtime options as :options parameter
-        params[:options] = runtime_options if runtime_options.any?
+        # # Pass runtime options as :options parameter
+        # params[:options] = runtime_options if runtime_options.any?
 
         ActiveAgent::Parameterized::Agent.new(self, params)
       end
+      alias_method :prompt_with, :with
     end
 
     class Agent

data/lib/active_agent/sanitizers.rb

@@ -0,0 +1,40 @@
+module ActiveAgent
+  module Sanitizers
+    extend ActiveSupport::Concern
+
+    SECRETS_KEYS = %w[access_token api_key]
+
+    class_methods do
+      # @return [Hash] The current sanitizers.
+      def sanitizers
+        @sanitizers ||= begin
+          sanitizers = {}
+
+          config.each do |provider, credentials|
+            credentials.slice(*SECRETS_KEYS).compact.each do |name, secret|
+              next if secret.blank?
+
+              sanitizers[secret] = "<#{provider.upcase}_#{name.upcase}>"
+            end
+          end
+
+          sanitizers
+        end
+      end
+
+      # return [void]
+      def sanitizers_reset!
+        @sanitizers = nil
+      end
+
+      # @return [String] The sanitized string with sensitive data replaced by placeholders.
+      def sanitize_credentials(string)
+        sanitizers.each do |secret, placeholder|
+          string = string.gsub(secret, placeholder)
+        end
+
+        string
+      end
+    end
+  end
+end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.5.0rc3"
+  VERSION = "0.6.0rc1"
 end

data/lib/active_agent.rb

@@ -1,9 +1,11 @@
 require "yaml"
 require "abstract_controller"
+require "active_agent/configuration"
 require "active_agent/generation_provider"
 require "active_agent/version"
 require "active_agent/deprecator"
 require "active_agent/railtie" if defined?(Rails)
+require "active_agent/sanitizers"
 
 require "active_support"
 require "active_support/rails"
@@ -12,6 +14,7 @@ require "active_support/core_ext/module/attr_internal"
 require "active_support/core_ext/string/inflections"
 require "active_support/lazy_load_hooks"
 module ActiveAgent
+  include ActiveAgent::Sanitizers
   extend ActiveSupport::Autoload
 
   eager_autoload do
@@ -23,7 +26,6 @@ module ActiveAgent
   autoload :InlinePreviewInterceptor
   autoload :PromptHelper
   autoload :Generation
-  autoload :GenerationMethods
   autoload :GenerationProvider
   autoload :QueuedGeneration
   autoload :Parameterized
@@ -34,11 +36,6 @@ module ActiveAgent
   class << self
     attr_accessor :config
 
-    def filter_credential_keys(example)
-      example.gsub(Rails.application.credentials.dig(:openai, :api_key), "<OPENAI_API_KEY>")
-        .gsub(Rails.application.credentials.dig(:open_router, :api_key), "<OPEN_ROUTER_API_KEY>")
-    end
-
     def eager_load!
       super
 
@@ -47,10 +44,14 @@ module ActiveAgent
       end
     end
 
+    # @return [void]
     def configure
       yield self
+
+      sanitizers_reset!
     end
 
+    # @return [void]
     def load_configuration(file)
       if File.exist?(file)
         config_file = YAML.load(ERB.new(File.read(file)).result, aliases: true)
@@ -59,6 +60,8 @@ module ActiveAgent
       else
         @config = {}
       end
+
+      sanitizers_reset!
     end
   end
 end

data/lib/generators/erb/agent_generator.rb

@@ -20,6 +20,9 @@ module Erb # :nodoc:
           end
         end
 
+        instructions_path = File.join(view_base_path, "instructions.text.erb")
+        template "instructions.text.erb.tt", instructions_path
+
         actions.each do |action|
           @action = action
 

data/lib/generators/erb/templates/instructions.text.erb.tt

@@ -0,0 +1 @@
+Instructions for an AI agent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc3
+  version: 0.6.0rc1
 platform: ruby
 authors:
 - Justin Bowen
@@ -16,9 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,9 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -36,9 +36,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,9 +46,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -56,9 +56,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,9 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -76,9 +76,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,9 +86,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -96,9 +96,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,37 +106,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: 8.0.2.1
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.2.1
 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.
@@ -157,6 +157,7 @@ files:
 - lib/active_agent/base.rb
 - lib/active_agent/callbacks.rb
 - lib/active_agent/collector.rb
+- lib/active_agent/configuration.rb
 - lib/active_agent/deprecator.rb
 - lib/active_agent/generation.rb
 - lib/active_agent/generation_job.rb
@@ -164,11 +165,17 @@ files:
 - lib/active_agent/generation_provider/anthropic_provider.rb
 - lib/active_agent/generation_provider/base.rb
 - lib/active_agent/generation_provider/base_adapter.rb
+- lib/active_agent/generation_provider/error_handling.rb
+- lib/active_agent/generation_provider/log_subscriber.rb
+- lib/active_agent/generation_provider/message_formatting.rb
 - lib/active_agent/generation_provider/ollama_provider.rb
 - lib/active_agent/generation_provider/open_ai_provider.rb
 - lib/active_agent/generation_provider/open_router_provider.rb
+- lib/active_agent/generation_provider/parameter_builder.rb
 - lib/active_agent/generation_provider/response.rb
 - lib/active_agent/generation_provider/responses_adapter.rb
+- lib/active_agent/generation_provider/stream_processing.rb
+- lib/active_agent/generation_provider/tool_management.rb
 - lib/active_agent/inline_preview_interceptor.rb
 - lib/active_agent/log_subscriber.rb
 - lib/active_agent/parameterized.rb
@@ -177,6 +184,7 @@ files:
 - lib/active_agent/queued_generation.rb
 - lib/active_agent/railtie.rb
 - lib/active_agent/rescuable.rb
+- lib/active_agent/sanitizers.rb
 - lib/active_agent/service.rb
 - lib/active_agent/test_case.rb
 - lib/active_agent/version.rb
@@ -190,6 +198,7 @@ files:
 - lib/generators/active_agent/templates/application_agent.rb.tt
 - lib/generators/erb/agent_generator.rb
 - lib/generators/erb/install_generator.rb
+- lib/generators/erb/templates/instructions.text.erb.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