ruby_llm-agents 0.3.4 → 0.3.5

data/lib/generators/ruby_llm_agents/upgrade_generator.rb

@@ -120,6 +120,19 @@ module RubyLlmAgents
       )
     end
 
+    def create_add_workflow_migration
+      # Check if columns already exist
+      if column_exists?(:ruby_llm_agents_executions, :workflow_id)
+        say_status :skip, "workflow_id column already exists", :yellow
+        return
+      end
+
+      migration_template(
+        "add_workflow_migration.rb.tt",
+        File.join(db_migrate_path, "add_workflow_to_ruby_llm_agents_executions.rb")
+      )
+    end
+
     def show_post_upgrade_message
       say ""
       say "RubyLLM::Agents upgrade migration created!", :green

data/lib/ruby_llm/agents/alert_manager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "net/http"
+require "faraday"
 require "json"
 
 module RubyLLM
@@ -177,30 +177,34 @@ module RubyLLM
           end
         end
 
-        # Posts JSON to a URL
+        # Posts JSON to a URL using Faraday
         #
         # @param url [String] The URL
         # @param payload [Hash] The payload
-        # @return [Net::HTTPResponse]
+        # @return [Faraday::Response]
         def post_json(url, payload)
-          uri = URI.parse(url)
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = uri.scheme == "https"
-          http.open_timeout = 5
-          http.read_timeout = 10
-
-          request = Net::HTTP::Post.new(uri.request_uri)
-          request["Content-Type"] = "application/json"
-          request.body = payload.to_json
-
-          response = http.request(request)
+          response = http_client.post(url) do |req|
+            req.headers["Content-Type"] = "application/json"
+            req.body = payload.to_json
+          end
 
-          unless response.is_a?(Net::HTTPSuccess)
-            Rails.logger.warn("[RubyLLM::Agents::AlertManager] Webhook returned #{response.code}: #{response.body}")
+          unless response.success?
+            Rails.logger.warn("[RubyLLM::Agents::AlertManager] Webhook returned #{response.status}: #{response.body}")
           end
 
           response
         end
+
+        # Returns a configured Faraday HTTP client
+        #
+        # @return [Faraday::Connection]
+        def http_client
+          @http_client ||= Faraday.new do |conn|
+            conn.options.open_timeout = 5
+            conn.options.timeout = 10
+            conn.adapter Faraday.default_adapter
+          end
+        end
       end
     end
   end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../cache_helper"
+
 module RubyLLM
   module Agents
     class Base
@@ -8,17 +10,12 @@ module RubyLLM
       # Handles cache key generation and store access for
       # caching agent execution results.
       module Caching
-        # Returns the configured cache store
-        #
-        # @return [ActiveSupport::Cache::Store] The cache store
-        def cache_store
-          RubyLLM::Agents.configuration.cache_store
-        end
+        include CacheHelper
 
         # Generates the full cache key for this agent invocation
         #
         # @return [String] Cache key in format "ruby_llm_agent/ClassName/version/hash"
-        def cache_key
+        def agent_cache_key
           ["ruby_llm_agent", self.class.name, self.class.version, cache_key_hash].join("/")
         end
 

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

@@ -65,7 +65,8 @@ module RubyLLM
         # @param model_id [String] The model identifier
         # @return [Object, nil] Model info or nil
         def resolve_model_info(model_id)
-          RubyLLM::Models.resolve(model_id)
+          model_obj, _provider = RubyLLM::Models.resolve(model_id)
+          model_obj
         rescue StandardError
           nil
         end
@@ -73,8 +74,9 @@ module RubyLLM
         # Records cost from an attempt to the budget tracker
         #
         # @param attempt_tracker [AttemptTracker] The attempt tracker
+        # @param tenant_id [String, nil] Optional tenant identifier for multi-tenant tracking
         # @return [void]
-        def record_attempt_cost(attempt_tracker)
+        def record_attempt_cost(attempt_tracker, tenant_id: nil)
           successful = attempt_tracker.successful_attempt
           return unless successful
 
@@ -93,7 +95,7 @@ module RubyLLM
           total_cost = (input_tokens / 1_000_000.0 * input_price) +
                        (output_tokens / 1_000_000.0 * output_price)
 
-          BudgetTracker.record_spend!(self.class.name, total_cost)
+          BudgetTracker.record_spend!(self.class.name, total_cost, tenant_id: tenant_id)
         rescue StandardError => e
           Rails.logger.warn("[RubyLLM::Agents] Failed to record budget spend: #{e.message}")
         end

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

@@ -20,7 +20,17 @@ module RubyLLM
           return dry_run_response if @options[:dry_run]
           return uncached_call(&block) if @options[:skip_cache] || !self.class.cache_enabled?
 
-          # Note: Cached responses don't stream (already complete)
+          cache_key = agent_cache_key
+
+          # Check for cache hit BEFORE fetch to record it
+          if cache_store.exist?(cache_key)
+            started_at = Time.current
+            cached_result = cache_store.read(cache_key)
+            record_cache_hit_execution(cache_key, cached_result, started_at) if cached_result
+            return cached_result
+          end
+
+          # Cache miss - execute and store
           cache_store.fetch(cache_key, expires_in: self.class.cache_ttl) do
             uncached_call(&block)
           end
@@ -105,7 +115,7 @@ module RubyLLM
               attachments: @options[:with],
               schema: schema&.class&.name,
               streaming: self.class.streaming,
-              tools: self.class.tools.map { |t| t.respond_to?(:name) ? t.name : t.to_s }
+              tools: resolved_tools.map { |t| t.respond_to?(:name) ? t.name : t.to_s }
             },
             model_id: model,
             temperature: temperature,
@@ -113,6 +123,37 @@ module RubyLLM
           )
         end
 
+        # Resolves tools for this execution
+        #
+        # Checks for instance method override first (for dynamic tools),
+        # then falls back to class-level DSL configuration. This allows
+        # agents to define tools dynamically based on runtime context.
+        #
+        # @return [Array<Class>] Tool classes to use
+        def resolved_tools
+          # Check if instance defines tools method (not inherited from class singleton)
+          if self.class.instance_methods(false).include?(:tools)
+            tools
+          else
+            self.class.tools
+          end
+        end
+
+        # Resolves messages for this execution
+        #
+        # Priority order:
+        # 1. @override_messages (set via with_messages)
+        # 2. :messages option passed at call time
+        # 3. messages template method defined in subclass
+        #
+        # @return [Array<Hash>] Messages to apply to conversation
+        def resolved_messages
+          return @override_messages if @override_messages&.any?
+          return @options[:messages] if @options[:messages]&.any?
+
+          messages
+        end
+
         # Returns the consolidated reliability configuration for this agent instance
         #
         # @return [Hash] Reliability config with :retries, :fallback_models, :total_timeout, :circuit_breaker
@@ -166,7 +207,8 @@ module RubyLLM
             .with_temperature(temperature)
           client = client.with_instructions(system_prompt) if system_prompt
           client = client.with_schema(schema) if schema
-          client = client.with_tools(*self.class.tools) if self.class.tools.any?
+          client = client.with_tools(*resolved_tools) if resolved_tools.any?
+          client = apply_messages(client, resolved_messages) if resolved_messages.any?
           client
         end
 
@@ -180,14 +222,26 @@ module RubyLLM
             .with_temperature(temperature)
           client = client.with_instructions(system_prompt) if system_prompt
           client = client.with_schema(schema) if schema
-          client = client.with_tools(*self.class.tools) if self.class.tools.any?
+          client = client.with_tools(*resolved_tools) if resolved_tools.any?
+          client = apply_messages(client, resolved_messages) if resolved_messages.any?
           client
         end
 
-        # Builds a client with pre-populated conversation history
+        # Applies conversation history to the client
         #
-        # Useful for multi-turn conversations or providing context.
+        # @param client [RubyLLM::Chat] The chat client
+        # @param msgs [Array<Hash>] Messages with :role and :content keys
+        # @return [RubyLLM::Chat] Client with messages applied
+        def apply_messages(client, msgs)
+          msgs.reduce(client) do |c, message|
+            c.with_message(message[:role].to_s, message[:content])
+          end
+        end
+
+        # Builds a client with pre-populated conversation history
         #
+        # @deprecated Use resolved_messages and apply_messages instead.
+        #   Override the messages template method or pass messages: option to call.
         # @param messages [Array<Hash>] Messages with :role and :content keys
         # @return [RubyLLM::Chat] Client with messages added
         # @example
@@ -196,9 +250,7 @@ module RubyLLM
         #     { role: "assistant", content: "Hi there!" }
         #   ])
         def build_client_with_messages(messages)
-          messages.reduce(build_client) do |client, message|
-            client.with_message(message[:role], message[:content])
-          end
+          apply_messages(build_client, messages)
         end
       end
     end

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

@@ -21,15 +21,19 @@ module RubyLLM
           total_deadline = config[:total_timeout] ? Time.current + config[:total_timeout] : nil
           started_at = Time.current
 
-          # Pre-check budget
-          BudgetTracker.check_budget!(self.class.name) if RubyLLM::Agents.configuration.budgets_enabled?
+          # Get current tenant_id for multi-tenancy support
+          global_config = RubyLLM::Agents.configuration
+          tenant_id = global_config.multi_tenancy_enabled? ? global_config.current_tenant_id : nil
+
+          # Pre-check budget (tenant_id is resolved automatically if not passed)
+          BudgetTracker.check_budget!(self.class.name, tenant_id: tenant_id) if global_config.budgets_enabled?
 
           instrument_execution_with_attempts(models_to_try: models_to_try) do |attempt_tracker|
             last_error = nil
 
             models_to_try.each do |current_model|
-              # Check circuit breaker
-              breaker = get_circuit_breaker(current_model)
+              # Check circuit breaker (with tenant isolation if enabled)
+              breaker = get_circuit_breaker(current_model, tenant_id: tenant_id)
               if breaker&.open?
                 attempt_tracker.record_short_circuit(current_model)
                 next
@@ -54,9 +58,9 @@ module RubyLLM
                   # Record success in circuit breaker
                   breaker&.record_success!
 
-                  # Record budget spend
-                  if @last_response && RubyLLM::Agents.configuration.budgets_enabled?
-                    record_attempt_cost(attempt_tracker)
+                  # Record budget spend (with tenant isolation if enabled)
+                  if @last_response && global_config.budgets_enabled?
+                    record_attempt_cost(attempt_tracker, tenant_id: tenant_id)
                   end
 
                   # Use throw instead of return to allow instrument_execution_with_attempts
@@ -118,12 +122,13 @@ module RubyLLM
         # Gets or creates a circuit breaker for a model
         #
         # @param model_id [String] The model identifier
+        # @param tenant_id [String, nil] Optional tenant identifier for multi-tenant isolation
         # @return [CircuitBreaker, nil] The circuit breaker or nil if not configured
-        def get_circuit_breaker(model_id)
+        def get_circuit_breaker(model_id, tenant_id: nil)
           config = reliability_config[:circuit_breaker]
           return nil unless config
 
-          CircuitBreaker.from_config(self.class.name, model_id, config)
+          CircuitBreaker.from_config(self.class.name, model_id, config, tenant_id: tenant_id)
         end
       end
     end

data/lib/ruby_llm/agents/base.rb

@@ -137,6 +137,20 @@ module RubyLLM
         nil
       end
 
+      # Conversation history for multi-turn conversations
+      #
+      # Override in subclass to provide conversation history.
+      # Messages will be added to the chat before the user_prompt.
+      #
+      # @return [Array<Hash>] Array of messages with :role and :content keys
+      # @example
+      #   def messages
+      #     [{ role: :user, content: "Hello" }, { role: :assistant, content: "Hi!" }]
+      #   end
+      def messages
+        []
+      end
+
       # Post-processes the LLM response
       #
       # Override to transform the response before returning to the caller.
@@ -151,6 +165,18 @@ module RubyLLM
       end
 
       # @!endgroup
+
+      # Sets conversation history and rebuilds the client
+      #
+      # @param msgs [Array<Hash>] Messages with :role and :content keys
+      # @return [self] Returns self for chaining
+      # @example
+      #   agent.with_messages([{ role: :user, content: "Hi" }]).call
+      def with_messages(msgs)
+        @override_messages = msgs
+        @client = build_client
+        self
+      end
     end
   end
 end