Skip to content

A platform for community discussion. Free, open, simple.

PERF: Reduce database queries when loading AI agents (#44503)

Alan Guo Xiang Tan9383800da3e2
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_agents_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_agents_controller.rb
index d8427f17030..8abe869f2eb 100644
--- a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_agents_controller.rb
+++ b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_agents_controller.rb
@@ -640,6 +640,8 @@ module DiscourseAi
selected_tool_names: mcp_server_tool_names[assignment.ai_mcp_server_id.to_s],
)
end
+
+ ai_agent.bump_cache
end
def hidden_disabled_mcp_server_ids(ai_agent, submitted_server_ids)
diff --git a/plugins/discourse-ai/app/models/ai_agent.rb b/plugins/discourse-ai/app/models/ai_agent.rb
index e794fab4fd9..2f745665e7e 100644
--- a/plugins/discourse-ai/app/models/ai_agent.rb
+++ b/plugins/discourse-ai/app/models/ai_agent.rb
@@ -110,8 +110,7 @@ class AiAgent < ActiveRecord::Base
else
:value_everyone_allowed
end
- agents =
- agent_cache[key] ||= AiAgent.ordered.all.limit(MAX_AGENTS_PER_SITE).map(&:class_instance)
+ agents = agent_cache[key] ||= all_agent_records(enabled_only: false).map(&:class_instance)
if enabled_only
agents.select(&:enabled)
@@ -379,10 +378,14 @@ class AiAgent < ActiveRecord::Base
reserved_names = tools.filter_map { |tool| tool.signature[:name].to_s.downcase.presence }
reserved_names << DiscourseAi::Agents::Tools::SpawnAgent.name if subagent_ids.present?
+ ActiveRecord::Associations::Preloader.new(
+ records: [self],
+ associations: {
+ ai_agent_mcp_servers: :ai_mcp_server,
+ },
+ ).call
enabled_mcp_server_assignments =
- ai_agent_mcp_servers
- .includes(:ai_mcp_server)
- .select { |assignment| assignment.ai_mcp_server&.enabled? }
+ ai_agent_mcp_servers.select { |assignment| assignment.ai_mcp_server&.enabled? }
enabled_mcp_servers = enabled_mcp_server_assignments.map(&:ai_mcp_server)
selected_tool_names_by_server =
enabled_mcp_server_assignments.each_with_object({}) do |assignment, hash|
diff --git a/plugins/discourse-ai/spec/requests/topics_controller_spec.rb b/plugins/discourse-ai/spec/requests/topics_controller_spec.rb
new file mode 100644
index 00000000000..d410f2ca134
--- /dev/null
+++ b/plugins/discourse-ai/spec/requests/topics_controller_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+RSpec.describe TopicsController do
+ fab!(:user)
+ fab!(:post)
+
+ before do
+ enable_current_plugin
+ SiteSetting.ai_bot_enabled = false
+ end
+
+ describe "#show" do
+ before { sign_in(user) }
+
+ it "preloads agents without N+1 queries for an HTML request when the bot is disabled" do
+ get post.topic.relative_url
+ expect(response.status).to eq(200)
+
+ agents = []
+ query_counts =
+ [1, 2].map do |agent_count|
+ (agent_count - agents.size).times do
+ agents << Fabricate(
+ :ai_agent,
+ user: Fabricate(:user),
+ enabled: true,
+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],
+ tools: [],
+ )
+ end
+ AiAgent.agent_cache.flush!
+
+ queries = track_sql_queries { get post.topic.relative_url }
+
+ expect(response.status).to eq(200)
+ expect(response.media_type).to eq("text/html")
+ preloaded = JSON.parse(css_select("script#data-preloaded").first.text)
+ current_user = JSON.parse(preloaded["currentUser"])
+ expect(current_user["ai_enabled_agents"].map { |agent| agent["id"] }).to include(
+ *agents.map(&:id),
+ )
+ expect(queries.grep(/FROM "ai_agent_mcp_servers"/)).to be_present
+
+ queries.size
+ end
+
+ expect(query_counts.last).to eq(query_counts.first)
+ end
+ end
+end