ruby_llm-agents 3.0.0 → 3.2.0

data/lib/ruby_llm/agents/core/instrumentation.rb

@@ -63,48 +63,46 @@ module RubyLLM
         # Use catch to intercept successful early returns from the block
         # The block uses `throw :execution_success, result` instead of `return`
         result = catch(:execution_success) do
+          yield(attempt_tracker)
+          # If we reach here normally (no throw), the block completed without success
+          # This happens when AllModelsExhaustedError is raised
+          nil
+        rescue Timeout::Error, Reliability::TotalTimeoutError => e
+          raised_exception = e
           begin
-            yield(attempt_tracker)
-            # If we reach here normally (no throw), the block completed without success
-            # This happens when AllModelsExhaustedError is raised
-            nil
-          rescue Timeout::Error, Reliability::TotalTimeoutError => e
-            raised_exception = e
-            begin
-              complete_execution_with_attempts(
-                execution,
-                attempt_tracker: attempt_tracker,
-                completed_at: Time.current,
-                status: "timeout",
-                error: e
-              )
-              @status_update_completed = true
-            rescue StandardError => completion_err
-              completion_error = completion_err
-            end
-            raise
-          rescue StandardError => e
-            raised_exception = e
-            begin
-              complete_execution_with_attempts(
-                execution,
-                attempt_tracker: attempt_tracker,
-                completed_at: Time.current,
-                status: "error",
-                error: e
-              )
-              @status_update_completed = true
-            rescue StandardError => completion_err
-              completion_error = completion_err
-            end
-            raise
-          ensure
-            # Only run emergency fallback if we haven't completed AND we're not in success path
-            # The success path completion happens AFTER the catch block
-            unless @status_update_completed || !$!
-              actual_error = completion_error || raised_exception || $!
-              mark_execution_failed!(execution, error: actual_error)
-            end
+            complete_execution_with_attempts(
+              execution,
+              attempt_tracker: attempt_tracker,
+              completed_at: Time.current,
+              status: "timeout",
+              error: e
+            )
+            @status_update_completed = true
+          rescue => completion_err
+            completion_error = completion_err
+          end
+          raise
+        rescue => e
+          raised_exception = e
+          begin
+            complete_execution_with_attempts(
+              execution,
+              attempt_tracker: attempt_tracker,
+              completed_at: Time.current,
+              status: "error",
+              error: e
+            )
+            @status_update_completed = true
+          rescue => completion_err
+            completion_error = completion_err
+          end
+          raise
+        ensure
+          # Only run emergency fallback if we haven't completed AND we're not in success path
+          # The success path completion happens AFTER the catch block
+          unless @status_update_completed || !$!
+            actual_error = completion_error || raised_exception || $!
+            mark_execution_failed!(execution, error: actual_error)
           end
         end
 
@@ -119,7 +117,7 @@ module RubyLLM
               status: "success"
             )
             @status_update_completed = true
-          rescue StandardError => e
+          rescue => e
             Rails.logger.error("[RubyLLM::Agents] Failed to complete successful execution: #{e.class}: #{e.message}")
             mark_execution_failed!(execution, error: e)
           end
@@ -165,7 +163,7 @@ module RubyLLM
               response: @last_response
             )
             @status_update_completed = true
-          rescue StandardError => e
+          rescue => e
             completion_error = e
             # Don't re-raise - let ensure block handle via mark_execution_failed!
           end
@@ -181,11 +179,11 @@ module RubyLLM
               error: e
             )
             @status_update_completed = true
-          rescue StandardError => completion_err
+          rescue => completion_err
             completion_error = completion_err
           end
           raise
-        rescue StandardError => e
+        rescue => e
           raised_exception = e
           begin
             complete_execution(
@@ -195,7 +193,7 @@ module RubyLLM
               error: e
             )
             @status_update_completed = true
-          rescue StandardError => completion_err
+          rescue => completion_err
             completion_error = completion_err
           end
           raise
@@ -258,7 +256,7 @@ module RubyLLM
         # Add fallback chain tracking (count only on execution, chain stored in detail)
         if fallback_chain.any?
           execution_data[:attempts_count] = 0
-          @_pending_detail_data = { fallback_chain: fallback_chain, attempts: [] }
+          @_pending_detail_data = {fallback_chain: fallback_chain, attempts: []}
         end
 
         # Add tenant_id if multi-tenancy is enabled
@@ -275,6 +273,9 @@ module RubyLLM
           system_prompt: config.persist_prompts ? stored_system_prompt : nil,
           user_prompt: config.persist_prompts ? stored_user_prompt : nil
         }
+        if config.persist_prompts && assistant_prompt_column_exists?
+          detail_data[:assistant_prompt] = stored_assistant_prompt
+        end
         detail_data.merge!(@_pending_detail_data) if @_pending_detail_data
         @_pending_detail_data = nil
 
@@ -282,7 +283,7 @@ module RubyLLM
         execution.create_detail!(detail_data) if has_data
 
         execution
-      rescue StandardError => e
+      rescue => e
         # Log error but don't fail the agent execution itself
         Rails.logger.error("[RubyLLM::Agents] Failed to create execution record: #{e.message}")
         nil
@@ -353,7 +354,7 @@ module RubyLLM
           begin
             execution.calculate_costs!
             execution.save!
-          rescue StandardError => cost_error
+          rescue => cost_error
             Rails.logger.warn("[RubyLLM::Agents] Cost calculation failed: #{cost_error.message}")
           end
         end
@@ -361,12 +362,12 @@ module RubyLLM
         # Record token usage for budget tracking
         record_token_usage(execution)
       rescue ActiveRecord::RecordInvalid => e
-        Rails.logger.error("[RubyLLM::Agents] Validation failed for execution #{execution&.id}: #{e.record.errors.full_messages.join(', ')}")
+        Rails.logger.error("[RubyLLM::Agents] Validation failed for execution #{execution&.id}: #{e.record.errors.full_messages.join(", ")}")
         if Rails.env.development? || Rails.env.test?
           Rails.logger.error("[RubyLLM::Agents] Update data: #{update_data.inspect}")
         end
         raise
-      rescue StandardError => e
+      rescue => e
         Rails.logger.error("[RubyLLM::Agents] Failed to update execution record #{execution&.id}: #{e.class}: #{e.message}")
         if Rails.env.development? || Rails.env.test?
           Rails.logger.error("[RubyLLM::Agents] Update data: #{update_data.inspect}")
@@ -462,7 +463,7 @@ module RubyLLM
           begin
             execution.aggregate_attempt_costs!
             execution.save!
-          rescue StandardError => cost_error
+          rescue => cost_error
             Rails.logger.warn("[RubyLLM::Agents] Cost calculation failed: #{cost_error.message}")
           end
         end
@@ -470,12 +471,12 @@ module RubyLLM
         # Record token usage for budget tracking
         record_token_usage(execution)
       rescue ActiveRecord::RecordInvalid => e
-        Rails.logger.error("[RubyLLM::Agents] Validation failed for execution #{execution&.id}: #{e.record.errors.full_messages.join(', ')}")
+        Rails.logger.error("[RubyLLM::Agents] Validation failed for execution #{execution&.id}: #{e.record.errors.full_messages.join(", ")}")
         if Rails.env.development? || Rails.env.test?
           Rails.logger.error("[RubyLLM::Agents] Update data: #{update_data.inspect}")
         end
         raise
-      rescue StandardError => e
+      rescue => e
         Rails.logger.error("[RubyLLM::Agents] Failed to update execution record #{execution&.id}: #{e.class}: #{e.message}")
         if Rails.env.development? || Rails.env.test?
           Rails.logger.error("[RubyLLM::Agents] Update data: #{update_data.inspect}")
@@ -528,7 +529,9 @@ module RubyLLM
           user_prompt: safe_user_prompt,
           messages_summary: config.persist_messages_summary ? messages_summary : {},
           error_message: error&.message
-        }.merge(detail_fields || {})
+        }
+        detail_data[:assistant_prompt] = safe_assistant_prompt if assistant_prompt_column_exists?
+        detail_data.merge!(detail_fields || {})
 
         execution_data[:_detail_data] = detail_data
 
@@ -619,7 +622,7 @@ module RubyLLM
       # @return [String, nil] The system prompt or nil if unavailable
       def safe_system_prompt
         respond_to?(:system_prompt) ? system_prompt.to_s : nil
-      rescue StandardError => e
+      rescue => e
         Rails.logger.warn("[RubyLLM::Agents] Could not capture system_prompt: #{e.message}")
         nil
       end
@@ -629,11 +632,28 @@ module RubyLLM
       # @return [String, nil] The user prompt or nil if unavailable
       def safe_user_prompt
         respond_to?(:user_prompt) ? user_prompt.to_s : nil
-      rescue StandardError => e
+      rescue => e
         Rails.logger.warn("[RubyLLM::Agents] Could not capture user_prompt: #{e.message}")
         nil
       end
 
+      # Safely captures assistant prompt, handling errors gracefully
+      #
+      # @return [String, nil] The assistant prompt or nil if unavailable
+      def safe_assistant_prompt
+        respond_to?(:assistant_prompt) ? assistant_prompt&.to_s : nil
+      rescue => e
+        Rails.logger.warn("[RubyLLM::Agents] Could not capture assistant_prompt: #{e.message}")
+        nil
+      end
+
+      # Returns the assistant prompt for storage
+      #
+      # @return [String, nil] The assistant prompt
+      def stored_assistant_prompt
+        safe_assistant_prompt
+      end
+
       # Safely extracts a value from response object
       #
       # @param response [Object] The response object
@@ -643,7 +663,7 @@ module RubyLLM
       def safe_response_value(response, method, default = nil)
         return default unless response.respond_to?(method)
         response.public_send(method)
-      rescue StandardError
+      rescue
         default
       end
 
@@ -680,7 +700,7 @@ module RubyLLM
       # @return [String, nil] Normalized finish reason
       def safe_extract_finish_reason(response)
         reason = safe_response_value(response, :finish_reason) ||
-                 safe_response_value(response, :stop_reason)
+          safe_response_value(response, :stop_reason)
         return nil unless reason
 
         # Normalize to standard values
@@ -828,7 +848,7 @@ module RubyLLM
           if tool_call.respond_to?(:to_h)
             tool_call.to_h
           else
-            { id: id, name: tool_call[:name], arguments: tool_call[:arguments] }
+            {id: id, name: tool_call[:name], arguments: tool_call[:arguments]}
           end
         end
       end
@@ -897,7 +917,7 @@ module RubyLLM
           }
           execution.create_detail!(detail_data) if detail_data.values.any?(&:present?)
         end
-      rescue StandardError => e
+      rescue => e
         Rails.logger.error("[RubyLLM::Agents] Failed to record cache hit execution: #{e.message}")
       end
 
@@ -918,11 +938,27 @@ module RubyLLM
             tenant_id: tenant_id,
             tenant_config: tenant_config
           )
-        rescue StandardError => e
+        rescue => e
           Rails.logger.warn("[RubyLLM::Agents] Failed to record token usage: #{e.message}")
         end
       end
 
+      # Checks if the assistant_prompt column exists on execution_details
+      #
+      # Memoized to avoid repeated schema queries. Returns false for older installs
+      # that haven't run the migration yet.
+      #
+      # @return [Boolean] true if the column exists
+      def assistant_prompt_column_exists?
+        return @_assistant_prompt_column_exists if defined?(@_assistant_prompt_column_exists)
+
+        @_assistant_prompt_column_exists = begin
+          RubyLLM::Agents::ExecutionDetail.column_names.include?("assistant_prompt")
+        rescue
+          false
+        end
+      end
+
       # Emergency fallback to mark execution as failed
       #
       # Uses update_all to bypass ActiveRecord callbacks and validations,
@@ -963,16 +999,16 @@ module RubyLLM
 
         # Store error_message in detail table (best-effort)
         begin
-          detail_attrs = { error_message: error_message.to_s.truncate(65535) }
+          detail_attrs = {error_message: error_message.to_s.truncate(65535)}
           if execution.detail
             execution.detail.update_columns(detail_attrs)
           else
             RubyLLM::Agents::ExecutionDetail.create!(detail_attrs.merge(execution_id: execution.id))
           end
-        rescue StandardError
+        rescue
           # Non-critical — error_class on execution is sufficient for filtering
         end
-      rescue StandardError => e
+      rescue => e
         Rails.logger.error("[RubyLLM::Agents] CRITICAL: Failed emergency status update for execution #{execution&.id}: #{e.message}")
       end
     end

data/lib/ruby_llm/agents/core/llm_tenant.rb

@@ -70,9 +70,9 @@ module RubyLLM
       included do
         # Link to gem's Tenant model via polymorphic association
         has_one :llm_tenant_record,
-                class_name: "RubyLLM::Agents::Tenant",
-                as: :tenant_record,
-                dependent: :destroy
+          class_name: "RubyLLM::Agents::Tenant",
+          as: :tenant_record,
+          dependent: :destroy
 
         # Backward compatible alias (llm_budget points to same Tenant record)
         # @deprecated Use llm_tenant_record instead
@@ -106,10 +106,10 @@ module RubyLLM
 
           # Executions tracked for this tenant via tenant_id string column
           has_many :llm_executions,
-                   class_name: "RubyLLM::Agents::Execution",
-                   foreign_key: :tenant_id,
-                   primary_key: id,
-                   dependent: :nullify
+            class_name: "RubyLLM::Agents::Execution",
+            foreign_key: :tenant_id,
+            primary_key: id,
+            dependent: :nullify
 
           # Auto-create tenant record callback
           after_create :create_default_llm_tenant if llm_tenant_options[:budget]

data/lib/ruby_llm/agents/core/version.rb

@@ -4,6 +4,6 @@ module RubyLLM
   module Agents
     # Current version of the RubyLLM::Agents gem
     # @return [String] Semantic version string
-    VERSION = "3.0.0"
+    VERSION = "3.2.0"
   end
 end

data/lib/ruby_llm/agents/dsl/base.rb

@@ -56,7 +56,7 @@ module RubyLLM
       #
       module Base
         # Regex pattern to extract {placeholder} parameters from prompt strings
-        PLACEHOLDER_PATTERN = /\{(\w+)\}/.freeze
+        PLACEHOLDER_PATTERN = /\{(\w+)\}/
 
         # @!group Configuration DSL
 
@@ -306,7 +306,7 @@ module RubyLLM
         # @return [String] The default model
         def default_model
           RubyLLM::Agents.configuration.default_model
-        rescue StandardError
+        rescue
           "gpt-4o"
         end
 
@@ -315,7 +315,7 @@ module RubyLLM
         # @return [Integer] The default timeout
         def default_timeout
           RubyLLM::Agents.configuration.default_timeout
-        rescue StandardError
+        rescue
           120
         end
       end

data/lib/ruby_llm/agents/dsl/reliability.rb

@@ -168,7 +168,7 @@ module RubyLLM
         def fallback_provider(provider = nil, **options)
           if provider
             @fallback_providers ||= []
-            @fallback_providers << { provider: provider, **options }
+            @fallback_providers << {provider: provider, **options}
           end
           @fallback_providers || inherited_fallback_providers || []
         end
@@ -201,7 +201,7 @@ module RubyLLM
         #   circuit_breaker errors: 10, within: 60, cooldown: 300
         def circuit_breaker(errors: nil, within: nil, cooldown: nil)
           if errors || within || cooldown
-            @circuit_breaker_config ||= { errors: 10, within: 60, cooldown: 300 }
+            @circuit_breaker_config ||= {errors: 10, within: 60, cooldown: 300}
             @circuit_breaker_config[:errors] = errors if errors
             @circuit_breaker_config[:within] = within if within
             @circuit_breaker_config[:cooldown] = cooldown if cooldown
@@ -297,8 +297,8 @@ module RubyLLM
         # Inner builder class for block-style configuration
         class ReliabilityBuilder
           attr_reader :retries_config, :fallback_models_list, :total_timeout_value,
-                      :circuit_breaker_config, :retryable_patterns_list, :fallback_providers_list,
-                      :non_fallback_errors_list
+            :circuit_breaker_config, :retryable_patterns_list, :fallback_providers_list,
+            :non_fallback_errors_list
 
           def initialize
             @retries_config = nil
@@ -332,7 +332,7 @@ module RubyLLM
           #   fallback_provider :openai, voice: "nova"
           #   fallback_provider :elevenlabs, voice: "Rachel", model: "eleven_multilingual_v2"
           def fallback_provider(provider, **options)
-            @fallback_providers_list << { provider: provider, **options }
+            @fallback_providers_list << {provider: provider, **options}
           end
 
           def total_timeout(seconds)
@@ -366,8 +366,8 @@ module RubyLLM
         #
         class OnFailureBuilder
           attr_reader :retries_config, :fallback_models_list, :total_timeout_value,
-                      :circuit_breaker_config, :retryable_patterns_list, :fallback_providers_list,
-                      :non_fallback_errors_list
+            :circuit_breaker_config, :retryable_patterns_list, :fallback_providers_list,
+            :non_fallback_errors_list
 
           def initialize
             @retries_config = nil
@@ -423,7 +423,7 @@ module RubyLLM
           # @param options [Hash] Provider-specific options
           #
           def fallback_provider(provider, **options)
-            @fallback_providers_list << { provider: provider, **options }
+            @fallback_providers_list << {provider: provider, **options}
           end
 
           # Configure timeout for all retry/fallback attempts
@@ -440,7 +440,7 @@ module RubyLLM
           end
 
           # Also support total_timeout for compatibility
-          alias total_timeout timeout
+          alias_method :total_timeout, :timeout
 
           # Configure circuit breaker
           #

data/lib/ruby_llm/agents/image/analyzer/dsl.rb

@@ -31,7 +31,7 @@ module RubyLLM
         def analysis_type(value = nil)
           if value
             unless VALID_ANALYSIS_TYPES.include?(value)
-              raise ArgumentError, "Analysis type must be one of: #{VALID_ANALYSIS_TYPES.join(', ')}"
+              raise ArgumentError, "Analysis type must be one of: #{VALID_ANALYSIS_TYPES.join(", ")}"
             end
             @analysis_type = value
           else

data/lib/ruby_llm/agents/image/analyzer/execution.rb

@@ -46,7 +46,7 @@ module RubyLLM
           record_execution(result) if execution_tracking_enabled?
 
           result
-        rescue StandardError => e
+        rescue => e
           record_failed_execution(e, started_at) if execution_tracking_enabled?
           build_error_result(e, started_at)
         end
@@ -138,8 +138,8 @@ module RubyLLM
             caption: "Brief caption string",
             description: "Detailed description string (if applicable)",
             tags: ["array", "of", "tag", "strings"],
-            objects: [{ name: "object name", location: "position", confidence: "high/medium/low" }],
-            colors: [{ hex: "#RRGGBB", name: "color name", percentage: 25 }],
+            objects: [{name: "object name", location: "position", confidence: "high/medium/low"}],
+            colors: [{hex: "#RRGGBB", name: "color name", percentage: 25}],
             text: "Extracted text if any"
           }
 
@@ -154,7 +154,7 @@ module RubyLLM
 
           # Use RubyLLM chat with vision
           chat = RubyLLM.chat(model: model)
-          chat.ask(prompt, with: { image: image_content })
+          chat.ask(prompt, with: {image: image_content})
         end
 
         def prepare_image_content

data/lib/ruby_llm/agents/image/background_remover/dsl.rb

@@ -30,7 +30,7 @@ module RubyLLM
         def output_format(value = nil)
           if value
             unless VALID_OUTPUT_FORMATS.include?(value)
-              raise ArgumentError, "Output format must be one of: #{VALID_OUTPUT_FORMATS.join(', ')}"
+              raise ArgumentError, "Output format must be one of: #{VALID_OUTPUT_FORMATS.join(", ")}"
             end
             @output_format = value
           else

data/lib/ruby_llm/agents/image/background_remover/execution.rb

@@ -46,7 +46,7 @@ module RubyLLM
           record_execution(result) if execution_tracking_enabled?
 
           result
-        rescue StandardError => e
+        rescue => e
           record_failed_execution(e, started_at) if execution_tracking_enabled?
           build_error_result(e, started_at)
         end
@@ -112,13 +112,13 @@ module RubyLLM
                 mode: "segmentation_mask",
                 **build_removal_options
               )
-            rescue StandardError
+            rescue
               # Mask generation failed, continue without it
               mask = nil
             end
           end
 
-          { foreground: foreground, mask: mask }
+          {foreground: foreground, mask: mask}
         end
 
         def build_removal_options

data/lib/ruby_llm/agents/image/concerns/image_operation_execution.rb

@@ -20,11 +20,11 @@ module RubyLLM
           return unless tenant
 
           @tenant_id = case tenant
-                       when Hash then tenant[:id]
-                       when Integer, String then tenant
-                       else
-                         tenant.try(:llm_tenant_id) || tenant.try(:id)
-                       end
+          when Hash then tenant[:id]
+          when Integer, String then tenant
+          else
+            tenant.try(:llm_tenant_id) || tenant.try(:id)
+          end
         end
 
         # Check budget before execution
@@ -87,7 +87,7 @@ module RubyLLM
           else
             RubyLLM::Agents::Execution.create!(execution_data)
           end
-        rescue StandardError => e
+        rescue => e
           Rails.logger.error("[RubyLLM::Agents] Failed to record #{execution_type} execution: #{e.message}") if defined?(Rails)
         end
 
@@ -101,7 +101,7 @@ module RubyLLM
           else
             RubyLLM::Agents::Execution.create!(execution_data)
           end
-        rescue StandardError => e
+        rescue => e
           Rails.logger.error("[RubyLLM::Agents] Failed to record failed #{execution_type} execution: #{e.message}") if defined?(Rails)
         end
 
@@ -142,7 +142,7 @@ module RubyLLM
         end
 
         def build_metadata(result)
-          { count: result.count }
+          {count: result.count}
         end
 
         def budget_tracking_enabled?

data/lib/ruby_llm/agents/image/editor/execution.rb

@@ -45,7 +45,7 @@ module RubyLLM
           record_execution(result) if execution_tracking_enabled?
 
           result
-        rescue StandardError => e
+        rescue => e
           record_failed_execution(e, started_at) if execution_tracking_enabled?
           build_error_result(e, started_at)
         end

data/lib/ruby_llm/agents/image/generator/pricing.rb

@@ -158,7 +158,7 @@ module RubyLLM
           else
             fetch_from_url
           end
-        rescue StandardError => e
+        rescue => e
           warn "[RubyLLM::Agents] Failed to fetch LiteLLM pricing: #{e.message}"
           {}
         end
@@ -178,7 +178,7 @@ module RubyLLM
           else
             {}
           end
-        rescue StandardError => e
+        rescue => e
           warn "[RubyLLM::Agents] HTTP error fetching LiteLLM pricing: #{e.message}"
           {}
         end
@@ -314,9 +314,9 @@ module RubyLLM
 
         def fallback_pricing_table
           {
-            "gpt-image-1" => { standard: 0.04, hd: 0.08, large_hd: 0.12 },
-            "dall-e-3" => { standard: 0.04, hd: 0.08, large_hd: 0.12 },
-            "dall-e-2" => { "1024x1024" => 0.02, "512x512" => 0.018, "256x256" => 0.016 },
+            "gpt-image-1" => {standard: 0.04, hd: 0.08, large_hd: 0.12},
+            "dall-e-3" => {standard: 0.04, hd: 0.08, large_hd: 0.12},
+            "dall-e-2" => {"1024x1024" => 0.02, "512x512" => 0.018, "256x256" => 0.016},
             "flux-pro" => 0.05,
             "flux-dev" => 0.025,
             "flux-schnell" => 0.003,
@@ -332,16 +332,15 @@ module RubyLLM
           width, height = size.to_s.split("x").map(&:to_i)
           return nil if width.zero? || height.zero?
           width * height
-        rescue StandardError
+        rescue
           nil
         end
 
         def normalize_model_id(model_id)
           model_id.to_s
-                  .downcase
-                  .gsub(/[^a-z0-9.-]/, "-")
-                  .gsub(/-+/, "-")
-                  .gsub(/^-|-$/, "")
+            .downcase
+            .gsub(/[^a-z0-9.-]/, "-").squeeze("-")
+            .gsub(/^-|-$/, "")
         end
 
         def config