A platform for community discussion. Free, open, simple.
FEATURE: Allow excluding groups from Ask AI reports (#43771)
Natalie Tayb809efdd1cc4
diff --git a/plugins/discourse-ai/app/jobs/scheduled/generate_weekly_ask_ai_report.rb b/plugins/discourse-ai/app/jobs/scheduled/generate_weekly_ask_ai_report.rbindex d16eb86a26b..a887f9c6b4f 100644--- a/plugins/discourse-ai/app/jobs/scheduled/generate_weekly_ask_ai_report.rb+++ b/plugins/discourse-ai/app/jobs/scheduled/generate_weekly_ask_ai_report.rb@@ -12,7 +12,10 @@ module Jobsend_date = Date.yesterdaystart_date = end_date - 6- unless AskAiLog.where(asked_at: start_date.beginning_of_day..end_date.end_of_day).exists?+ unless AskAiLog+ .for_reports+ .where(asked_at: start_date.beginning_of_day..end_date.end_of_day)+ .exists?returnenddiff --git a/plugins/discourse-ai/app/models/ask_ai_log.rb b/plugins/discourse-ai/app/models/ask_ai_log.rbindex e831f9661db..d607c657ecd 100644--- a/plugins/discourse-ai/app/models/ask_ai_log.rb+++ b/plugins/discourse-ai/app/models/ask_ai_log.rb@@ -3,6 +3,13 @@class AskAiLog < ActiveRecord::Basebelongs_to :user+ def self.for_reports+ group_ids = SiteSetting.ai_ask_ai_report_exclude_groups_map+ return all if group_ids.empty?++ where.not(user_id: GroupUser.where(group_id: group_ids).select(:user_id))+ end+enum :ask_outcome, { answered: 0, no_answer: 1, failed: 2, cancelled: 3 }, prefix: trueenum :failure_stage, { rewrite: 0, retrieval: 1, synthesis: 2 }, prefix: trueenddiff --git a/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.js b/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.jsindex be8fe952091..58fb9e15c82 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.js+++ b/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.js@@ -194,6 +194,7 @@ export const AI_FEATURE_SETTING_GROUPS = {titleKey: "discourse_ai.features.search.setting_groups.ask_ai_reports",settings: ["ai_ask_ai_report_weekly_enabled",+ "ai_ask_ai_report_exclude_groups","ai_ask_ai_report_max_asks","ai_ask_ai_report_recipient_groups",],diff --git a/plugins/discourse-ai/config/locales/server.en.yml b/plugins/discourse-ai/config/locales/server.en.ymlindex 625de952ad0..f4da4ee4cd9 100644--- a/plugins/discourse-ai/config/locales/server.en.yml+++ b/plugins/discourse-ai/config/locales/server.en.yml@@ -66,6 +66,7 @@ en:site_settings:ai_ask_ai_report_weekly_enabled: "Automatically generate an Ask AI report each week for the previous seven complete days. Reports appear on the dashboard. If groups are selected in {{setting:ai_ask_ai_report_recipient_groups}}, they also receive a PM. Requires Ask AI to be enabled and a configured report language model. Manual reports remain available."ai_ask_ai_report_agent: "Agent used to group users’ questions into Ask AI dashboard reports."+ ai_ask_ai_report_exclude_groups: "Exclude questions asked by members of these groups from new Ask AI reports. Leave empty to include everyone."ai_ask_ai_report_max_asks: "Maximum number of asks analysed per report. Uses all asks in the selected period or the latest asks up to this limit, whichever is fewer. Larger reports need more model context and may cost more."ai_ask_ai_report_recipient_groups: "Groups that receive automatic weekly report PMs and can be included in manual report PMs. Reports include users’ questions. Leave empty to keep automatic reports on the dashboard only."discourse_ai_enabled: "Enable the discourse AI plugin."@@ -297,7 +298,7 @@ en:discourse_ai:ask_ai_reports:no_model: "Configure a default AI language model before generating reports."- no_asks: "There are no asks in this period."+ no_asks: "There are no questions matching the report settings in this period."title: "What users are asking: %{start} – %{end}"coverage: "Analysed the latest %{count} of %{total} asks in this period. Questions can appear in multiple subjects."ungrouped_name: "Ungrouped questions"diff --git a/plugins/discourse-ai/config/settings.yml b/plugins/discourse-ai/config/settings.ymlindex 1d84bdd5ad5..586f0e24e0a 100644--- a/plugins/discourse-ai/config/settings.yml+++ b/plugins/discourse-ai/config/settings.yml@@ -464,6 +464,13 @@ discourse_ai:type: enumenum: "DiscourseAi::Configuration::AgentEnumerator"area: "ai-features/search"+ ai_ask_ai_report_exclude_groups:+ type: group_list+ list_type: compact+ default: "3"+ disallowed_groups: "0"+ allow_any: false+ area: "ai-features/search"ai_ask_ai_report_max_asks:default: 200min: 1diff --git a/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rb b/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rbindex 7b1ae1e68e6..e95d2df4e20 100644--- a/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rb+++ b/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rb@@ -25,7 +25,7 @@ module DiscourseAiendcutoff = [Time.current, last.end_of_day].min- logs = AskAiLog.where(asked_at: first.beginning_of_day..cutoff)+ logs = AskAiLog.for_reports.where(asked_at: first.beginning_of_day..cutoff)report = nilDistributedMutex.synchronize("ask-ai-report-request-#{first}-#{last}") doselected =diff --git a/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rb b/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rbindex c361d049d2f..21861732c85 100644--- a/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rb+++ b/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rb@@ -2,6 +2,7 @@describe Jobs::GenerateAskAiReport dofab!(:admin)+ fab!(:user)fab!(:llm_model)before do@@ -21,7 +22,7 @@ describe Jobs::GenerateAskAiReport doendit "stores verified subjects and sends one PM even when the job runs twice" do- ask = AskAiLog.create!(user: admin, query: "How do I configure email?", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "How do I configure email?", asked_at: Time.current)report = request_reportoutput = {insights: [@@ -56,7 +57,7 @@ describe Jobs::GenerateAskAiReport doendit "does not publish a result that arrives after the report expires" do- ask = AskAiLog.create!(user: admin, query: "Question", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "Question", asked_at: Time.current)report = request_reportoutput = {"summary" => "Summary",@@ -81,7 +82,7 @@ describe Jobs::GenerateAskAiReport doendit "does not call the model for an expired queued report" do- AskAiLog.create!(user: admin, query: "Question", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Question", asked_at: Time.current)report = request_reportfreeze_time 31.minutes.from_nowallow(DiscourseAi::Completions::Llm).to receive(:proxy)@@ -94,8 +95,8 @@ describe Jobs::GenerateAskAiReport doit "fails without publishing when a selected ask was deleted before generation" doSiteSetting.ai_ask_ai_report_max_asks = 1- AskAiLog.create!(user: admin, query: "Older question", asked_at: Time.current)- selected = AskAiLog.create!(user: admin, query: "Selected question", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Older question", asked_at: Time.current)+ selected = AskAiLog.create!(user:, query: "Selected question", asked_at: Time.current)report = request_reportselected.destroy!@@ -107,7 +108,7 @@ describe Jobs::GenerateAskAiReport doendit "fails without publishing when the model invents ask IDs" do- ask = AskAiLog.create!(user: admin, query: "Email", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)report = request_reportoutput = {insights: [],@@ -125,8 +126,8 @@ describe Jobs::GenerateAskAiReport doendit "keeps ungrouped questions without requesting a second analysis" do- grouped = AskAiLog.create!(user: admin, query: "Email setup", asked_at: Time.current)- ungrouped = AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)+ grouped = AskAiLog.create!(user:, query: "Email setup", asked_at: Time.current)+ ungrouped = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)report = request_reportoutput = {summary: "Email setup questions",@@ -145,7 +146,7 @@ describe Jobs::GenerateAskAiReport doendit "rejects duplicate assignments without requesting a corrected report" do- ask = AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)report = request_reportsubject = { name: "Cats", description: "Cat questions", ask_ids: [ask.id] }invalid = {@@ -165,7 +166,7 @@ describe Jobs::GenerateAskAiReport doendit "delivers to the admins group only when selected" do- ask = AskAiLog.create!(user: admin, query: "Email", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)report = request_report(send_to_groups: true)output = {insights: [],@@ -185,7 +186,7 @@ describe Jobs::GenerateAskAiReport doit "uses the configured groups when the job runs" dogroup = Fabricate(:group)SiteSetting.ai_ask_ai_report_recipient_groups = group.id.to_s- ask = AskAiLog.create!(user: admin, query: "Email", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)report = request_report(send_to_groups: true)other_group = Fabricate(:group)SiteSetting.ai_ask_ai_report_recipient_groups = other_group.id.to_s@@ -204,7 +205,7 @@ describe Jobs::GenerateAskAiReport doendit "allows overlapping subjects and uses the reporter model selected at generation time" do- ask = AskAiLog.create!(user: admin, query: "Ask AI settings 猫", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "Ask AI settings 猫", asked_at: Time.current)report = request_reportmodel = Fabricate(:llm_model)agent = Fabricate(:ai_agent, enabled: false, default_llm_id: model.id)@@ -230,7 +231,7 @@ describe Jobs::GenerateAskAiReport doendit "rejects insights that cite questions outside the report" do- ask = AskAiLog.create!(user: admin, query: "Email", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)report = request_reportoutput = {summary: "Email setup",@@ -252,7 +253,7 @@ describe Jobs::GenerateAskAiReport doendit "does not publish after the requester loses admin access" do- AskAiLog.create!(user: admin, query: "Email", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Email", asked_at: Time.current)report = request_reportadmin.update!(admin: false)described_class.new.execute(report_id: report.id)diff --git a/plugins/discourse-ai/spec/jobs/scheduled/generate_weekly_ask_ai_report_spec.rb b/plugins/discourse-ai/spec/jobs/scheduled/generate_weekly_ask_ai_report_spec.rbindex 257d08efe83..ba7e1efc784 100644--- a/plugins/discourse-ai/spec/jobs/scheduled/generate_weekly_ask_ai_report_spec.rb+++ b/plugins/discourse-ai/spec/jobs/scheduled/generate_weekly_ask_ai_report_spec.rb@@ -2,6 +2,7 @@describe Jobs::GenerateWeeklyAskAiReport dofab!(:admin)+ fab!(:user)fab!(:llm_model)before do@@ -11,8 +12,19 @@ describe Jobs::GenerateWeeklyAskAiReport dofreeze_time Time.utc(2026, 9, 16, 12)end+ it "skips a week containing only questions from excluded groups" do+ SiteSetting.ai_ask_ai_report_weekly_enabled = true+ group = Fabricate(:group)+ group.add(user)+ SiteSetting.ai_ask_ai_report_exclude_groups = group.id.to_s+ AskAiLog.create!(user:, query: "Excluded question", asked_at: 1.day.ago)++ expect { described_class.new.execute({}) }.not_to change(AskAiReport, :count)+ expect(Jobs::GenerateAskAiReport.jobs).to be_empty+ end+it "does not generate automatically by default" do- AskAiLog.create!(user: admin, query: "Question", asked_at: 1.day.ago)+ AskAiLog.create!(user:, query: "Question", asked_at: 1.day.ago)expect(SiteSetting.ai_ask_ai_report_weekly_enabled).to eq(false)expect { described_class.new.execute({}) }.not_to change(AskAiReport, :count)end@@ -20,7 +32,7 @@ describe Jobs::GenerateWeeklyAskAiReport doit "skips empty periods and respects the Ask AI switches" doSiteSetting.ai_ask_ai_report_weekly_enabled = trueexpect { described_class.new.execute({}) }.not_to change(AskAiReport, :count)- AskAiLog.create!(user: admin, query: "Question", asked_at: 1.day.ago)+ AskAiLog.create!(user:, query: "Question", asked_at: 1.day.ago)SiteSetting.ai_ask_ai_enabled = falseexpect { described_class.new.execute({}) }.not_to change(AskAiReport, :count)SiteSetting.ai_ask_ai_enabled = true@@ -30,15 +42,11 @@ describe Jobs::GenerateWeeklyAskAiReport doit "generates the previous seven complete days once and delivers to the configured groups" doSiteSetting.ai_ask_ai_report_weekly_enabled = true- first = AskAiLog.create!(user: admin, query: "Start of week", asked_at: Time.utc(2026, 9, 9))+ first = AskAiLog.create!(user:, query: "Start of week", asked_at: Time.utc(2026, 9, 9))last =- AskAiLog.create!(- user: admin,- query: "End of week",- asked_at: Time.utc(2026, 9, 15, 23, 59, 59),- )- AskAiLog.create!(user: admin, query: "Too old", asked_at: Time.utc(2026, 9, 8, 23, 59, 59))- AskAiLog.create!(user: admin, query: "Today", asked_at: Time.current)+ AskAiLog.create!(user:, query: "End of week", asked_at: Time.utc(2026, 9, 15, 23, 59, 59))+ AskAiLog.create!(user:, query: "Too old", asked_at: Time.utc(2026, 9, 8, 23, 59, 59))+ AskAiLog.create!(user:, query: "Today", asked_at: Time.current)described_class.new.execute({})report = AskAiReport.lastexpect(report).to have_attributes(@@ -73,7 +81,7 @@ describe Jobs::GenerateWeeklyAskAiReport doit "keeps automatic reports separate from manual requests for the same period" doSiteSetting.ai_ask_ai_report_weekly_enabled = true- AskAiLog.create!(user: admin, query: "Question", asked_at: 1.day.ago)+ AskAiLog.create!(user:, query: "Question", asked_at: 1.day.ago)described_class.new.execute({})automatic = AskAiReport.lastmanual =@@ -89,7 +97,7 @@ describe Jobs::GenerateWeeklyAskAiReport doit "does not generate a queued automatic report after weekly reporting is disabled" doSiteSetting.ai_ask_ai_report_weekly_enabled = true- AskAiLog.create!(user: admin, query: "Question", asked_at: 1.day.ago)+ AskAiLog.create!(user:, query: "Question", asked_at: 1.day.ago)described_class.new.execute({})report = AskAiReport.lastSiteSetting.ai_ask_ai_report_weekly_enabled = false@@ -103,7 +111,7 @@ describe Jobs::GenerateWeeklyAskAiReport doit "keeps automatic reports on the dashboard when no recipient groups are configured" doSiteSetting.ai_ask_ai_report_weekly_enabled = trueSiteSetting.ai_ask_ai_report_recipient_groups = ""- ask = AskAiLog.create!(user: admin, query: "Question", asked_at: 1.day.ago)+ ask = AskAiLog.create!(user:, query: "Question", asked_at: 1.day.ago)described_class.new.execute({})report = AskAiReport.lastoutput = {diff --git a/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rb b/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rbindex 115df7559b0..0fd32574e74 100644--- a/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rb+++ b/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rb@@ -2,6 +2,7 @@describe DiscourseAi::AdminDashboard::AskAiReportRequest dofab!(:admin)+ fab!(:user)fab!(:llm_model)before do@@ -11,8 +12,63 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest dofreeze_time Time.utc(2026, 9, 9, 12)end+ it "uses the default excluded group and includes everyone when the setting is cleared" do+ SiteSetting.ai_ask_ai_report_max_asks = 1+ ask = AskAiLog.create!(user:, query: "Member question", asked_at: Time.current)+ AskAiLog.create!(user: admin, query: "Admin test", asked_at: Time.current)+ moderator = Fabricate(:moderator)+ staff_ask = AskAiLog.create!(user: moderator, query: "Moderator test", asked_at: Time.current)++ report = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")+ expect(report.selected_ask_ids).to eq([ask.id])+ expect(report.total_ask_count).to eq(1)+ expect(report.reported_ask_count).to eq(1)++ SiteSetting.ai_ask_ai_report_exclude_groups = ""+ included = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")+ expect(included.id).not_to eq(report.id)+ expect(included.selected_ask_ids).to eq([staff_ask.id])+ expect(included.total_ask_count).to eq(3)+ expect(AskAiLog.count).to eq(3)+ end++ it "excludes members of any selected group before counting and sampling" do+ SiteSetting.ai_ask_ai_report_max_asks = 1+ category_moderators = Fabricate(:group)+ testers = Fabricate(:group)+ category_moderator = Fabricate(:user)+ tester = Fabricate(:user)+ category_moderators.add(category_moderator)+ testers.add(tester)+ testers.add(category_moderator)+ SiteSetting.ai_ask_ai_report_exclude_groups = "#{category_moderators.id}|#{testers.id}"++ ask = AskAiLog.create!(user: admin, query: "Included admin question", asked_at: Time.current)+ AskAiLog.create!(+ user: category_moderator,+ query: "Category moderator question",+ asked_at: Time.current,+ )+ AskAiLog.create!(user: tester, query: "Test question", asked_at: Time.current)++ report = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")+ expect(report.selected_ask_ids).to eq([ask.id])+ expect(report.total_ask_count).to eq(1)+ expect(report.reported_ask_count).to eq(1)+ expect(AskAiLog.count).to eq(3)+ end++ it "does not enqueue a report when only staff have asked questions" do+ AskAiLog.create!(user: admin, query: "Admin test", asked_at: Time.current)+ expect {+ described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")+ }.to raise_error(Discourse::InvalidParameters)+ expect(AskAiReport.count).to eq(0)+ expect(Jobs::GenerateAskAiReport.jobs).to be_empty+ end+it "reuses the snapshot across requesters and only enqueues one job" do- ask = AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)report = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")other_admin = Fabricate(:admin)@@ -35,7 +91,7 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest doendit "allows a manual replacement for an abandoned report" do- AskAiLog.create!(user: admin, query: "Question", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Question", asked_at: Time.current)previous = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")previous.update!(report_status: :running)freeze_time 31.minutes.from_now@@ -49,9 +105,9 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest doendit "creates a new snapshot when more asks arrive" do- AskAiLog.create!(user: admin, query: "First", asked_at: Time.current)+ AskAiLog.create!(user:, query: "First", asked_at: Time.current)first = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")- AskAiLog.create!(user: admin, query: "Second", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Second", asked_at: Time.current)second = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")expect(second.id).not_to eq(first.id)@@ -92,7 +148,7 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest doit "limits the snapshot and keeps its full coverage count" doSiteSetting.ai_ask_ai_report_max_asks = 2- 3.times { AskAiLog.create!(user: admin, query: "Question", asked_at: Time.current) }+ 3.times { AskAiLog.create!(user:, query: "Question", asked_at: Time.current) }report = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")expect(report).to have_attributes(reported_ask_count: 2, total_ask_count: 3)expect(report.selected_logs.count).to eq(2)@@ -100,9 +156,9 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest doit "does not replace a deleted selected ask with an older unselected ask" doSiteSetting.ai_ask_ai_report_max_asks = 2- older = AskAiLog.create!(user: admin, query: "Older", asked_at: 3.minutes.ago)- middle = AskAiLog.create!(user: admin, query: "Middle", asked_at: 2.minutes.ago)- newest = AskAiLog.create!(user: admin, query: "Newest", asked_at: 1.minute.ago)+ older = AskAiLog.create!(user:, query: "Older", asked_at: 3.minutes.ago)+ middle = AskAiLog.create!(user:, query: "Middle", asked_at: 2.minutes.ago)+ newest = AskAiLog.create!(user:, query: "Newest", asked_at: 1.minute.ago)report = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")expect(report.selected_logs.pluck(:id)).to eq([newest.id, middle.id])newest.destroy!@@ -111,11 +167,11 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest doit "keeps the request sample when an ask arrives before the report row is inserted" doSiteSetting.ai_ask_ai_report_max_asks = 2- first = AskAiLog.create!(user: admin, query: "First", asked_at: 1.minute.ago)- second = AskAiLog.create!(user: admin, query: "Second", asked_at: 30.seconds.ago)+ first = AskAiLog.create!(user:, query: "First", asked_at: 1.minute.ago)+ second = AskAiLog.create!(user:, query: "Second", asked_at: 30.seconds.ago)allow(AskAiReport).to receive(:create!).and_wrap_original do |method, **args|freeze_time 1.second.from_now- AskAiLog.create!(user: admin, query: "Arrived during request", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Arrived during request", asked_at: Time.current)method.call(**args)endreport = described_class.call(user: admin, start_date: "2026-09-01", end_date: "2026-09-09")@@ -124,7 +180,7 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest doit "supports custom periods longer than a year while keeping the sample bounded" doSiteSetting.ai_ask_ai_report_max_asks = 1- 2.times { AskAiLog.create!(user: admin, query: "Question", asked_at: Time.current) }+ 2.times { AskAiLog.create!(user:, query: "Question", asked_at: Time.current) }report = described_class.call(user: admin, start_date: "2024-01-01", end_date: "2026-09-09")expect(report).to have_attributes(total_ask_count: 2, reported_ask_count: 1)enddiff --git a/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rb b/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rbindex 64a42e01493..ac4440e2b6e 100644--- a/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rb+++ b/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rb@@ -2,6 +2,7 @@describe DiscourseAi::Admin::AskAiReportsController dofab!(:admin)+ fab!(:user)fab!(:moderator)fab!(:llm_model)@@ -14,8 +15,8 @@ describe DiscourseAi::Admin::AskAiReportsController doit "accepts the dashboard date range when the browser is ahead of UTC" dofreeze_time Time.utc(2026, 9, 16, 17)sign_in(admin)- ask = AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)- AskAiLog.create!(user: admin, query: "Future", asked_at: 1.hour.from_now)+ ask = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Future", asked_at: 1.hour.from_now)dashboard =DiscourseAi::AdminDashboard::AskAi.build(start_date: "2026-08-19",@@ -91,13 +92,13 @@ describe DiscourseAi::Admin::AskAiReportsController do)ask =AskAiLog.create!(- user: admin,+ user:,query: "猫",asked_at: Time.utc(2026, 9, 16, 7, 25),answer: "Stored answer",ask_outcome: :answered,)- AskAiLog.create!(user: admin, query: "Not included", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Not included", asked_at: Time.current)[report, other_report].each do |item|2.times do |position|subject =@@ -158,7 +159,7 @@ describe DiscourseAi::Admin::AskAiReportsController doit "returns the queued snapshot and report history" dosign_in(admin)- AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)+ AskAiLog.create!(user:, query: "猫", asked_at: Time.current)post "/admin/plugins/discourse-ai/ask-ai-reports.json",params: {start_date: Date.current.to_s,@@ -177,7 +178,7 @@ describe DiscourseAi::Admin::AskAiReportsController doit "accepts a custom period longer than a year and persists its selected asks" dosign_in(admin)- ask = AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)start_date = 2.years.ago.to_date.iso8601post "/admin/plugins/discourse-ai/ask-ai-reports.json",params: {@@ -221,13 +222,13 @@ describe DiscourseAi::Admin::AskAiReportsController do)ids =22.times.map do |index|- ask = AskAiLog.create!(user: admin, query: "猫 #{index}", asked_at: Time.current)+ ask = AskAiLog.create!(user:, query: "猫 #{index}", asked_at: Time.current)subject.ask_ai_report_subject_asks.create!(ask_ai_log: ask)ask.idendduplicate =AskAiLog.create!(- user: admin,+ user:,query: "猫 21",asked_at: Time.current,answer: "Stored answer 猫",@@ -236,7 +237,7 @@ describe DiscourseAi::Admin::AskAiReportsController dosubject.ask_ai_report_subject_asks.create!(ask_ai_log: duplicate)ids[-1] = duplicate.idAskAiLog.where(id: ids.first).delete_all- AskAiLog.create!(user: admin, query: "Unrelated", asked_at: Time.current)+ AskAiLog.create!(user:, query: "Unrelated", asked_at: Time.current)path ="/admin/plugins/discourse-ai/ask-ai-reports/#{report.id}/subjects/#{subject.id}/asks.json"get pathdiff --git a/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.js b/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.jsindex a89aa44eda4..4ce7d184809 100644--- a/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.js+++ b/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.js@@ -91,6 +91,7 @@ module("Unit | Lib | ai-feature-setting-groups", function () {assert.deepEqual(groups[2].settings, ["ai_ask_ai_allowed_groups"]);assert.deepEqual(groups[3].settings, ["ai_ask_ai_report_weekly_enabled",+ "ai_ask_ai_report_exclude_groups","ai_ask_ai_report_max_asks","ai_ask_ai_report_recipient_groups",]);