activeagent 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1deba19c874b6abb36731bcee93bddf79bc193a3443a234cc811d9a4cc8383
-  data.tar.gz: 6f8847ab0d5eebf0ce26a8425f7630c884f0b9af71384c67325e3c06a8b0a8ae
+  metadata.gz: 90c3dbcc6a09014256fc36ac0bf88de83aa6a85d95c688be1eb289dde397c633
+  data.tar.gz: 6bdf588db4ab2809efaddde5ee7b06fd58ad59e1b5b3479e6c653828d90a4ad9
 SHA512:
-  metadata.gz: 767f039bd0af4f600a34becaac7bb2d04d2f8b768aef11242191f8a355b4a442c9c10690fe25a1a7f8e0da8b27e7216025c6f882c6d6002e5da9d0a9e876f1cb
-  data.tar.gz: 30725fb2369bd3b8dc23aa9d41e7d8a9843c3c8dd0aa629ace4bbd4cc217077339684ae0925cc6ea330c1e018b444a66057bcf5854b5bebf2bcb6a14bf57a322
+  metadata.gz: a70e79c1a1b0f683ac3322476b9f2cdaa70deaf3f8e035d2d5307e8fb6561ea5cc5b2589edfa1b2e3a68e28a2db0806d591d1f6726cbd6ab39ed512a072388db
+  data.tar.gz: a94dd4a891041044b02117ddc2bcf448cbf1c31c764fbaf8e3cd88b0b81cddf636bb90cac2ddfcb4706ec91b46da2490fdb24fd1e967d9aa200e95ca655a8caf

data/lib/active_agent/concerns/view.rb

@@ -142,7 +142,7 @@ module ActiveAgent
 
       return if !strict && !lookup_context.exists?(template_name, _prefixes, false, [], **options)
 
-      template = lookup_context.find_template(template_name, _prefixes, false, [], **options)
+      template = lookup_context.find(template_name, _prefixes, false, [], **options)
 
       render_to_string(template: template.virtual_path, locals:, layout: false).chomp.presence
     end

data/lib/active_agent/dashboard/app/models/active_agent/dashboard/agent.rb

@@ -71,7 +71,7 @@ module ActiveAgent
       ].freeze
 
       # Available providers
-      PROVIDERS = %w[openai anthropic ollama openrouter].freeze
+      PROVIDERS = %w[openai anthropic ollama openrouter requesty].freeze
 
       # Returns the configuration as a hash for versioning
       def configuration_snapshot

data/lib/active_agent/providers/anthropic/request.rb

@@ -71,7 +71,9 @@ module ActiveAgent
         # @raise [ArgumentError] when gem model validation fails
         def initialize(**params)
           # Step 1: Extract custom fields that gem doesn't support
-          @response_format = params.delete(:response_format)
+          # Read response_format without deleting - normalize_params will delete and convert it
+          # to output_config for json_schema, or drop it for other types.
+          @response_format = params[:response_format]
           @stream = params.delete(:stream)
           anthropic_beta = params.delete(:anthropic_beta)
 

data/lib/active_agent/providers/anthropic/transforms.rb

@@ -31,6 +31,12 @@ module ActiveAgent
             params[:tools] = normalize_tools(params[:tools]) if params[:tools]
             params[:tool_choice] = normalize_tool_choice(params[:tool_choice]) if params[:tool_choice]
 
+            # Normalize json_schema response_format → output_config (Anthropic's native structured output field)
+            if params[:response_format]
+              output_config = normalize_response_format(params.delete(:response_format))
+              params[:output_config] = output_config if output_config
+            end
+
             # Handle mcps parameter (common format) -> transforms to mcp_servers (provider format)
             if params[:mcps]
               params[:mcp_servers] = normalize_mcp_servers(params.delete(:mcps))
@@ -159,6 +165,87 @@ module ActiveAgent
             end
           end
 
+          # Normalizes response_format to Anthropic output_config structure.
+          #
+          # Supported (ActiveAgent common format):
+          #   { type: "json_schema", json_schema: { name: "...", schema: {...}, strict: true } }
+          # → { format: { type: "json_schema", schema: {...} } }
+          #
+          # Notes:
+          # - Anthropic requires `additionalProperties: false` on all object schemas.
+          #   This is auto-injected into any object schemas that don't have it set.
+          # - Anthropic does not use OpenAI's `name` or `strict` fields in output_config.format.
+          # - json_object is not handled here; it remains prompt-emulated.
+          # - text is not handled here; Anthropic returns plain text by default.
+          #
+          # @param format [Hash, Symbol, String] ActiveAgent common response_format
+          # @return [Hash] Anthropic output_config hash, or nil if not applicable
+          def normalize_response_format(format)
+            case format
+            when Hash
+              format_hash = format.deep_symbolize_keys
+
+              if format_hash[:type].to_s == "json_schema"
+                schema = format_hash[:json_schema]&.dig(:schema)
+                if schema
+                  schema = inject_additional_properties(schema.deep_dup)
+                end
+                {
+                  format: {
+                    type: "json_schema",
+                    schema: schema
+                  }.compact
+                }
+              elsif format_hash[:type].to_s == "json_object"
+                # json_object is not handled here; it remains prompt-emulated.
+                nil
+              elsif format_hash[:type].to_s == "text"
+                # text is not handled here; it remains prompt-emulated.
+                nil
+              else
+                # Pass through (already properly structured or Anthropic native format)
+                format_hash
+              end
+            when Symbol, String
+              # Bare :json_schema without a schema cannot use native output_config.
+              # Anthropic requires a valid JSON Schema — return nil to fall back.
+              nil
+            else
+              format
+            end
+          end
+
+          # Recursively injects `additionalProperties: false` into all object schemas.
+          #
+          # Anthropic's structured output API requires this field on all object types.
+          # Only inserts when not already explicitly set by the user.
+          #
+          # @param schema [Hash] JSON Schema hash
+          # @return [Hash] schema with additionalProperties injected
+          def inject_additional_properties(schema)
+            return schema unless schema.is_a?(Hash)
+
+            if schema[:type] == "object" && !schema.key?(:additionalProperties)
+              schema[:additionalProperties] = false
+            end
+
+            # Recurse into nested schemas
+            schema[:properties]&.each_value { |prop| inject_additional_properties(prop) }
+            schema[:items]&.then { |items| inject_additional_properties(items) }
+            schema[:anyOf]&.each { |s| inject_additional_properties(s) }
+            schema[:oneOf]&.each { |s| inject_additional_properties(s) }
+            schema[:allOf]&.each { |s| inject_additional_properties(s) }
+
+            if schema[:definitions]
+              schema[:definitions].each_value { |defn| inject_additional_properties(defn) }
+            end
+            if schema[:"$defs"]
+              schema[:"$defs"].each_value { |defn| inject_additional_properties(defn) }
+            end
+
+            schema
+          end
+
           # Merges consecutive same-role messages into single messages with multiple content blocks.
           #
           # Required by Anthropic API - consecutive messages with the same role must be combined.
@@ -437,6 +524,7 @@ module ActiveAgent
                 msg.delete(:model)
                 msg.delete(:stop_reason)
                 msg.delete(:stop_sequence)
+                msg.delete(:stop_details)
                 msg.delete(:type)
                 msg.delete(:usage)
               end

data/lib/active_agent/providers/bedrock_provider.rb

@@ -15,11 +15,11 @@ module ActiveAgent
     #   bedrock:
     #     service: "Bedrock"
     #     aws_region: "eu-west-2"
-    #     model: "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
+    #     model: "eu.anthropic.claude-sonnet-5-v1:0"
     #
     # @example Agent usage
     #   class SummaryAgent < ApplicationAgent
-    #     generate_with :bedrock, model: "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
+    #     generate_with :bedrock, model: "eu.anthropic.claude-sonnet-5-v1:0"
     #
     #     def summarize
     #       prompt(message: params[:message])

data/lib/active_agent/providers/mock/request.rb

@@ -22,16 +22,13 @@ module ActiveAgent
         attribute :stream, :boolean, default: false
         attribute :tools # Array of tool definitions
         attribute :tool_choice # Tool choice configuration
+        attribute :response_format
 
         # Common Format Compatibility
         def message=(value)
           self.messages ||= []
           self.messages << value
         end
-
-        def response_format
-          { type: "text" }
-        end
       end
     end
   end

data/lib/active_agent/providers/open_ai/chat_provider.rb

@@ -104,7 +104,7 @@ module ActiveAgent
 
             # If we have a delta, we need to update a message in the stack
             message = find_or_create_message(api_message.index)
-            message = message_merge_delta(message, api_message.delta.as_json.deep_symbolize_keys)
+            message_merge_delta(message, api_message.delta.deep_to_h)
 
             # Stream back content changes as they come in
             if api_message.delta.content
@@ -140,7 +140,7 @@ module ActiveAgent
         def process_function_calls(api_function_calls)
           api_function_calls.each do |api_function_call|
             content = instrument("tool_call.active_agent", tool_name: api_function_call.dig(:function, :name)) do
-              case api_function_call[:type]
+              case api_function_call[:type].to_s
               when "function"
                 process_tool_call_function(api_function_call[:function])
               else
@@ -245,7 +245,7 @@ module ActiveAgent
                 end
               end
             when String
-              hash[key] += value
+              hash[key] += value.to_s
             else
               hash[key] = value
             end

data/lib/active_agent/providers/requesty/_types.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "../open_ai/chat/_types"
+require_relative "options"
+
+module ActiveAgent
+  module Providers
+    module Requesty
+      # ActiveModel type for casting and serializing Requesty requests.
+      #
+      # Requesty is OpenAI-compatible, so requests use the same shape as the
+      # OpenAI Chat API. This delegates entirely to OpenAI::Chat::RequestType.
+      RequestType = ActiveAgent::Providers::OpenAI::Chat::RequestType
+    end
+  end
+end

data/lib/active_agent/providers/requesty/options.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative "../open_ai/options"
+
+module ActiveAgent
+  module Providers
+    module Requesty
+      # Configuration options for the Requesty provider.
+      #
+      # Extends OpenAI::Options, overriding the base URL to point at Requesty's
+      # OpenAI-compatible gateway and resolving the API key from REQUESTY_API_KEY.
+      # Requesty does not use organization or project identifiers.
+      #
+      # @example Basic configuration
+      #   options = Options.new(api_key: ENV["REQUESTY_API_KEY"])
+      #
+      # @see https://docs.requesty.ai
+      # @see https://app.requesty.ai/api-keys Requesty API Keys
+      class Options < ActiveAgent::Providers::OpenAI::Options
+        # @!attribute base_url
+        #   @return [String] API endpoint (default: "https://router.requesty.ai/v1")
+        attribute :base_url, :string, as: "https://router.requesty.ai/v1"
+
+        private
+
+        def resolve_api_key(kwargs)
+          kwargs[:api_key] ||
+            kwargs[:access_token] ||
+            ENV["REQUESTY_API_KEY"] ||
+            ENV["REQUESTY_ACCESS_TOKEN"]
+        end
+
+        # Not used as part of Requesty
+        def resolve_organization_id(kwargs) = nil
+        def resolve_project_id(kwargs)      = nil
+      end
+    end
+  end
+end

data/lib/active_agent/providers/requesty_provider.rb

@@ -0,0 +1,63 @@
+require_relative "_base_provider"
+
+require_gem!(:openai, __FILE__)
+
+require_relative "open_ai_provider"
+require_relative "requesty/_types"
+
+module ActiveAgent
+  module Providers
+    # Provides access to Requesty's OpenAI-compatible LLM gateway.
+    #
+    # Extends the OpenAI provider to work with Requesty's OpenAI-compatible API,
+    # enabling access to multiple AI models through a single interface using the
+    # +provider/model+ naming convention (e.g. +openai/gpt-4o-mini+).
+    #
+    # Requesty is a plain OpenAI-compatible gateway: requests, responses and
+    # transforms are identical to the OpenAI Chat API, so this provider reuses
+    # OpenAI::Chat::RequestType and OpenAI::Chat::Transforms directly. The only
+    # Requesty-specific configuration is the base URL and API key, which live in
+    # Requesty::Options.
+    #
+    # @example Configuration in active_agent.yml
+    #   requesty:
+    #     service: "Requesty"
+    #     api_key: <%= ENV["REQUESTY_API_KEY"] %>
+    #     model: "openai/gpt-4o-mini"
+    #
+    # @see OpenAI::ChatProvider
+    # @see https://docs.requesty.ai
+    class RequestyProvider < OpenAI::ChatProvider
+      # @return [String]
+      def self.service_name
+        "Requesty"
+      end
+
+      # @return [Class]
+      def self.options_klass
+        Requesty::Options
+      end
+
+      # @return [ActiveModel::Type::Value]
+      def self.prompt_request_type
+        OpenAI::Chat::RequestType.new
+      end
+
+      # @return [ActiveModel::Type::Value]
+      def self.embed_request_type
+        OpenAI::Embedding::RequestType.new
+      end
+
+      protected
+
+      # @see BaseProvider#api_response_normalize
+      # @param api_response [OpenAI::Models::ChatCompletion]
+      # @return [Hash] normalized response hash
+      def api_response_normalize(api_response)
+        return api_response unless api_response
+
+        OpenAI::Chat::Transforms.gem_to_hash(api_response)
+      end
+    end
+  end
+end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Justin Bowen
@@ -269,16 +269,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.26'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.26'
+- !ruby/object:Gem::Dependency
+  name: cgi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -297,14 +311,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -497,6 +511,9 @@ files:
 - lib/active_agent/providers/open_router_provider.rb
 - lib/active_agent/providers/openai_provider.rb
 - lib/active_agent/providers/openrouter_provider.rb
+- lib/active_agent/providers/requesty/_types.rb
+- lib/active_agent/providers/requesty/options.rb
+- lib/active_agent/providers/requesty_provider.rb
 - lib/active_agent/providers/ruby_llm/_types.rb
 - lib/active_agent/providers/ruby_llm/embedding_request.rb
 - lib/active_agent/providers/ruby_llm/messages/_types.rb
@@ -576,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Rails AI Agents Framework
 test_files: []