A platform for community discussion. Free, open, simple.
PERF: Reduce queries when reading cached AI summaries (#44359)
Natalie Tay3c43d1696fad
diff --git a/plugins/discourse-ai/lib/summarization.rb b/plugins/discourse-ai/lib/summarization.rbindex 1c6bc2085f8..88472defa57 100644--- a/plugins/discourse-ai/lib/summarization.rb+++ b/plugins/discourse-ai/lib/summarization.rb@@ -11,14 +11,12 @@ module DiscourseAilocale ||= source_locale(topic)- agent_klass = ai_agent.class_instance- llm_model ||= find_summarization_model(agent_klass)+ llm_model ||= find_summarization_model(ai_agent)return nil if llm_model.blank?DiscourseAi::Summarization::FoldContent.new(- build_bot(agent_klass, llm_model),DiscourseAi::Summarization::Strategies::TopicSummary.new(topic, locale:),- )+ ) { build_bot(ai_agent.class_instance, llm_model) }enddef topic_gist(topic, locale: nil, llm_model: nil)@@ -27,17 +25,15 @@ module DiscourseAireturn nilend- agent_klass = ai_agent.class_instance- llm_model ||= find_summarization_model(agent_klass)+ llm_model ||= find_summarization_model(ai_agent)return nil if llm_model.blank?locale ||= gist_source_locale(topic)strategy = DiscourseAi::Summarization::Strategies::HotTopicGists.new(topic, locale:)- DiscourseAi::Summarization::FoldContent.new(- build_bot(agent_klass, llm_model, output_tool: strategy.output_tool),- strategy,- )+ DiscourseAi::Summarization::FoldContent.new(strategy) do+ build_bot(ai_agent.class_instance, llm_model, output_tool: strategy.output_tool)+ endenddef chat_channel_summary(channel, time_window_in_hours, llm_model: nil)@@ -46,15 +42,13 @@ module DiscourseAireturn nilend- agent_klass = ai_agent.class_instance- llm_model ||= find_summarization_model(agent_klass)+ llm_model ||= find_summarization_model(ai_agent)return nil if llm_model.blank?DiscourseAi::Summarization::FoldContent.new(- build_bot(agent_klass, llm_model),DiscourseAi::Summarization::Strategies::ChatMessages.new(channel, time_window_in_hours),persist_summaries: false,- )+ ) { build_bot(ai_agent.class_instance, llm_model) }enddef gist_locales(topic)@@ -115,8 +109,9 @@ module DiscourseAi# Priorities are:# 1. Agent's default LLM# 2. SiteSetting.ai_default_llm_model (or newest LLM if not set)- def find_summarization_model(agent_klass)- model_id = agent_klass.default_llm_id || SiteSetting.ai_default_llm_model+ # @param agent [AiAgent, Class] - an agent record or its class instance; only default_llm_id is read+ def find_summarization_model(agent)+ model_id = agent.default_llm_id || SiteSetting.ai_default_llm_modelif model_id.present?LlmModel.find_by(id: model_id)diff --git a/plugins/discourse-ai/lib/summarization/fold_content.rb b/plugins/discourse-ai/lib/summarization/fold_content.rbindex 56db9a5730d..131a81dc003 100644--- a/plugins/discourse-ai/lib/summarization/fold_content.rb+++ b/plugins/discourse-ai/lib/summarization/fold_content.rb@@ -7,13 +7,18 @@ module DiscourseAiclass MissingToolOutput < StandardErrorend- def initialize(bot, strategy, persist_summaries: true)- @bot = bot+ # the bot is built on first use, so reading a stored summary doesn't load the agent or llm+ def initialize(strategy, persist_summaries: true, &build_bot)@strategy = strategy@persist_summaries = persist_summaries+ @build_bot = build_botend- attr_reader :bot, :strategy+ attr_reader :strategy++ def bot+ @bot ||= @build_bot.call+ end# @param user { User } - User object used for auditing usage.# @param &on_partial_blk { Block - Optional } - The passed block will get called with the LLM partial response.diff --git a/plugins/discourse-ai/lib/summarization/strategies/topic_summary.rb b/plugins/discourse-ai/lib/summarization/strategies/topic_summary.rbindex bb773510592..d883439b9f2 100644--- a/plugins/discourse-ai/lib/summarization/strategies/topic_summary.rb+++ b/plugins/discourse-ai/lib/summarization/strategies/topic_summary.rb@@ -108,15 +108,18 @@ module DiscourseAi.where("post_type = ?", Post.types[:regular]).where("NOT hidden").order(:post_number)+ .select(:post_number)- post_numbers = posts.limit(5).pluck(:post_number)- post_numbers += posts.reorder("posts.score desc").limit(50).pluck(:post_number)- post_numbers += posts.reorder("post_number desc").limit(5).pluck(:post_number)+ opening = posts.limit(5)+ highest_scored = posts.reorder("posts.score desc").limit(50)+ latest = posts.reorder("post_number desc").limit(5)Post.where(topic_id: target.id).joins(:user)- .where("post_number in (?)", post_numbers)+ .where(+ "post_number IN ((#{opening.to_sql}) UNION (#{highest_scored.to_sql}) UNION (#{latest.to_sql}))",+ ).order(:post_number)endenddiff --git a/plugins/discourse-ai/spec/lib/modules/summarization/strategies/topic_summary_spec.rb b/plugins/discourse-ai/spec/lib/modules/summarization/strategies/topic_summary_spec.rbindex ef0893a7ec4..cf526ac43db 100644--- a/plugins/discourse-ai/spec/lib/modules/summarization/strategies/topic_summary_spec.rb+++ b/plugins/discourse-ai/spec/lib/modules/summarization/strategies/topic_summary_spec.rb@@ -95,6 +95,28 @@ RSpec.describe DiscourseAi::Summarization::Strategies::TopicSummary doexpect(poster_name).to eq("test")endend++ context "when a topic without a best replies summary has many replies" do+ before do+ topic.update!(has_summary: false)+ (3..62).each { |post_number| Fabricate(:post, topic:, post_number:, user: post_2.user) }+ topic.posts.update_all(score: 0)+ topic.posts.where(post_number: 6..55).update_all(score: 10)+ end++ it "selects the opening, highest-scored, and latest posts in a single query" do+ queries = track_sql_queries { topic_summary.targets_data }++ expect(queries.grep(/FROM "posts"/).size).to eq(1)+ expect(topic_summary.targets_data.map { |content| content[:id] }).to eq([*1..55, *58..62])+ end++ it "still ranks unscored posts first, as Postgres sorts NULL scores first" do+ topic.posts.where(post_number: 56).update_all(score: nil)++ expect(topic_summary.targets_data.map { |content| content[:id] }).to include(56)+ end+ endenddescribe "#summary_fingerprint" dodiff --git a/plugins/discourse-ai/spec/services/discourse_ai/topic_summarization_spec.rb b/plugins/discourse-ai/spec/services/discourse_ai/topic_summarization_spec.rbindex 2b25551d639..97df835a52e 100644--- a/plugins/discourse-ai/spec/services/discourse_ai/topic_summarization_spec.rb+++ b/plugins/discourse-ai/spec/services/discourse_ai/topic_summarization_spec.rb@@ -48,6 +48,14 @@ describe DiscourseAi::TopicSummarization doI18n.with_locale(:he) { described_class.for(topic, user, scope: user.guardian) }expect(original_service.cached_summary).to eq(english_summary)end++ it "reads a cached summary without building the summarization bot" do+ cached_summary = create_cached_summary(topic)+ allow(DiscourseAi::Summarization).to receive(:build_bot).and_call_original++ expect(described_class.for(topic, nil).cached_summary).to eq(cached_summary)+ expect(DiscourseAi::Summarization).not_to have_received(:build_bot)+ endenddescribe "#summarize" do