ruby_llm-agents 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f2dcacc45b93f72d6de4f0d8ac2f56d85288f9cacc5495838fbc40473714ddf
-  data.tar.gz: d6e2e7d7c78d9f6443cf8f01fa43733951e552922418ba8ee7226df4977d51a1
+  metadata.gz: b341c701b87662c5947fec756ba5a925759f8179700683dda02c1b30951d3213
+  data.tar.gz: bec52ce05c7958b6954b8f6df23a8a9058ac2a9f900decdb858ed108623ff5af
 SHA512:
-  metadata.gz: 3231be55f4d51f39bb8339ac878a82eef2c2ee5d2894a53356c43a7fc20fd9381141e19d1b447e7c755a6117d687a241e7d3be701792ebf5e97ce3f5e7cf4758
-  data.tar.gz: d89ded2027aa6ef14494216a116fcf42a6b549128677ec24a3881a63109f06a15955d0c824d7b3ff9c8aeecaa1ebdd675099d38bb5a9dce8dd4344bf045cd15f
+  metadata.gz: fefed6d947fb4e9dc8e85a683c72754062d22c016c1de61b9922d49ae9a54cef9e84e638cadb1000e221fdd7616bfd1764fbf47bf5ba11404126acedcebe7c03
+  data.tar.gz: f93588c36b8057878b951c8411e00c2cd94ecc6189be8d33f70cb49e7d7e81098755606fbc3dcb6b2b8dfe85efc5c043a3d1884b7ecf48fc185a4863b4d0f16d

data/README.md

@@ -174,7 +174,16 @@ This creates `app/agents/search_intent_agent.rb` with the agent class ready to c
 mount RubyLLM::Agents::Engine => "/agents"
 ```
 
-![RubyLLM Agents Dashboard](screenshot.png)
+<table>
+  <tr>
+    <td><img src="screenshots/dashboard.png" alt="Dashboard Overview" width="400"></td>
+    <td><img src="screenshots/agents.png" alt="Agent Registry" width="400"></td>
+  </tr>
+  <tr>
+    <td><img src="screenshots/executions.png" alt="Execution Log" width="400"></td>
+    <td><img src="screenshots/tenants.png" alt="Multi-Tenancy" width="400"></td>
+  </tr>
+</table>
 
 ## Documentation
 
@@ -193,7 +202,7 @@ mount RubyLLM::Agents::Engine => "/agents"
 | [Testing Agents](https://github.com/adham90/ruby_llm-agents/wiki/Testing-Agents) | RSpec patterns, mocking, dry_run mode |
 | [Error Handling](https://github.com/adham90/ruby_llm-agents/wiki/Error-Handling) | Error types, recovery patterns |
 | [Embeddings](https://github.com/adham90/ruby_llm-agents/wiki/Embeddings) | Vector embeddings, batching, caching, preprocessing |
-| [Image Generation](https://github.com/adham90/ruby_llm-agents/wiki/Image-Generation) | Text-to-image, templates, content policy, cost tracking |
+| [Image Generation](https://github.com/adham90/ruby_llm-agents/wiki/Image-Generation) | Text-to-image, templates, pipelines, cost tracking |
 | [Dashboard](https://github.com/adham90/ruby_llm-agents/wiki/Dashboard) | Setup, authentication, analytics |
 | [Production](https://github.com/adham90/ruby_llm-agents/wiki/Production-Deployment) | Deployment best practices, background jobs |
 | [API Reference](https://github.com/adham90/ruby_llm-agents/wiki/API-Reference) | Complete class documentation |
@@ -203,7 +212,7 @@ mount RubyLLM::Agents::Engine => "/agents"
 
 - **Ruby** >= 3.1.0
 - **Rails** >= 7.0
-- **RubyLLM** >= 1.0
+- **RubyLLM** >= 1.11.0
 
 ## Contributing
 

data/app/models/ruby_llm/agents/execution.rb

@@ -359,14 +359,18 @@ module RubyLLM
 
       # Resolves model info for cost calculation
       #
+      # Uses Models.find (local registry lookup) rather than Models.resolve
+      # because cost calculation only needs pricing data, not a provider instance.
+      # Models.resolve requires API keys to instantiate the provider, which may
+      # not be available in background jobs or instrumentation contexts.
+      #
       # @param lookup_model_id [String, nil] The model identifier (defaults to self.model_id)
       # @return [Object, nil] Model info or nil
       def resolve_model_info(lookup_model_id = nil)
         lookup_model_id ||= model_id
         return nil unless lookup_model_id
 
-        model, _provider = RubyLLM::Models.resolve(lookup_model_id)
-        model
+        RubyLLM::Models.find(lookup_model_id)
       rescue StandardError
         nil
       end

data/app/views/layouts/ruby_llm/agents/application.html.erb

@@ -148,12 +148,13 @@
 
         <!-- Desktop Navigation -->
         <nav class="hidden md:flex items-center ml-8 gap-0.5 font-mono text-xs">
-          <% [
+          <% nav_items = [
             [ruby_llm_agents.root_path, "dashboard"],
             [ruby_llm_agents.agents_path, "agents"],
-            [ruby_llm_agents.executions_path, "executions"],
-            [ruby_llm_agents.tenants_path, "tenants"]
-          ].each do |path, label| %>
+            [ruby_llm_agents.executions_path, "executions"]
+          ]
+          nav_items << [ruby_llm_agents.tenants_path, "tenants"] if tenant_filter_enabled?
+          nav_items.each do |path, label| %>
             <% active = current_page?(path) %>
             <%= link_to label, path, class: "px-2.5 py-1 rounded transition-colors #{active ? 'text-gray-900 dark:text-gray-100 bg-gray-100 dark:bg-gray-800' : 'text-gray-400 dark:text-gray-500 hover:text-gray-700 dark:hover:text-gray-300'}" %>
           <% end %>
@@ -197,12 +198,13 @@
         class="md:hidden border-t border-gray-200 dark:border-gray-800"
       >
         <nav class="max-w-7xl mx-auto px-4 py-2 font-mono text-xs space-y-0.5">
-          <% [
+          <% mobile_nav_items = [
             [ruby_llm_agents.root_path, "dashboard"],
             [ruby_llm_agents.agents_path, "agents"],
-            [ruby_llm_agents.executions_path, "executions"],
-            [ruby_llm_agents.tenants_path, "tenants"]
-          ].each do |path, label| %>
+            [ruby_llm_agents.executions_path, "executions"]
+          ]
+          mobile_nav_items << [ruby_llm_agents.tenants_path, "tenants"] if tenant_filter_enabled?
+          mobile_nav_items.each do |path, label| %>
             <% active = current_page?(path) %>
             <%= link_to label, path, class: "block px-3 py-2 rounded transition-colors #{active ? 'text-gray-900 dark:text-gray-100 bg-gray-100 dark:bg-gray-800' : 'text-gray-400 dark:text-gray-500 hover:text-gray-700 dark:hover:text-gray-300'}" %>
           <% end %>

data/lib/generators/ruby_llm_agents/install_generator.rb

@@ -108,9 +108,10 @@ module RubyLlmAgents
       say "Skill files (*.md) help AI coding assistants understand how to use this gem."
       say ""
       say "Next steps:"
-      say "  1. Run migrations: rails db:migrate"
-      say "  2. Generate an agent: rails generate ruby_llm_agents:agent MyAgent query:required"
-      say "  3. Access the dashboard at: /agents"
+      say "  1. Set your API keys in config/initializers/ruby_llm_agents.rb"
+      say "  2. Run migrations: rails db:migrate"
+      say "  3. Generate an agent: rails generate ruby_llm_agents:agent MyAgent query:required"
+      say "  4. Access the dashboard at: /agents"
       say ""
       say "Generator commands:"
       say "  rails generate ruby_llm_agents:agent CustomerSupport query:required"

data/lib/generators/ruby_llm_agents/templates/initializer.rb.tt

@@ -5,6 +5,30 @@
 # For more information, see: https://github.com/adham90/ruby_llm-agents
 
 RubyLLM::Agents.configure do |config|
+  # ============================================
+  # LLM Provider API Keys
+  # ============================================
+  # Configure at least one provider. Set these in your environment
+  # or replace ENV[] calls with your keys directly.
+
+  # config.openai_api_key = ENV["OPENAI_API_KEY"]
+  # config.anthropic_api_key = ENV["ANTHROPIC_API_KEY"]
+  # config.gemini_api_key = ENV["GOOGLE_API_KEY"]
+
+  # Additional providers:
+  # config.deepseek_api_key = ENV["DEEPSEEK_API_KEY"]
+  # config.openrouter_api_key = ENV["OPENROUTER_API_KEY"]
+  # config.mistral_api_key = ENV["MISTRAL_API_KEY"]
+  # config.xai_api_key = ENV["XAI_API_KEY"]
+
+  # Custom endpoints (e.g., Azure OpenAI, local Ollama):
+  # config.openai_api_base = "https://your-resource.openai.azure.com"
+  # config.ollama_api_base = "http://localhost:11434"
+
+  # Connection settings:
+  # config.request_timeout = 120
+  # config.max_retries = 3
+
   # ============================================
   # Model Defaults
   # ============================================

data/lib/generators/ruby_llm_agents/upgrade_generator.rb

@@ -60,6 +60,28 @@ module RubyLlmAgents
       )
     end
 
+    def suggest_config_consolidation
+      ruby_llm_initializer = File.join(destination_root, "config/initializers/ruby_llm.rb")
+      agents_initializer = File.join(destination_root, "config/initializers/ruby_llm_agents.rb")
+
+      return unless File.exist?(ruby_llm_initializer) && File.exist?(agents_initializer)
+
+      say ""
+      say "Optional: You can now consolidate your API key configuration.", :yellow
+      say ""
+      say "Move your API keys from config/initializers/ruby_llm.rb"
+      say "into config/initializers/ruby_llm_agents.rb:"
+      say ""
+      say "  RubyLLM::Agents.configure do |config|"
+      say "    config.openai_api_key = ENV['OPENAI_API_KEY']"
+      say "    config.anthropic_api_key = ENV['ANTHROPIC_API_KEY']"
+      say "    # ... rest of your agent config"
+      say "  end"
+      say ""
+      say "Then delete config/initializers/ruby_llm.rb if it only contained API keys."
+      say ""
+    end
+
     def show_post_upgrade_message
       say ""
       say "RubyLLM::Agents upgrade complete!", :green

data/lib/ruby_llm/agents/base_agent.rb

@@ -613,29 +613,14 @@ module RubyLLM
         input_tokens = context.input_tokens || 0
         output_tokens = context.output_tokens || 0
 
-        input_price = extract_model_price(model_info, :input_price)
-        output_price = extract_model_price(model_info, :output_price)
+        input_price = model_info.pricing&.text_tokens&.input || 0
+        output_price = model_info.pricing&.text_tokens&.output || 0
 
         context.input_cost = (input_tokens / 1_000_000.0) * input_price
         context.output_cost = (output_tokens / 1_000_000.0) * output_price
         context.total_cost = (context.input_cost + context.output_cost).round(6)
       end
 
-      # Extracts price from model info (supports both hash and object access)
-      #
-      # @param model_info [Hash, Object] Model info
-      # @param key [Symbol] The price key
-      # @return [Float] The price, or 0 if not found
-      def extract_model_price(model_info, key)
-        if model_info.respond_to?(key)
-          model_info.send(key) || 0
-        elsif model_info.respond_to?(:[])
-          model_info[key] || 0
-        else
-          0
-        end
-      end
-
       # Finds model pricing info
       #
       # @param model_id [String] The model ID

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

@@ -351,6 +351,45 @@ module RubyLLM
       #       max_value_length: 5000
       #     }
 
+      # API key and provider attributes forwarded to RubyLLM.
+      # These let users configure everything in one place through
+      # RubyLLM::Agents.configure instead of a separate RubyLLM.configure block.
+      FORWARDED_RUBY_LLM_ATTRIBUTES = %i[
+        openai_api_key
+        anthropic_api_key
+        gemini_api_key
+        deepseek_api_key
+        openrouter_api_key
+        bedrock_api_key
+        bedrock_secret_key
+        bedrock_session_token
+        bedrock_region
+        mistral_api_key
+        perplexity_api_key
+        xai_api_key
+        gpustack_api_key
+        openai_api_base
+        openai_organization_id
+        openai_project_id
+        gemini_api_base
+        gpustack_api_base
+        ollama_api_base
+        vertexai_project_id
+        vertexai_location
+        request_timeout
+        max_retries
+      ].freeze
+
+      FORWARDED_RUBY_LLM_ATTRIBUTES.each do |attr|
+        define_method(:"#{attr}=") do |value|
+          RubyLLM.config.public_send(:"#{attr}=", value)
+        end
+
+        define_method(attr) do
+          RubyLLM.config.public_send(attr)
+        end
+      end
+
       # Attributes without validation (simple accessors)
       attr_accessor :default_model,
                     :async_logging,

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 = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/ruby_llm/agents/infrastructure/execution_logger_job.rb

@@ -25,10 +25,18 @@ module RubyLLM
       # @param execution_data [Hash] Execution attributes from instrumentation
       # @return [void]
       def perform(execution_data)
+        # Extract detail data before filtering (stored in separate table)
+        detail_data = execution_data.delete(:_detail_data) || execution_data.delete("_detail_data")
+
         # Filter to only known attributes to prevent schema mismatches
         filtered_data = filter_known_attributes(execution_data)
         execution = Execution.create!(filtered_data)
 
+        # Create detail record if present
+        if detail_data && detail_data.values.any? { |v| v.present? && v != {} && v != [] }
+          execution.create_detail!(detail_data)
+        end
+
         # Calculate costs if token data is available
         if execution.input_tokens && execution.output_tokens
           execution.calculate_costs!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-agents
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - adham90
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement