activeagent 0.6.0rc4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 805b4d2cce3173788f3bb281e40973d8782891937b5220654b7dad53a9f701ec
-  data.tar.gz: 968f534f94d4e32541f1d87e21854add0f4bf8c9e851ba75f7599291a0b384b9
+  metadata.gz: 56c61e9a6a6173d572792952121413f72d49d9b9bcee932a350666d845236465
+  data.tar.gz: 86267a64dea6c8eef7bf890fe10fcb1ef1a2b2d09ddeab3f0a9d1d25bb6465fd
 SHA512:
-  metadata.gz: ec13c2dd2d8deb4fd4adb1a6f302de6a7bb5057fad1cd45f27fdecc6b8bea7b5496f3078e7a1f40168de9b4efaa8e4a2abf1cf1bd2865fa929912c58adce561c
-  data.tar.gz: a564772159ac558c8350d770977fc9b7b509c814435a748cac61af89bd87dc196614b45cc9f33db7bce8951568f659730bfe4cf95fd274f145ae00bb78510af6
+  metadata.gz: c173eac89c75335d474c533a41f3137ef2279c5aef1a90d60c93270383dd77c1e15b557c1e006e41c6f15f47f0fce12502c924fd939d58cac85978b97d749d2f
+  data.tar.gz: 6bd6d686a0a1a2613206f8b6d50d093a343e7913bd0dbdaac669abb95895a0306f114cc77e2cea01280981b5b5fff403d0edc6de1b1912cfc822ecc2935de961

data/README.md

@@ -2,9 +2,9 @@
   <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/2bad263a-c09f-40b6-94ba-fff8e346d65d">
   <img alt="activeagents_banner" src="https://github.com/user-attachments/assets/0ebbaa2f-c6bf-4d40-bb77-931015a14be3">
 </picture>
-*Build AI in Rails*
 
 
+> *Build AI in Rails*
 >
 > *Now Agents are Controllers*
 >

data/lib/active_agent/action_prompt/base.rb

@@ -280,7 +280,7 @@ module ActiveAgent
       def initialize # :nodoc:
         super
         @_prompt_was_called = false
-        @_context = ActiveAgent::ActionPrompt::Prompt.new(options: self.class.options || {}, agent_instance: self)
+        @_context = ActiveAgent::ActionPrompt::Prompt.new(options: self.class.options&.deep_dup || {}, agent_instance: self)
       end
 
       def process(method_name, *args) # :nodoc:
@@ -444,7 +444,10 @@ module ActiveAgent
           :presence_penalty, :response_format, :seed, :stop, :tools_choice, :plugins,
 
           # OpenRouter Provider Settings
-          :data_collection, :require_parameters, :only, :ignore, :quantizations, :sort, :max_price
+          :data_collection, :require_parameters, :only, :ignore, :quantizations, :sort, :max_price,
+
+          # Built-in Tools Support (OpenAI Responses API)
+          :tools
         )
         # Handle explicit options parameter
         explicit_options = prompt_options[:options] || {}

data/lib/active_agent/callbacks.rb

@@ -7,6 +7,7 @@ module ActiveAgent
     included do
       include ActiveSupport::Callbacks
       define_callbacks :generation, skip_after_callbacks_if_terminated: true
+      define_callbacks :embedding, skip_after_callbacks_if_terminated: true
     end
 
     module ClassMethods
@@ -18,6 +19,14 @@ module ActiveAgent
             set_callback(:generation, callback, name, options)
           end
         end
+
+        # # Defines a callback that will get called right before/after/around the
+        # # embedding provider method.
+        define_method "#{callback}_embedding" do |*names, &blk|
+          _insert_callbacks(names, blk) do |name, options|
+            set_callback(:embedding, callback, name, options)
+          end
+        end
       end
     end
   end

data/lib/active_agent/generation.rb

@@ -50,6 +50,18 @@ module ActiveAgent
       end
     end
 
+    def embed_now
+      processed_agent.handle_exceptions do
+        processed_agent.run_callbacks(:embedding) do
+          processed_agent.embed
+        end
+      end
+    end
+
+    def embed_later(options = {})
+      enqueue_generation :embed_now, options
+    end
+
     private
 
     def processed_agent

data/lib/active_agent/generation_provider/anthropic_provider.rb

@@ -4,7 +4,7 @@ begin
   gem "ruby-anthropic", "~> 0.4.2"
   require "anthropic"
 rescue LoadError
-  raise LoadError, "The 'ruby-anthropic' gem is required for AnthropicProvider. Please add it to your Gemfile and run `bundle install`."
+  raise LoadError, "The 'ruby-anthropic ~> 0.4.2' gem is required for AnthropicProvider. Please add it to your Gemfile and run `bundle install`."
 end
 
 require "active_agent/action_prompt/action"

data/lib/active_agent/generation_provider/error_handling.rb

@@ -60,7 +60,7 @@ module ActiveAgent
       end
 
       def format_error_message(error)
-        message = if error.respond_to?(:response)
+        message = if error.respond_to?(:response) && error.response
           error.response[:body]
         elsif error.respond_to?(:message)
           error.message

data/lib/active_agent/generation_provider/ollama_provider.rb

@@ -9,7 +9,56 @@ module ActiveAgent
         @access_token ||= config["api_key"] || config["access_token"] || ENV["OLLAMA_API_KEY"] || ENV["OLLAMA_ACCESS_TOKEN"]
         @model_name = config["model"]
         @host = config["host"] || "http://localhost:11434"
-        @client = OpenAI::Client.new(uri_base: @host, access_token: @access_token, log_errors: true)
+        @api_version = config["api_version"] || "v1"
+        @client = OpenAI::Client.new(uri_base: @host, access_token: @access_token, log_errors: Rails.env.development?, api_version: @api_version)
+      end
+
+      protected
+
+      def format_error_message(error)
+        # Check for various connection-related errors
+        connection_errors = [
+          Errno::ECONNREFUSED,
+          Errno::EADDRNOTAVAIL,
+          Errno::EHOSTUNREACH,
+          Net::OpenTimeout,
+          Net::ReadTimeout,
+          SocketError,
+          Faraday::ConnectionFailed
+        ]
+
+        if connection_errors.any? { |klass| error.is_a?(klass) } ||
+            (error.message&.include?("Failed to open TCP connection") ||
+             error.message&.include?("Connection refused"))
+          "Unable to connect to Ollama at #{@host}. Please ensure Ollama is running on the configured host and port.\n" \
+          "You can start Ollama with: `ollama serve`\n" \
+          "Or update your configuration to point to the correct host."
+        else
+          super
+        end
+      end
+
+      def embeddings_parameters(input: prompt.message.content, model: "nomic-embed-text")
+        {
+          model: @config["embedding_model"] || model,
+          input: input
+        }
+      end
+
+      def embeddings_response(response, request_params = nil)
+        # Ollama can return either format:
+        # 1. OpenAI-compatible: { "data": [{ "embedding": [...] }] }
+        # 2. Native Ollama: { "embedding": [...] }
+        embedding = response.dig("data", 0, "embedding") || response.dig("embedding")
+
+        message = ActiveAgent::ActionPrompt::Message.new(content: embedding, role: "assistant")
+
+        @response = ActiveAgent::GenerationProvider::Response.new(
+          prompt: prompt,
+          message: message,
+          raw_response: response,
+          raw_request: request_params
+        )
       end
     end
   end

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -2,7 +2,7 @@ begin
   gem "ruby-openai", ">= 8.1.0"
   require "openai"
 rescue LoadError
-  raise LoadError, "The 'ruby-openai' gem is required for OpenAIProvider. Please add it to your Gemfile and run `bundle install`."
+  raise LoadError, "The 'ruby-openai >= 8.1.0' gem is required for OpenAIProvider. Please add it to your Gemfile and run `bundle install`."
 end
 
 require "active_agent/action_prompt/action"
@@ -31,7 +31,7 @@ module ActiveAgent
           organization_id: @organization_id,
           admin_token: @admin_token,
           log_errors: Rails.env.development?
-          )
+        )
 
         @model_name = config["model"] || "gpt-4o-mini"
       end
@@ -92,10 +92,39 @@ module ActiveAgent
 
       private
 
-      # Now using modules, but we can override build_provider_parameters for OpenAI-specific needs
-      # The prompt_parameters method comes from ParameterBuilder module
-      # The format_tools method comes from ToolManagement module
-      # The provider_messages method comes from MessageFormatting module
+      # Override from ParameterBuilder to add web_search_options for Chat API
+      def build_provider_parameters
+        params = {}
+
+        # Check if we're using a model that supports web_search_options in Chat API
+        if chat_api_web_search_model? && @prompt.options[:web_search]
+          params[:web_search_options] = build_web_search_options(@prompt.options[:web_search])
+        end
+
+        params
+      end
+
+      def chat_api_web_search_model?
+        model = @prompt.options[:model] || @model_name
+        [ "gpt-4o-search-preview", "gpt-4o-mini-search-preview" ].include?(model)
+      end
+
+      def build_web_search_options(web_search_config)
+        options = {}
+
+        if web_search_config.is_a?(Hash)
+          options[:search_context_size] = web_search_config[:search_context_size] if web_search_config[:search_context_size]
+
+          if web_search_config[:user_location]
+            options[:user_location] = {
+              type: "approximate",
+              approximate: web_search_config[:user_location]
+            }
+          end
+        end
+
+        options
+      end
 
       def chat_response(response, request_params = nil)
         return @response if prompt.options[:stream]
@@ -123,7 +152,7 @@ module ActiveAgent
           role: message_json["role"].intern,
           action_requested: message_json["finish_reason"] == "tool_calls",
           raw_actions: message_json["tool_calls"] || [],
-          content_type: prompt.output_schema.present? ? "application/json" : "text/plain",
+          content_type: prompt.output_schema.present? ? "application/json" : "text/plain"
         )
 
         @response = ActiveAgent::GenerationProvider::Response.new(
@@ -161,14 +190,65 @@ module ActiveAgent
       end
 
       def responses_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @prompt.options[:temperature] || @config["temperature"] || 0.7, tools: @prompt.actions, structured_output: @prompt.output_schema)
+        # Build tools array, combining action tools with built-in tools
+        tools_array = build_tools_for_responses(tools)
+
         {
           model: model,
           input: ActiveAgent::GenerationProvider::ResponsesAdapter.new(@prompt).input,
-          tools: tools.presence,
+          tools: tools_array.presence,
           text: structured_output
         }.compact
       end
 
+      def build_tools_for_responses(action_tools)
+        tools = []
+
+        # Start with action tools (user-defined functions) if any
+        tools.concat(action_tools) if action_tools.present?
+
+        # Add built-in tools if specified in options[:tools]
+        if @prompt.options[:tools].present?
+          built_in_tools = @prompt.options[:tools]
+          built_in_tools = [ built_in_tools ] unless built_in_tools.is_a?(Array)
+
+          built_in_tools.each do |tool|
+            next unless tool.is_a?(Hash)
+
+            case tool[:type]
+            when "web_search_preview", "web_search"
+              web_search_tool = { type: "web_search_preview" }
+              web_search_tool[:search_context_size] = tool[:search_context_size] if tool[:search_context_size]
+              web_search_tool[:user_location] = tool[:user_location] if tool[:user_location]
+              tools << web_search_tool
+
+            when "image_generation"
+              image_gen_tool = { type: "image_generation" }
+              image_gen_tool[:size] = tool[:size] if tool[:size]
+              image_gen_tool[:quality] = tool[:quality] if tool[:quality]
+              image_gen_tool[:format] = tool[:format] if tool[:format]
+              image_gen_tool[:compression] = tool[:compression] if tool[:compression]
+              image_gen_tool[:background] = tool[:background] if tool[:background]
+              image_gen_tool[:partial_images] = tool[:partial_images] if tool[:partial_images]
+              tools << image_gen_tool
+
+            when "mcp"
+              mcp_tool = { type: "mcp" }
+              mcp_tool[:server_label] = tool[:server_label] if tool[:server_label]
+              mcp_tool[:server_description] = tool[:server_description] if tool[:server_description]
+              mcp_tool[:server_url] = tool[:server_url] if tool[:server_url]
+              mcp_tool[:connector_id] = tool[:connector_id] if tool[:connector_id]
+              mcp_tool[:authorization] = tool[:authorization] if tool[:authorization]
+              mcp_tool[:require_approval] = tool[:require_approval] if tool[:require_approval]
+              mcp_tool[:allowed_tools] = tool[:allowed_tools] if tool[:allowed_tools]
+              tools << mcp_tool
+            end
+          end
+        end
+
+        tools
+      end
+
       def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
         {
           model: model,

data/lib/active_agent/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.6.0rc4
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Bowen
@@ -249,6 +249,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cuprite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.40'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.40'
 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.