ruby_llm-agents 3.5.4 → 3.6.0

data/lib/ruby_llm/agents/results/image_generation_result.rb

@@ -22,7 +22,7 @@ module RubyLLM
     class ImageGenerationResult
       attr_reader :images, :prompt, :model_id, :size, :quality, :style,
         :started_at, :completed_at, :tenant_id, :generator_class,
-        :error_class, :error_message
+        :error_class, :error_message, :execution_id
 
       # Initialize a new result
       #
@@ -40,7 +40,7 @@ module RubyLLM
       # @param error_message [String, nil] Error message if failed
       def initialize(images:, prompt:, model_id:, size:, quality:, style:,
         started_at:, completed_at:, tenant_id:, generator_class:,
-        error_class: nil, error_message: nil)
+        error_class: nil, error_message: nil, execution_id: nil)
         @images = images
         @prompt = prompt
         @model_id = model_id
@@ -53,6 +53,14 @@ module RubyLLM
         @generator_class = generator_class
         @error_class = error_class
         @error_message = error_message
+        @execution_id = execution_id
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Status helpers
@@ -257,7 +265,8 @@ module RubyLLM
           tenant_id: tenant_id,
           generator_class: generator_class,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
         }
       end
 

data/lib/ruby_llm/agents/results/image_pipeline_result.rb

@@ -23,6 +23,7 @@ module RubyLLM
     class ImagePipelineResult
       attr_reader :step_results, :started_at, :completed_at, :tenant_id,
         :pipeline_class, :context, :error_class, :error_message
+      attr_accessor :execution_id
 
       # Initialize a new pipeline result
       #
@@ -44,6 +45,14 @@ module RubyLLM
         @context = context
         @error_class = error_class
         @error_message = error_message
+        @execution_id = nil
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Status helpers
@@ -315,7 +324,8 @@ module RubyLLM
           tenant_id: tenant_id,
           pipeline_class: pipeline_class,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
         }
       end
 

data/lib/ruby_llm/agents/results/image_transform_result.rb

@@ -20,6 +20,7 @@ module RubyLLM
       attr_reader :images, :source_image, :prompt, :model_id, :size, :strength,
         :started_at, :completed_at, :tenant_id, :transformer_class,
         :error_class, :error_message
+      attr_accessor :execution_id
 
       # Initialize a new result
       #
@@ -50,6 +51,14 @@ module RubyLLM
         @transformer_class = transformer_class
         @error_class = error_class
         @error_message = error_message
+        @execution_id = nil
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Status helpers
@@ -176,7 +185,8 @@ module RubyLLM
           tenant_id: tenant_id,
           transformer_class: transformer_class,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
         }
       end
 

data/lib/ruby_llm/agents/results/image_upscale_result.rb

@@ -18,6 +18,7 @@ module RubyLLM
       attr_reader :image, :source_image, :model_id, :scale, :output_size, :face_enhance,
         :started_at, :completed_at, :tenant_id, :upscaler_class,
         :error_class, :error_message
+      attr_accessor :execution_id
 
       # Initialize a new result
       #
@@ -48,6 +49,14 @@ module RubyLLM
         @upscaler_class = upscaler_class
         @error_class = error_class
         @error_message = error_message
+        @execution_id = nil
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Status helpers
@@ -171,7 +180,8 @@ module RubyLLM
           tenant_id: tenant_id,
           upscaler_class: upscaler_class,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
         }
       end
 

data/lib/ruby_llm/agents/results/image_variation_result.rb

@@ -17,6 +17,7 @@ module RubyLLM
       attr_reader :images, :source_image, :model_id, :size, :variation_strength,
         :started_at, :completed_at, :tenant_id, :variator_class,
         :error_class, :error_message
+      attr_accessor :execution_id
 
       # Initialize a new result
       #
@@ -45,6 +46,14 @@ module RubyLLM
         @variator_class = variator_class
         @error_class = error_class
         @error_message = error_message
+        @execution_id = nil
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Status helpers
@@ -162,7 +171,8 @@ module RubyLLM
           tenant_id: tenant_id,
           variator_class: variator_class,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
         }
       end
 

data/lib/ruby_llm/agents/results/speech_result.rb

@@ -151,6 +151,14 @@ module RubyLLM
 
       # @!endgroup
 
+      # @!group Execution Record
+
+      # @!attribute [r] execution_id
+      #   @return [Integer, nil] Database ID of the associated Execution record
+      attr_reader :execution_id
+
+      # @!endgroup
+
       # Creates a new SpeechResult instance
       #
       # @param attributes [Hash] Result attributes
@@ -218,6 +226,16 @@ module RubyLLM
         # Error
         @error_class = attributes[:error_class]
         @error_message = attributes[:error_message]
+
+        # Execution record
+        @execution_id = attributes[:execution_id]
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Returns whether the speech generation succeeded
@@ -303,7 +321,8 @@ module RubyLLM
           status: status,
           tenant_id: tenant_id,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
           # Note: audio binary data excluded for serialization safety
         }
       end

data/lib/ruby_llm/agents/results/transcription_result.rb

@@ -166,6 +166,14 @@ module RubyLLM
 
       # @!endgroup
 
+      # @!group Execution Record
+
+      # @!attribute [r] execution_id
+      #   @return [Integer, nil] Database ID of the associated Execution record
+      attr_reader :execution_id
+
+      # @!endgroup
+
       # Creates a new TranscriptionResult instance
       #
       # @param attributes [Hash] Result attributes
@@ -239,6 +247,16 @@ module RubyLLM
         # Error
         @error_class = attributes[:error_class]
         @error_message = attributes[:error_message]
+
+        # Execution record
+        @execution_id = attributes[:execution_id]
+      end
+
+      # Loads the associated Execution record from the database
+      #
+      # @return [RubyLLM::Agents::Execution, nil] The execution record, or nil
+      def execution
+        @execution ||= RubyLLM::Agents::Execution.find_by(id: execution_id) if execution_id
       end
 
       # Returns whether the transcription succeeded
@@ -368,7 +386,8 @@ module RubyLLM
           status: status,
           tenant_id: tenant_id,
           error_class: error_class,
-          error_message: error_message
+          error_message: error_message,
+          execution_id: execution_id
         }
       end
 

data/lib/ruby_llm/agents/text/embedder.rb

@@ -245,7 +245,8 @@ module RubyLLM
           started_at: context.started_at || execution_started_at,
           completed_at: execution_completed_at,
           duration_ms: duration_ms,
-          tenant_id: context.tenant_id
+          tenant_id: context.tenant_id,
+          execution_id: context.execution_id
         )
       end
 
@@ -377,7 +378,7 @@ module RubyLLM
       # @param duration_ms [Integer] Execution duration in ms
       # @param tenant_id [String, nil] Tenant identifier
       # @return [EmbeddingResult] The final result
-      def build_result(vectors:, input_tokens:, total_cost:, count:, started_at:, completed_at:, duration_ms:, tenant_id:)
+      def build_result(vectors:, input_tokens:, total_cost:, count:, started_at:, completed_at:, duration_ms:, tenant_id:, execution_id: nil)
         EmbeddingResult.new(
           vectors: vectors,
           model_id: resolved_model,
@@ -388,7 +389,8 @@ module RubyLLM
           count: count,
           started_at: started_at,
           completed_at: completed_at,
-          tenant_id: tenant_id
+          tenant_id: tenant_id,
+          execution_id: execution_id
         )
       end
 
@@ -397,25 +399,28 @@ module RubyLLM
       # @param response [Object] The ruby_llm embedding response
       # @return [Float] Cost in USD
       def calculate_cost(response)
-        # ruby_llm may provide cost directly, otherwise estimate
+        # ruby_llm may provide cost directly
         return response.input_cost if response.respond_to?(:input_cost) && response.input_cost
 
-        # Fallback: estimate based on tokens and model
+        # Look up pricing from the model registry (same approach as BaseAgent)
         tokens = response.input_tokens || 0
-        model_name = response.model.to_s
-
-        price_per_million = case model_name
-        when /text-embedding-3-small/
-          0.02
-        when /text-embedding-3-large/
-          0.13
-        when /text-embedding-ada/
-          0.10
-        else
-          0.02 # Default to small pricing
-        end
+        model_id = response.model.to_s
+
+        input_price = find_embedding_price(model_id)
+        (tokens / 1_000_000.0) * input_price
+      end
 
-        (tokens / 1_000_000.0) * price_per_million
+      # Looks up the per-million-token input price for an embedding model
+      #
+      # @param model_id [String] The model identifier
+      # @return [Numeric] Price per million tokens (0 if unknown)
+      def find_embedding_price(model_id)
+        return 0 unless defined?(RubyLLM::Models)
+
+        model_info = RubyLLM::Models.find(model_id)
+        model_info&.pricing&.text_tokens&.input || 0
+      rescue
+        0
       end
 
       # Resolves the model to use

data/lib/ruby_llm/agents.rb

@@ -13,11 +13,6 @@ require_relative "agents/core/llm_tenant"
 
 # Infrastructure - Reliability
 require_relative "agents/infrastructure/reliability"
-require_relative "agents/infrastructure/reliability/retry_strategy"
-require_relative "agents/infrastructure/reliability/fallback_routing"
-require_relative "agents/infrastructure/reliability/breaker_manager"
-require_relative "agents/infrastructure/reliability/execution_constraints"
-require_relative "agents/infrastructure/reliability/executor"
 
 # Pipeline infrastructure (middleware-based execution)
 require_relative "agents/pipeline"
@@ -28,6 +23,9 @@ require_relative "agents/dsl"
 # BaseAgent - new middleware-based agent architecture
 require_relative "agents/base_agent"
 
+# Agent-as-Tool adapter
+require_relative "agents/agent_tool"
+
 # Infrastructure - Budget & Utilities
 require_relative "agents/infrastructure/circuit_breaker"
 require_relative "agents/infrastructure/budget_tracker"
@@ -142,6 +140,73 @@ module RubyLLM
       def reset_configuration!
         @configuration = Configuration.new
       end
+
+      # Renames an agent in the database, updating execution records and
+      # tenant budget configuration keys
+      #
+      # @param old_name [String] The previous agent class name
+      # @param to [String] The new agent class name
+      # @param dry_run [Boolean] If true, returns counts without modifying data
+      # @return [Hash] Summary of affected records
+      #
+      # @example Rename an agent
+      #   RubyLLM::Agents.rename_agent("CustomerSupportAgent", to: "SupportBot")
+      #   # => { executions_updated: 1432, tenants_updated: 3 }
+      #
+      # @example Dry run first
+      #   RubyLLM::Agents.rename_agent("CustomerSupportAgent", to: "SupportBot", dry_run: true)
+      #   # => { executions_affected: 1432, tenants_affected: 3 }
+      def rename_agent(old_name, to:, dry_run: false)
+        old_name = old_name.to_s
+        new_name = to.to_s
+
+        raise ArgumentError, "old_name and new name must be different" if old_name == new_name
+        raise ArgumentError, "old_name cannot be blank" if old_name.blank?
+        raise ArgumentError, "new name cannot be blank" if new_name.blank?
+
+        execution_scope = Execution.where(agent_type: old_name)
+        execution_count = execution_scope.count
+
+        tenant_count = 0
+        if defined?(Tenant) && Tenant.table_exists?
+          Tenant.find_each do |tenant|
+            changed = false
+            %w[per_agent_daily per_agent_monthly].each do |field|
+              hash = tenant.send(field)
+              next unless hash.is_a?(Hash) && hash.key?(old_name)
+              changed = true
+              break
+            end
+            tenant_count += 1 if changed
+          end
+        end
+
+        if dry_run
+          {executions_affected: execution_count, tenants_affected: tenant_count}
+        else
+          executions_updated = execution_scope.update_all(agent_type: new_name)
+
+          tenants_updated = 0
+          if defined?(Tenant) && Tenant.table_exists?
+            Tenant.find_each do |tenant|
+              changed = false
+              %w[per_agent_daily per_agent_monthly].each do |field|
+                hash = tenant.send(field)
+                next unless hash.is_a?(Hash) && hash.key?(old_name)
+                hash[new_name] = hash.delete(old_name)
+                tenant.send(:"#{field}=", hash)
+                changed = true
+              end
+              if changed
+                tenant.save!
+                tenants_updated += 1
+              end
+            end
+          end
+
+          {executions_updated: executions_updated, tenants_updated: tenants_updated}
+        end
+      end
     end
   end
 end

data/lib/tasks/ruby_llm_agents.rake

@@ -1,6 +1,27 @@
 # frozen_string_literal: true
 
 namespace :ruby_llm_agents do
+  desc "Rename an agent type in execution records. Usage: rake ruby_llm_agents:rename_agent FROM=OldName TO=NewName [DRY_RUN=1]"
+  task rename_agent: :environment do
+    from = ENV["FROM"]
+    to = ENV["TO"]
+    dry_run = ENV["DRY_RUN"] == "1"
+
+    abort "Usage: rake ruby_llm_agents:rename_agent FROM=OldAgentName TO=NewAgentName [DRY_RUN=1]" unless from && to
+
+    result = RubyLLM::Agents.rename_agent(from, to: to, dry_run: dry_run)
+
+    if dry_run
+      puts "Dry run results:"
+      puts "  Executions affected: #{result[:executions_affected]}"
+      puts "  Tenants affected:    #{result[:tenants_affected]}"
+    else
+      puts "Rename complete:"
+      puts "  Executions updated: #{result[:executions_updated]}"
+      puts "  Tenants updated:    #{result[:tenants_updated]}"
+    end
+  end
+
   namespace :tenants do
     desc "Refresh all tenant counters from executions table"
     task refresh: :environment do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-agents
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.6.0
 platform: ruby
 authors:
 - adham90
@@ -88,6 +88,7 @@ files:
 - app/models/ruby_llm/agents/execution.rb
 - app/models/ruby_llm/agents/execution/analytics.rb
 - app/models/ruby_llm/agents/execution/metrics.rb
+- app/models/ruby_llm/agents/execution/replayable.rb
 - app/models/ruby_llm/agents/execution/scopes.rb
 - app/models/ruby_llm/agents/execution_detail.rb
 - app/models/ruby_llm/agents/tenant.rb
@@ -111,6 +112,7 @@ files:
 - app/views/ruby_llm/agents/agents/show.html.erb
 - app/views/ruby_llm/agents/dashboard/_action_center.html.erb
 - app/views/ruby_llm/agents/dashboard/_tenant_budget.html.erb
+- app/views/ruby_llm/agents/dashboard/_top_tenants.html.erb
 - app/views/ruby_llm/agents/dashboard/index.html.erb
 - app/views/ruby_llm/agents/executions/_audio_player.html.erb
 - app/views/ruby_llm/agents/executions/_execution.html.erb
@@ -146,6 +148,7 @@ files:
 - lib/generators/ruby_llm_agents/install_generator.rb
 - lib/generators/ruby_llm_agents/migrate_structure_generator.rb
 - lib/generators/ruby_llm_agents/multi_tenancy_generator.rb
+- lib/generators/ruby_llm_agents/rename_agent_generator.rb
 - lib/generators/ruby_llm_agents/restructure_generator.rb
 - lib/generators/ruby_llm_agents/speaker_generator.rb
 - lib/generators/ruby_llm_agents/templates/add_assistant_prompt_migration.rb.tt
@@ -189,6 +192,7 @@ files:
 - lib/generators/ruby_llm_agents/templates/migration.rb.tt
 - lib/generators/ruby_llm_agents/templates/remove_agent_version_migration.rb.tt
 - lib/generators/ruby_llm_agents/templates/remove_workflow_columns_migration.rb.tt
+- lib/generators/ruby_llm_agents/templates/rename_agent_migration.rb.tt
 - lib/generators/ruby_llm_agents/templates/rename_tenant_budgets_to_tenants_migration.rb.tt
 - lib/generators/ruby_llm_agents/templates/skills/AGENTS.md.tt
 - lib/generators/ruby_llm_agents/templates/skills/BACKGROUND_REMOVERS.md.tt
@@ -210,6 +214,7 @@ files:
 - lib/generators/ruby_llm_agents/upgrade_generator.rb
 - lib/ruby_llm-agents.rb
 - lib/ruby_llm/agents.rb
+- lib/ruby_llm/agents/agent_tool.rb
 - lib/ruby_llm/agents/audio/elevenlabs/model_registry.rb
 - lib/ruby_llm/agents/audio/speaker.rb
 - lib/ruby_llm/agents/audio/speaker/active_storage_support.rb
@@ -230,6 +235,7 @@ files:
 - lib/ruby_llm/agents/dsl.rb
 - lib/ruby_llm/agents/dsl/base.rb
 - lib/ruby_llm/agents/dsl/caching.rb
+- lib/ruby_llm/agents/dsl/queryable.rb
 - lib/ruby_llm/agents/dsl/reliability.rb
 - lib/ruby_llm/agents/image/analyzer.rb
 - lib/ruby_llm/agents/image/analyzer/dsl.rb
@@ -269,11 +275,6 @@ files:
 - lib/ruby_llm/agents/infrastructure/circuit_breaker.rb
 - lib/ruby_llm/agents/infrastructure/execution_logger_job.rb
 - lib/ruby_llm/agents/infrastructure/reliability.rb
-- lib/ruby_llm/agents/infrastructure/reliability/breaker_manager.rb
-- lib/ruby_llm/agents/infrastructure/reliability/execution_constraints.rb
-- lib/ruby_llm/agents/infrastructure/reliability/executor.rb
-- lib/ruby_llm/agents/infrastructure/reliability/fallback_routing.rb
-- lib/ruby_llm/agents/infrastructure/reliability/retry_strategy.rb
 - lib/ruby_llm/agents/pipeline.rb
 - lib/ruby_llm/agents/pipeline/builder.rb
 - lib/ruby_llm/agents/pipeline/context.rb

data/lib/ruby_llm/agents/infrastructure/reliability/breaker_manager.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-module RubyLLM
-  module Agents
-    module Reliability
-      # Manages circuit breakers for multiple models
-      #
-      # Provides centralized access to circuit breakers with
-      # multi-tenant support and caching.
-      #
-      # @example
-      #   manager = BreakerManager.new("MyAgent", config: { errors: 5, within: 60 })
-      #   manager.open?("gpt-4o")        # => false
-      #   manager.record_failure!("gpt-4o")
-      #   manager.record_success!("gpt-4o")
-      #
-      # @api private
-      class BreakerManager
-        # @param agent_type [String] The agent class name
-        # @param config [Hash, nil] Circuit breaker configuration
-        # @param tenant_id [String, nil] Optional tenant identifier
-        def initialize(agent_type, config:, tenant_id: nil)
-          @agent_type = agent_type
-          @config = config
-          @tenant_id = tenant_id
-          @breakers = {}
-        end
-
-        # Gets or creates a circuit breaker for a model
-        #
-        # @param model_id [String] Model identifier
-        # @return [CircuitBreaker, nil] The circuit breaker or nil if not configured
-        def for_model(model_id)
-          return nil unless @config
-
-          @breakers[model_id] ||= CircuitBreaker.from_config(
-            @agent_type,
-            model_id,
-            @config,
-            tenant_id: @tenant_id
-          )
-        end
-
-        # Checks if a model's circuit breaker is open
-        #
-        # @param model_id [String] Model identifier
-        # @return [Boolean] true if breaker is open
-        def open?(model_id)
-          breaker = for_model(model_id)
-          breaker&.open? || false
-        end
-
-        # Records a success for a model
-        #
-        # @param model_id [String] Model identifier
-        # @return [void]
-        def record_success!(model_id)
-          for_model(model_id)&.record_success!
-        end
-
-        # Records a failure for a model
-        #
-        # @param model_id [String] Model identifier
-        # @return [Boolean] true if breaker is now open
-        def record_failure!(model_id)
-          breaker = for_model(model_id)
-          breaker&.record_failure!
-          breaker&.open? || false
-        end
-
-        # Checks if circuit breaker is configured
-        #
-        # @return [Boolean] true if config present
-        def enabled?
-          @config.present?
-        end
-      end
-    end
-  end
-end

data/lib/ruby_llm/agents/infrastructure/reliability/execution_constraints.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module RubyLLM
-  module Agents
-    module Reliability
-      # Manages execution constraints like total timeout and budget
-      #
-      # Tracks elapsed time and enforces timeout limits across
-      # all retry and fallback attempts.
-      #
-      # @example
-      #   constraints = ExecutionConstraints.new(total_timeout: 30)
-      #   constraints.timeout_exceeded?  # => false
-      #   constraints.enforce_timeout!   # raises if exceeded
-      #   constraints.elapsed            # => 5.2
-      #
-      # @api private
-      class ExecutionConstraints
-        attr_reader :total_timeout, :started_at, :deadline
-
-        # @param total_timeout [Integer, nil] Total timeout in seconds
-        def initialize(total_timeout: nil)
-          @total_timeout = total_timeout
-          @started_at = Time.current
-          @deadline = total_timeout ? @started_at + total_timeout : nil
-        end
-
-        # Checks if total timeout has been exceeded
-        #
-        # @return [Boolean] true if past deadline
-        def timeout_exceeded?
-          deadline && Time.current > deadline
-        end
-
-        # Returns elapsed time since start
-        #
-        # @return [Float] Elapsed seconds
-        def elapsed
-          Time.current - started_at
-        end
-
-        # Raises TotalTimeoutError if timeout exceeded
-        #
-        # @raise [TotalTimeoutError] If timeout exceeded
-        # @return [void]
-        def enforce_timeout!
-          if timeout_exceeded?
-            raise TotalTimeoutError.new(total_timeout, elapsed)
-          end
-        end
-
-        # Returns remaining time until deadline
-        #
-        # @return [Float, nil] Remaining seconds or nil if no timeout
-        def remaining
-          return nil unless deadline
-          [deadline - Time.current, 0].max
-        end
-
-        # Checks if there's a timeout configured
-        #
-        # @return [Boolean] true if timeout is set
-        def has_timeout?
-          total_timeout.present?
-        end
-      end
-    end
-  end
-end