activeagent 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c61e9a6a6173d572792952121413f72d49d9b9bcee932a350666d845236465
-  data.tar.gz: 86267a64dea6c8eef7bf890fe10fcb1ef1a2b2d09ddeab3f0a9d1d25bb6465fd
+  metadata.gz: 974e983d62e399bd41c40a34fc0869730d157a8361d74236e327b9aea7cd05e2
+  data.tar.gz: 827c43ed21428ddc4138ecb8465af4265d432fbe3b3ca666f46f1b92b3598a44
 SHA512:
-  metadata.gz: c173eac89c75335d474c533a41f3137ef2279c5aef1a90d60c93270383dd77c1e15b557c1e006e41c6f15f47f0fce12502c924fd939d58cac85978b97d749d2f
-  data.tar.gz: 6bd6d686a0a1a2613206f8b6d50d093a343e7913bd0dbdaac669abb95895a0306f114cc77e2cea01280981b5b5fff403d0edc6de1b1912cfc822ecc2935de961
+  metadata.gz: 7ede550eb0aae62274dd13b631f862f202b172bb6ba40f837358bac71cc58760edc444722bc5a0aea747760b6317cf33630754992866fdc439a8263c1b670c03
+  data.tar.gz: 80671e11f47c81ef591ed496c9a1ee126f32762d588787d3cd15a79eaf229f7da0b1c8e69cedfbd33509df92030a399ae2faaa5c346f9cf1cbedfdc25ee80819

data/lib/active_agent/action_prompt/base.rb

@@ -36,6 +36,9 @@ module ActiveAgent
 
       helper ActiveAgent::PromptHelper
 
+      # Delegate response to generation_provider for easy access in callbacks
+      delegate :response, to: :generation_provider, allow_nil: true
+
       class_attribute :options
 
       class_attribute :default_params, default: {

data/lib/active_agent/action_prompt/message.rb

@@ -18,7 +18,7 @@ module ActiveAgent
       end
       VALID_ROLES = %w[system assistant user tool].freeze
 
-      attr_accessor :action_id, :action_name, :raw_actions, :generation_id, :content, :role, :action_requested, :requested_actions, :content_type, :charset, :metadata
+      attr_accessor :action_id, :action_name, :raw_actions, :generation_id, :content, :raw_content, :role, :action_requested, :requested_actions, :content_type, :charset, :metadata
 
       def initialize(attributes = {})
         @action_id = attributes[:action_id]
@@ -26,8 +26,9 @@ module ActiveAgent
         @generation_id = attributes[:generation_id]
         @metadata = attributes[:metadata] || {}
         @charset = attributes[:charset] || "UTF-8"
-        @content = attributes[:content] || ""
+        @raw_content = attributes[:content] || ""
         @content_type = detect_content_type(attributes)
+        @content = parse_content(@raw_content, @content_type)
         @role = attributes[:role] || :user
         @raw_actions = attributes[:raw_actions]
         @requested_actions = attributes[:requested_actions] || []
@@ -85,6 +86,20 @@ module ActiveAgent
 
       private
 
+      def parse_content(content, content_type)
+        # Auto-parse JSON content if content_type indicates JSON
+        if content_type&.match?(/json/i) && content.is_a?(String) && !content.empty?
+          begin
+            JSON.parse(content)
+          rescue JSON::ParserError
+            # If parsing fails, return the raw content
+            content
+          end
+        else
+          content
+        end
+      end
+
       def detect_content_type(attributes)
         # If content_type is explicitly provided, use it
         return attributes[:content_type] if attributes[:content_type]

data/lib/active_agent/generation_provider/anthropic_provider.rb

@@ -130,6 +130,7 @@ module ActiveAgent
 
         message = ActiveAgent::ActionPrompt::Message.new(
           content: content,
+          content_type: prompt.output_schema.present? ? "application/json" : "text/plain",
           role: "assistant",
           action_requested: response["stop_reason"] == "tool_use",
           requested_actions: handle_actions(response["content"].map { |c| c if c["type"] == "tool_use" }.reject { |m| m.blank? }.to_a),

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -170,7 +170,8 @@ module ActiveAgent
           role: message_json["role"].intern,
           action_requested: message_json["finish_reason"] == "tool_calls",
           raw_actions: message_json["tool_calls"] || [],
-          requested_actions: handle_actions(message_json["tool_calls"])
+          requested_actions: handle_actions(message_json["tool_calls"]),
+          content_type: prompt.output_schema.present? ? "application/json" : "text/plain"
         )
       end
 

data/lib/active_agent/railtie/schema_generator_extension.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "active_agent/schema_generator"
+
+module ActiveAgent
+  class SchemaGeneratorRailtie < Rails::Railtie
+    initializer "active_agent.schema_generator" do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Base.include ActiveAgent::SchemaGenerator
+      end
+
+      ActiveSupport.on_load(:active_model) do
+        if defined?(ActiveModel::Model)
+          ActiveModel::Model.include ActiveAgent::SchemaGenerator
+        end
+      end
+    end
+  end
+end

data/lib/active_agent/railtie.rb

@@ -5,6 +5,7 @@ require "active_agent"
 # require "active_agent/engine"
 require "rails"
 require "abstract_controller/railties/routes_helpers"
+require "active_agent/railtie/schema_generator_extension"
 
 module ActiveAgent
   class Railtie < Rails::Railtie # :nodoc:

data/lib/active_agent/schema_generator.rb

@@ -0,0 +1,265 @@
+# frozen_string_literal: true
+
+module ActiveAgent
+  module SchemaGenerator
+    extend ActiveSupport::Concern
+
+    included do
+      if defined?(ActiveRecord::Base) && self < ActiveRecord::Base
+        extend ActiveRecordClassMethods
+      elsif defined?(ActiveModel::Model) && self.included_modules.include?(ActiveModel::Model)
+        extend ActiveModelClassMethods
+      else
+        # Fallback for any class that includes this module
+        extend ActiveModelClassMethods
+      end
+    end
+
+    module ActiveRecordClassMethods
+      def to_json_schema(options = {})
+        ActiveAgent::SchemaGenerator::Builder.json_schema_from_model(self, options)
+      end
+    end
+
+    module ActiveModelClassMethods
+      def to_json_schema(options = {})
+        ActiveAgent::SchemaGenerator::Builder.json_schema_from_model(self, options)
+      end
+    end
+
+    class Builder
+      def self.json_schema_from_model(model_class, options = {})
+        schema = {
+          type: "object",
+          properties: {},
+          required: [],
+          additionalProperties: options.fetch(:additional_properties, false)
+        }
+
+        if defined?(ActiveRecord::Base) && model_class < ActiveRecord::Base
+          build_activerecord_schema(model_class, schema, options)
+        elsif defined?(ActiveModel::Model) && model_class.include?(ActiveModel::Model)
+          build_activemodel_schema(model_class, schema, options)
+        else
+          raise ArgumentError, "Model must be an ActiveRecord or ActiveModel class"
+        end
+
+        if options[:strict]
+          # OpenAI strict mode requires all properties to be in the required array
+          # So we add all properties to required if strict mode is enabled
+          schema[:required] = schema[:properties].keys.map(&:to_s).sort
+
+          {
+            name: options[:name] || model_class.name.underscore,
+            schema: schema,
+            strict: true
+          }
+        else
+          schema
+        end
+      end
+
+      class << self
+        private
+
+        def build_activerecord_schema(model_class, schema, options)
+          model_class.columns.each do |column|
+            next if options[:exclude]&.include?(column.name.to_sym)
+            next if column.name == "id" && !options[:include_id]
+
+            property = build_property_from_column(column)
+            schema[:properties][column.name] = property
+
+            if !column.null && column.name != "id"
+              schema[:required] << column.name
+            end
+          end
+
+          if model_class.reflect_on_all_associations.any?
+            add_associations_to_schema(model_class, schema, options)
+          end
+
+          if model_class.respond_to?(:validators)
+            add_validations_to_schema(model_class, schema, options)
+          end
+      end
+
+        def build_activemodel_schema(model_class, schema, options)
+        if model_class.respond_to?(:attribute_types)
+          model_class.attribute_types.each do |name, type|
+            next if options[:exclude]&.include?(name.to_sym)
+
+            property = build_property_from_type(type)
+            schema[:properties][name] = property
+          end
+        end
+
+        if model_class.respond_to?(:validators)
+          add_validations_to_schema(model_class, schema, options)
+        end
+      end
+
+        def build_property_from_column(column)
+        property = {
+          type: map_sql_type_to_json_type(column.type),
+          description: "#{column.name.humanize} field"
+        }
+
+        case column.type
+        when :string, :text
+          if column.limit
+            property[:maxLength] = column.limit
+          end
+        when :integer, :bigint
+          property[:type] = "integer"
+        when :decimal, :float
+          property[:type] = "number"
+        when :boolean
+          property[:type] = "boolean"
+        when :date, :datetime, :timestamp
+          property[:type] = "string"
+          property[:format] = (column.type == :date) ? "date" : "date-time"
+        when :json, :jsonb
+          property[:type] = "object"
+        else
+          property[:type] = "string"
+        end
+
+        if column.default
+          property[:default] = column.default
+        end
+
+        property
+      end
+
+        def build_property_from_type(type)
+        property = { type: "string" }
+
+        case type
+        when ActiveModel::Type::String
+          property[:type] = "string"
+        when ActiveModel::Type::Integer
+          property[:type] = "integer"
+        when ActiveModel::Type::Float, ActiveModel::Type::Decimal
+          property[:type] = "number"
+        when ActiveModel::Type::Boolean
+          property[:type] = "boolean"
+        when ActiveModel::Type::Date
+          property[:type] = "string"
+          property[:format] = "date"
+        when ActiveModel::Type::DateTime, ActiveModel::Type::Time
+          property[:type] = "string"
+          property[:format] = "date-time"
+        else
+          property[:type] = "string"
+        end
+
+        property
+      end
+
+        def map_sql_type_to_json_type(sql_type)
+        case sql_type
+        when :string, :text
+          "string"
+        when :integer, :bigint
+          "integer"
+        when :decimal, :float
+          "number"
+        when :boolean
+          "boolean"
+        when :json, :jsonb
+          "object"
+        when :array
+          "array"
+        else
+          "string"
+        end
+      end
+
+        def add_associations_to_schema(model_class, schema, options)
+        return unless options[:include_associations]
+
+        schema[:$defs] ||= {}
+
+        model_class.reflect_on_all_associations.each do |association|
+          next if options[:exclude_associations]&.include?(association.name)
+
+          case association.macro
+          when :has_many, :has_and_belongs_to_many
+            schema[:properties][association.name.to_s] = {
+              type: "array",
+              items: { "$ref": "#/$defs/#{association.name.to_s.singularize}" }
+            }
+            if options[:nested_associations]
+              nested_schema = json_schema_from_model(
+                association.klass,
+                options.merge(include_associations: false)
+              )
+              schema[:$defs][association.name.to_s.singularize] = nested_schema
+            end
+          when :has_one, :belongs_to
+            schema[:properties][association.name.to_s] = {
+              "$ref": "#/$defs/#{association.name}"
+            }
+            if options[:nested_associations]
+              nested_schema = json_schema_from_model(
+                association.klass,
+                options.merge(include_associations: false)
+              )
+              schema[:$defs][association.name.to_s] = nested_schema
+            end
+          end
+        end
+      end
+
+        def add_validations_to_schema(model_class, schema, options)
+        model_class.validators.each do |validator|
+          validator.attributes.each do |attribute|
+            next unless schema[:properties][attribute.to_s]
+
+            case validator
+            when ActiveModel::Validations::PresenceValidator
+              schema[:required] << attribute.to_s unless schema[:required].include?(attribute.to_s)
+            when ActiveModel::Validations::LengthValidator
+              if validator.options[:minimum]
+                schema[:properties][attribute.to_s][:minLength] = validator.options[:minimum]
+              end
+              if validator.options[:maximum]
+                schema[:properties][attribute.to_s][:maxLength] = validator.options[:maximum]
+              end
+            when ActiveModel::Validations::NumericalityValidator
+              if validator.options[:greater_than]
+                schema[:properties][attribute.to_s][:exclusiveMinimum] = validator.options[:greater_than]
+              end
+              if validator.options[:less_than]
+                schema[:properties][attribute.to_s][:exclusiveMaximum] = validator.options[:less_than]
+              end
+              if validator.options[:greater_than_or_equal_to]
+                schema[:properties][attribute.to_s][:minimum] = validator.options[:greater_than_or_equal_to]
+              end
+              if validator.options[:less_than_or_equal_to]
+                schema[:properties][attribute.to_s][:maximum] = validator.options[:less_than_or_equal_to]
+              end
+            when ActiveModel::Validations::InclusionValidator
+              if validator.options[:in]
+                schema[:properties][attribute.to_s][:enum] = validator.options[:in]
+              end
+            when ActiveModel::Validations::FormatValidator
+              if validator.options[:with] == URI::MailTo::EMAIL_REGEXP
+                schema[:properties][attribute.to_s][:format] = "email"
+              elsif validator.options[:with]
+                schema[:properties][attribute.to_s][:pattern] = validator.options[:with].source
+              end
+            end
+          end
+        end
+      end
+      end
+    end
+
+    def generate_schema_view(model_class, options = {})
+      schema = ActiveAgent::SchemaGenerator::Builder.json_schema_from_model(model_class, options)
+      schema.to_json
+    end
+  end
+end

data/lib/active_agent/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Justin Bowen
@@ -323,8 +323,10 @@ files:
 - lib/active_agent/prompt_helper.rb
 - lib/active_agent/queued_generation.rb
 - lib/active_agent/railtie.rb
+- lib/active_agent/railtie/schema_generator_extension.rb
 - lib/active_agent/rescuable.rb
 - lib/active_agent/sanitizers.rb
+- lib/active_agent/schema_generator.rb
 - lib/active_agent/service.rb
 - lib/active_agent/streaming.rb
 - lib/active_agent/test_case.rb