A platform for community discussion. Free, open, simple.
FIX: Ensure that the current user's guardian is used when running AI tools tests. (#38676)
Gabriel Grubba6c10d900f39c
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_tools_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_tools_controller.rbindex 72dcff4f415..1e0ab4f9b6c 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_tools_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ai_tools_controller.rb@@ -115,11 +115,13 @@ module DiscourseAi# we need an llm so we have a tokenizer# but will do without if none is availablellm = LlmModel.first&.to_llm+ context = DiscourseAi::Agents::BotContext.new(guardian: guardian)runner =@ai_tool.runner(parameters,llm: llm,bot_user: current_user,+ context: context,secret_bindings: test_bindings,)result = runner.invokediff --git a/plugins/discourse-ai/lib/agents/bot_context.rb b/plugins/discourse-ai/lib/agents/bot_context.rbindex cf663ee1bb7..8f9a29ec6bc 100644--- a/plugins/discourse-ai/lib/agents/bot_context.rb+++ b/plugins/discourse-ai/lib/agents/bot_context.rb@@ -24,7 +24,8 @@ module DiscourseAi:temporal_context,:user_language,:bypass_response_format,- :mcp_state+ :mcp_state,+ :guardiandef initialize(post: nil,@@ -47,7 +48,8 @@ module DiscourseAicancel_manager: nil,inferred_concepts: [],format_dates: false,- bypass_response_format: false+ bypass_response_format: false,+ guardian: nil)@participants = participants@user = user@@ -75,6 +77,8 @@ module DiscourseAi@bypass_response_format = bypass_response_format@mcp_state = {}+ @guardian = guardian+if post@post_id = post.id@topic_id = post.topic_iddiff --git a/plugins/discourse-ai/lib/agents/tool_runner.rb b/plugins/discourse-ai/lib/agents/tool_runner.rbindex 97fd870390b..6624588e3ad 100644--- a/plugins/discourse-ai/lib/agents/tool_runner.rb+++ b/plugins/discourse-ai/lib/agents/tool_runner.rb@@ -67,6 +67,39 @@ module DiscourseAi@system_guardian ||= Guardian.new(::Discourse.system_user)end+ def resolve_user(username)+ if username.present?+ User.find_by(username: username)+ else+ @bot_user || ::Discourse.system_user+ end+ end++ def resolve_guardian(username)+ user = resolve_user(username)+ return nil, nil if user.nil?+ guardian =+ if user.staged?+ @context.guardian || system_guardian+ else+ Guardian.new(user)+ end++ [user, guardian]+ end++ def resolve_category(category_id_or_name)+ if category_id_or_name.is_a?(Integer) ||+ category_id_or_name.to_i.to_s == category_id_or_name.to_s+ Category.find_by(id: category_id_or_name.to_i)+ else+ Category+ .where(name: category_id_or_name)+ .or(Category.where(slug: category_id_or_name))+ .first+ end+ end+def mini_racer_context@mini_racer_context ||=begindiff --git a/plugins/discourse-ai/spec/requests/admin/ai_tools_controller_spec.rb b/plugins/discourse-ai/spec/requests/admin/ai_tools_controller_spec.rbindex 131314232f3..c38c002d7f0 100644--- a/plugins/discourse-ai/spec/requests/admin/ai_tools_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/admin/ai_tools_controller_spec.rb@@ -544,5 +544,34 @@ RSpec.describe DiscourseAi::Admin::AiToolsController doexpect(response.status).to eq(200)expect(response.parsed_body["output"]["key"]).to eq(ai_secret.secret)end++ it "passes the admin user's guardian via context for staged user discourse operations" do+ category = Fabricate(:category)+ staged_user = Fabricate(:user, staged: true)++ guardians_used = []+ original_pc = PostCreator.instance_method(:initialize)+ PostCreator.define_method(:initialize) do |user, opts = {}|+ guardians_used << opts[:guardian] if opts[:guardian]+ original_pc.bind(self).call(user, opts)+ end++ post "/admin/plugins/discourse-ai/ai-tools/#{ai_tool.id}/test.json",+ params: {+ ai_tool: {+ script:+ "function invoke(params) { return discourse.createTopic({ title: 'Test topic from tool test action', raw: 'This is a test body for the topic created during tool testing', category_id: #{category.id}, username: '#{staged_user.username}' }); }",+ },+ parameters: {+ input: "test",+ },+ }+ expect(response.status).to eq(200)+ expect(response.parsed_body["output"]["success"]).to eq(true)+ expect(guardians_used).not_to be_empty+ expect(guardians_used.last.user.id).to eq(admin.id)+ ensure+ PostCreator.define_method(:initialize, original_pc)+ endendend