activeagent 0.6.0rc1 → 0.6.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b5ef5633bece3cdce9d9dba58e499b48c57d80c3a461ceda58adbff738e36a
-  data.tar.gz: 9cc9065b10e9bbf0f8fdeba420fe7b9518b7e97f2d32e3bf11af55babd697009
+  metadata.gz: a9496edf8536e904969a006a14d65bd69c3257f4db22d80e859a977646a02513
+  data.tar.gz: 0b35eb065fe146ee027d72789826ea3af793e57140d8aefead79d73586548e6e
 SHA512:
-  metadata.gz: 6849b7f94803261d8049ed092aaa8176003b85d5353202aa1a96160860bb07dd98fc9171308c5ed4ea3c9644b6aa68cf09c9c5c827ec7a45300eb14b44e9f1e0
-  data.tar.gz: db67a92dd9f9344fd50234caae1641bb70d57ca61200bbea98a177a175c791de886ee3ac42bc807e0e824d95c94adb6e7765908fec3f50cfc4f73aeb66e21c4f
+  metadata.gz: 65ce7639ce9106b99e827600b7582776413cdeb69b7de28cf7ed80e0e496ebc1be6ea613ab9f67e944bb7837344458d3709a2065eb2725fc9b7263c08146f08d
+  data.tar.gz: c702c8618b701979dee4871ab200e7fd60d5c09fc2670926a9f77e1c0975ab14e2a5e9b30df2eccce9276440f5e6baf396d16320aabff67a1fbbd332a88b5379

data/lib/active_agent/action_prompt/base.rb

@@ -104,7 +104,6 @@ module ActiveAgent
         # Define how the agent should generate content
         def generate_with(provider, **options)
           self.generation_provider = provider
-
           if options.has_key?(:instructions) || (self.options || {}).empty?
             # Either instructions explicitly provided, or no inherited options exist
             self.options = (self.options || {}).merge(options)
@@ -245,11 +244,13 @@ module ActiveAgent
         current_context = context.clone
         # Merge action params with original params to preserve context
         original_params = current_context.params || {}
+
         if action.params.is_a?(Hash)
           self.params = original_params.merge(action.params)
         else
           self.params = original_params
         end
+
         process(action.name)
         context.message.role = :tool
         context.message.action_id = action.id
@@ -373,6 +374,10 @@ module ActiveAgent
         if headers[:message].present? && headers[:message].is_a?(ActiveAgent::ActionPrompt::Message)
           headers[:body] = headers[:message].content
           headers[:role] = headers[:message].role
+        elsif headers[:message].present? && headers[:message].is_a?(Array)
+          # Handle array of multipart content like [{type: "text", text: "..."}, {type: "file", file: {...}}]
+          headers[:body] = headers[:message]
+          headers[:role] = :user
         elsif headers[:message].present? && headers[:message].is_a?(String)
           headers[:body] = headers[:message]
           headers[:role] = :user
@@ -394,7 +399,6 @@ module ActiveAgent
             ActiveAgent::ActionPrompt::Message.new(content: headers[:body], content_type: "input_text")
           ]
         end
-
         headers
       end
 
@@ -421,7 +425,7 @@ module ActiveAgent
         # Extract runtime options from prompt_options (exclude instructions as it has special template logic)
         runtime_options = prompt_options.slice(
           :model, :temperature, :max_tokens, :stream, :top_p, :frequency_penalty,
-          :presence_penalty, :response_format, :seed, :stop, :tools_choice, :data_collection
+          :presence_penalty, :response_format, :seed, :stop, :tools_choice, :data_collection, :plugins
         )
         # Handle explicit options parameter
         explicit_options = prompt_options[:options] || {}

data/lib/active_agent/action_prompt/message.rb

@@ -27,7 +27,7 @@ module ActiveAgent
         @metadata = attributes[:metadata] || {}
         @charset = attributes[:charset] || "UTF-8"
         @content = attributes[:content] || ""
-        @content_type = attributes[:content_type] || "text/plain"
+        @content_type = detect_content_type(attributes)
         @role = attributes[:role] || :user
         @raw_actions = attributes[:raw_actions]
         @requested_actions = attributes[:requested_actions] || []
@@ -85,6 +85,22 @@ module ActiveAgent
 
       private
 
+      def detect_content_type(attributes)
+        # If content_type is explicitly provided, use it
+        return attributes[:content_type] if attributes[:content_type]
+
+        # If content is an array with multipart/mixed content, set appropriate type
+        if attributes[:content].is_a?(Array)
+          # Check if it contains multimodal content (text, image_url, file, etc.)
+          has_multimodal = attributes[:content].any? do |item|
+            item.is_a?(Hash) && (item[:type] || item["type"])
+          end
+          has_multimodal ? "multipart/mixed" : "array"
+        else
+          "text/plain"
+        end
+      end
+
       def validate_role
         unless VALID_ROLES.include?(role.to_s)
           raise ArgumentError, "Invalid role: #{role}. Valid roles are: #{VALID_ROLES.join(", ")}"

data/lib/active_agent/action_prompt/prompt.rb

@@ -34,7 +34,7 @@ module ActiveAgent
       end
 
       def multimodal?
-        @multimodal ||= @message&.content.is_a?(Array) || @messages.any? { |m| m.content.is_a?(Array) }
+        @multimodal ||= @message&.content.is_a?(Array) || @messages.any? { |m| m&.content.is_a?(Array) }
       end
 
       def messages=(messages)

data/lib/active_agent/generation_provider/base.rb

@@ -10,6 +10,7 @@ module ActiveAgent
       include ParameterBuilder
 
       class GenerationProviderError < StandardError; end
+
       attr_reader :client, :config, :prompt, :response, :access_token, :model_name
 
       def initialize(config)

data/lib/active_agent/generation_provider/error_handling.rb

@@ -46,7 +46,6 @@ module ActiveAgent
 
       def handle_generation_error(error)
         error_message = format_error_message(error)
-
         # Create new error with original backtrace preserved
         new_error = ActiveAgent::GenerationProvider::Base::GenerationProviderError.new(error_message)
         new_error.set_backtrace(error.backtrace) if error.respond_to?(:backtrace)
@@ -61,7 +60,9 @@ module ActiveAgent
       end
 
       def format_error_message(error)
-        message = if error.respond_to?(:message)
+        message = if error.respond_to?(:response)
+          error.response[:body]
+        elsif error.respond_to?(:message)
           error.message
         elsif error.respond_to?(:to_s)
           error.to_s

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -25,7 +25,13 @@ module ActiveAgent
         @access_token ||= config["api_key"] || config["access_token"] || OpenAI.configuration.access_token || ENV["OPENAI_ACCESS_TOKEN"]
         @organization_id = config["organization_id"] || OpenAI.configuration.organization_id || ENV["OPENAI_ORGANIZATION_ID"]
         @admin_token = config["admin_token"] || OpenAI.configuration.admin_token || ENV["OPENAI_ADMIN_TOKEN"]
-        @client = OpenAI::Client.new(access_token: @access_token, uri_base: @host, organization_id: @organization_id)
+        @client = OpenAI::Client.new(
+          access_token: @access_token,
+          uri_base: @host,
+          organization_id: @organization_id,
+          admin_token: @admin_token,
+          log_errors: Rails.env.development?
+          )
 
         @model_name = config["model"] || "gpt-4o-mini"
       end

data/lib/active_agent/generation_provider/open_router_provider.rb

@@ -4,31 +4,6 @@ require_relative "open_ai_provider"
 module ActiveAgent
   module GenerationProvider
     class OpenRouterProvider < OpenAIProvider
-      # Vision-capable models on OpenRouter
-      VISION_MODELS = [
-        "openai/gpt-4-vision-preview",
-        "openai/gpt-4o",
-        "openai/gpt-4o-mini",
-        "anthropic/claude-3-5-sonnet",
-        "anthropic/claude-3-opus",
-        "anthropic/claude-3-sonnet",
-        "anthropic/claude-3-haiku",
-        "google/gemini-pro-1.5",
-        "google/gemini-pro-vision"
-      ].freeze
-
-      # Models that support structured output
-      STRUCTURED_OUTPUT_MODELS = [
-        "openai/gpt-4o",
-        "openai/gpt-4o-2024-08-06",
-        "openai/gpt-4o-mini",
-        "openai/gpt-4o-mini-2024-07-18",
-        "openai/gpt-4-turbo",
-        "openai/gpt-4-turbo-2024-04-09",
-        "openai/gpt-3.5-turbo-0125",
-        "openai/gpt-3.5-turbo-1106"
-      ].freeze
-
       def initialize(config)
         @config = config
         @access_token = config["api_key"] || config["access_token"] ||
@@ -52,7 +27,7 @@ module ActiveAgent
         @client = OpenAI::Client.new(
           uri_base: "https://openrouter.ai/api/v1",
           access_token: @access_token,
-          log_errors: true,
+          log_errors: Rails.env.development?,
           default_headers: openrouter_headers
         )
       end
@@ -69,15 +44,6 @@ module ActiveAgent
         handle_openrouter_error(e)
       end
 
-      # Helper methods for checking model capabilities
-      def supports_vision?(model = @model_name)
-        VISION_MODELS.include?(model)
-      end
-
-      def supports_structured_output?(model = @model_name)
-        STRUCTURED_OUTPUT_MODELS.include?(model)
-      end
-
       protected
 
       def build_provider_parameters
@@ -88,6 +54,32 @@ module ActiveAgent
         add_openrouter_params(params)
       end
 
+      def format_content_item(item)
+        # Handle OpenRouter-specific content formats
+        if item.is_a?(Hash)
+          case item[:type] || item["type"]
+          when "file"
+            # Convert file type to image_url for OpenRouter PDF support
+            file_data = item.dig(:file, :file_data) || item.dig("file", "file_data")
+            if file_data
+              {
+                type: "image_url",
+                image_url: {
+                  url: file_data
+                }
+              }
+            else
+              item
+            end
+          else
+            # Use default formatting for other types
+            super
+          end
+        else
+          super
+        end
+      end
+
       private
 
       def default_app_name
@@ -158,6 +150,10 @@ module ActiveAgent
           parameters[:provider] = build_provider_preferences
         end
 
+        # Add plugins (e.g., for PDF processing)
+
+        parameters[:plugins] = prompt.options[:plugins] if prompt.options[:plugins].present?
+        parameters[:models] = prompt.options[:fallback_models] if prompt.options[:enable_fallbacks] && prompt.options[:fallback_models].present?
         parameters
       end
 
@@ -208,7 +204,6 @@ module ActiveAgent
         parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
 
         response = @client.chat(parameters: parameters)
-
         # Log if fallback was used
         if response.respond_to?(:headers) && response.headers["x-model"] != @model_name
           Rails.logger.info "[OpenRouter] Fallback model used: #{response.headers['x-model']}" if defined?(Rails)
@@ -229,7 +224,6 @@ module ActiveAgent
         message = handle_message(message_json) if message_json
 
         update_context(prompt: prompt, message: message, response: response) if message
-
         # Create response with OpenRouter metadata
         @response = ActiveAgent::GenerationProvider::Response.new(
           prompt: prompt,
@@ -315,7 +309,7 @@ module ActiveAgent
           handle_timeout_error(error)
         else
           # Fall back to parent error handling
-          super(error) if defined?(super)
+          raise GenerationProviderError, error, error.backtrace
         end
       end
 

data/lib/active_agent/generation_provider/parameter_builder.rb

@@ -46,7 +46,7 @@ module ActiveAgent
         options = {}
 
         # Common options that map directly
-        [ :stream, :top_p, :frequency_penalty, :presence_penalty, :seed, :stop, :user ].each do |key|
+        [ :stream, :top_p, :frequency_penalty, :presence_penalty, :seed, :stop, :user, :plugins ].each do |key|
           options[key] = @prompt.options[key] if @prompt.options.key?(key)
         end
 

data/lib/active_agent/railtie.rb

@@ -68,7 +68,13 @@ module ActiveAgent
 
     initializer "active_agent.compile_config_methods" do
       ActiveSupport.on_load(:active_agent) do
-        config.compile_methods! if config.respond_to?(:compile_methods!)
+        config.compile_methods! if config.class.respond_to?(:compile_methods!)
+      end
+    end
+
+    initializer "active_agent.inflections" do
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.acronym "AI"
       end
     end
 

data/lib/active_agent/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.6.0rc1
+  version: 0.6.0rc2
 platform: ruby
 authors:
 - Justin Bowen
@@ -18,7 +18,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +38,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,35 +108,147 @@ dependencies:
         version: '7.2'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-openai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.2.0
+- !ruby/object:Gem::Dependency
+  name: ruby-anthropic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails-omakase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '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.