A platform for community discussion. Free, open, simple.
FIX: Keep AI bot PM titles working once the bot's edit budget is spent (#42523)
Régis Hanole971bdff543a
diff --git a/plugins/discourse-ai/lib/ai_bot/playground.rb b/plugins/discourse-ai/lib/ai_bot/playground.rbindex 1f598e6c4c3..04b8b012ab7 100644--- a/plugins/discourse-ai/lib/ai_bot/playground.rb+++ b/plugins/discourse-ai/lib/ai_bot/playground.rb@@ -8,6 +8,7 @@ module DiscourseAi# 10 minutes is enough for vast majority of cases# there is a small chance that some reasoning models may take longerMAX_STREAM_DELAY_SECONDS = 600+ FALLBACK_TITLE_LENGTH = 80attr_reader :bot@@ -295,12 +296,33 @@ module DiscourseAiDiscourseAi::Completions::Llm.text_from_response(bot.llm.generate(title_prompt, user: user, feature_name: "bot_title"),)- new_title = new_title.strip.split("\n").last+ new_title = new_title.to_s.strip.split("\n").last.to_s+ new_title = new_title.delete_prefix('"').delete_suffix('"')++ first_post = post.topic.first_post++ if new_title.blank?+ new_title =+ PrettyText.excerpt(+ first_post.cooked,+ FALLBACK_TITLE_LENGTH,+ strip_links: true,+ text_entities: true,+ )+ end- PostRevisor.new(post.topic.first_post, post.topic).revise!(- bot.bot_user,- title: new_title.sub(/\A"/, "").sub(/"\Z/, ""),- )+ return if new_title.blank?++ new_title = new_title.truncate(SiteSetting.max_topic_title_length, separator: /\s/)++ revised =+ PostRevisor.new(first_post, post.topic).revise!(+ bot.bot_user,+ { title: new_title },+ bypass_rate_limiter: true,+ )++ return if !revisedallowed_users = post.topic.topic_allowed_users.pluck(:user_id)MessageBus.publish(@@ -313,6 +335,8 @@ module DiscourseAi{ title: post.topic.title, topic_id: post.topic.id },user_ids: allowed_users,)+ rescue StandardError => e+ Discourse.warn_exception(e, message: "Discourse AI: Unable to generate title")enddef reply_to_chat_message(message, channel, context_post_ids)@@ -689,6 +713,7 @@ module DiscourseAi{ raw: reply },skip_validations: true,force_new_version: true,+ bypass_rate_limiter: true,)save_ai_custom_fields(reply_post, authorization_user_id: authorization_user_id)elsediff --git a/plugins/discourse-ai/lib/ai_bot/stream_reply_custom_tools_session.rb b/plugins/discourse-ai/lib/ai_bot/stream_reply_custom_tools_session.rbindex 5a248718921..c6ee7aa6b86 100644--- a/plugins/discourse-ai/lib/ai_bot/stream_reply_custom_tools_session.rb+++ b/plugins/discourse-ai/lib/ai_bot/stream_reply_custom_tools_session.rb@@ -543,11 +543,7 @@ module DiscourseAiagent_class = DiscourseAi::Agents::Agent.find_by(id: @agent.id, user: @current_user)if agent_classbot = DiscourseAi::Agents::Bot.as(@reply_user, agent: agent_class.new, model: llm_model)- begin- DiscourseAi::AiBot::Playground.new(bot).title_playground(reply_post, @user)- rescue StandardError => e- Discourse.warn_exception(e, message: "Discourse AI: Unable to generate stream title")- end+ DiscourseAi::AiBot::Playground.new(bot).title_playground(reply_post, @user)endendenddiff --git a/plugins/discourse-ai/lib/automation/llm_tagger.rb b/plugins/discourse-ai/lib/automation/llm_tagger.rbindex 0622d9a6137..0f416ed7d18 100644--- a/plugins/discourse-ai/lib/automation/llm_tagger.rb+++ b/plugins/discourse-ai/lib/automation/llm_tagger.rb@@ -189,9 +189,12 @@ module DiscourseAifirst_post = topic.posts.where(post_number: 1).firstreturn unless first_post- changes = { tags: all_tags, bypass_bump: true, skip_validations: true }-- first_post.revise(Discourse.system_user, changes)+ first_post.revise(+ Discourse.system_user,+ { tags: all_tags },+ bypass_bump: true,+ skip_validations: true,+ )endendenddiff --git a/plugins/discourse-ai/lib/automation/llm_triage.rb b/plugins/discourse-ai/lib/automation/llm_triage.rbindex 8e96b49fda1..afd8a3d7fcf 100644--- a/plugins/discourse-ai/lib/automation/llm_triage.rb+++ b/plugins/discourse-ai/lib/automation/llm_triage.rb@@ -216,9 +216,12 @@ module DiscourseAiif changes.present?first_post = post.topic.posts.where(post_number: 1).first- changes[:bypass_bump] = true- changes[:skip_validations] = true- first_post.revise(Discourse.system_user, changes)+ first_post.revise(+ Discourse.system_user,+ changes,+ bypass_bump: true,+ skip_validations: true,+ )endpost.topic.update!(visible: false) if hide_topicdiff --git a/plugins/discourse-ai/spec/lib/automation/llm_tagger_spec.rb b/plugins/discourse-ai/spec/lib/automation/llm_tagger_spec.rbindex 0fb4ba246e4..69bc1c5da34 100644--- a/plugins/discourse-ai/spec/lib/automation/llm_tagger_spec.rb+++ b/plugins/discourse-ai/spec/lib/automation/llm_tagger_spec.rb@@ -66,8 +66,9 @@ RSpec.describe DiscourseAi::Automation::LlmTagger doTag.find_by(name: "question")&.update!(public_topic_count: 1)end- it "processes a post and applies appropriate tags" do+ it "processes a post and applies appropriate tags without bumping the topic" domock_response = { "tags" => ["bug"], "confidence" => 90 }.to_json+ bumped_at = topic.bumped_atDiscourseAi::Completions::Llm.with_prepared_responses([mock_response]) dodescribed_class.handle(@@ -83,6 +84,7 @@ RSpec.describe DiscourseAi::Automation::LlmTagger doendexpect(topic.reload.tags.map(&:name)).to include("bug")+ expect(topic.bumped_at).to eq_time(bumped_at)endit "includes document uploads independently from image uploads" dodiff --git a/plugins/discourse-ai/spec/lib/modules/ai_bot/playground_spec.rb b/plugins/discourse-ai/spec/lib/modules/ai_bot/playground_spec.rbindex 3927da01be0..036ba85499f 100644--- a/plugins/discourse-ai/spec/lib/modules/ai_bot/playground_spec.rb+++ b/plugins/discourse-ai/spec/lib/modules/ai_bot/playground_spec.rb@@ -1131,6 +1131,80 @@ RSpec.describe DiscourseAi::AiBot::Playground doexpect(pm.reload.title).to eq(expected_response)endend++ it "falls back to an excerpt of the first post when the model returns nothing" do+ DiscourseAi::Completions::Llm.with_prepared_responses([""]) do+ playground.title_playground(third_post, user)+ end++ expect(pm.reload.title).to eq(first_post.raw)+ end++ it "truncates a title the model returns too long to be valid" do+ long_title = "word " * 100++ DiscourseAi::Completions::Llm.with_prepared_responses([long_title]) do+ playground.title_playground(third_post, user)+ end++ expect(pm.reload.title.length).to be <= SiteSetting.max_topic_title_length+ expect(pm.reload.title.downcase).to start_with("word word")+ end++ it "does not announce a title that was not saved" do+ PostRevisor.any_instance.stubs(:revise!).returns(false)++ messages =+ MessageBus.track_publish("/discourse-ai/ai-bot/topic-titles") do+ DiscourseAi::Completions::Llm.with_prepared_responses([expected_response]) do+ playground.title_playground(third_post, user)+ end+ end++ expect(messages).to be_empty+ expect(pm.reload.title).to eq("This is my special PM")+ end++ it "logs and swallows errors instead of propagating them to the caller" do+ PostRevisor.any_instance.stubs(:revise!).raises(StandardError.new("boom"))+ Discourse.expects(:warn_exception).once++ DiscourseAi::Completions::Llm.with_prepared_responses([expected_response]) do+ expect { playground.title_playground(third_post, user) }.to_not raise_error+ end+ end++ context "when the bot user's daily edit allowance is exhausted" do+ fab!(:agent) { Fabricate(:ai_agent, enabled: false) }+ fab!(:agent_user) { agent.create_user! }++ let(:agent_playground) do+ described_class.new(+ DiscourseAi::Agents::Bot.as(agent_user, agent: agent.class_instance.new, model: claude_2),+ )+ end++ before do+ RateLimiter.enable+ SiteSetting.editing_grace_period = 0+ SiteSetting.max_edits_per_day = 1+ SiteSetting.tl4_additional_edits_per_day_multiplier = 1+ end++ it "still updates the title" do+ expect(agent_user.trust_level).to eq(TrustLevel[4])+ expect(agent_user.staff?).to eq(false)++ scratch_post = Fabricate(:post, user: agent_user)+ PostRevisor.new(scratch_post).revise!(agent_user, raw: "using up the daily allowance")++ DiscourseAi::Completions::Llm.with_prepared_responses([expected_response]) do+ agent_playground.title_playground(third_post, user)+ end++ expect(pm.reload.title).to eq(expected_response)+ end+ endenddescribe "#reply_to" dodiff --git a/plugins/discourse-ai/spec/lib/modules/automation/llm_triage_spec.rb b/plugins/discourse-ai/spec/lib/modules/automation/llm_triage_spec.rbindex 52b513e454c..fd289b2c39a 100644--- a/plugins/discourse-ai/spec/lib/modules/automation/llm_triage_spec.rb+++ b/plugins/discourse-ai/spec/lib/modules/automation/llm_triage_spec.rb@@ -43,8 +43,9 @@ describe DiscourseAi::Automation::LlmTriage doexpect(post.topic.reload.visible).to eq(false)end- it "can categorize topics on triage" do+ it "can categorize topics on triage without bumping the topic" docategory = Fabricate(:category)+ bumped_at = post.topic.bumped_atDiscourseAi::Completions::Llm.with_prepared_responses(["bad"]) dotriage(@@ -57,6 +58,7 @@ describe DiscourseAi::Automation::LlmTriage doendexpect(post.topic.reload.category_id).to eq(category.id)+ expect(post.topic.bumped_at).to eq_time(bumped_at)endit "can reply to topics on triage" do