Skip to content

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

FIX: overwrite tools not respected in Discourse AI (#38482)

Samf0f78151d6a4
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 86ee6ef8e52..030bfc0fe82 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
@@ -122,14 +122,14 @@ module DiscourseAi
begin
importer = DiscourseAi::AgentImporter.new(json: import_payload)
+ initial_attributes = existing_agent&.attributes&.dup if force_update
if existing_agent && force_update
- initial_attributes = existing_agent.attributes.dup
agent = importer.import!(overwrite: true)
log_ai_agent_update(agent, initial_attributes)
render_ai_agent_resource(agent)
else
- agent = importer.import!
+ agent = importer.import!(overwrite: force_update)
log_ai_agent_creation(agent)
render_ai_agent_resource(agent, status: :created)
end
diff --git a/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb b/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb
index 7acf51310a6..87ee8b8e3a8 100644
--- a/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb
+++ b/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb
@@ -764,6 +764,59 @@ RSpec.describe DiscourseAi::Admin::AiAgentsController do
expect(existing_agent.system_prompt).to eq("You are an imported assistant")
end
+ it "overwrites existing custom tools with force=true when importing a new agent" do
+ existing_tool =
+ Fabricate(
+ :ai_tool,
+ name: "Old Community Scanner",
+ tool_name: "scan_public_discourse_community",
+ description: "Old description",
+ parameters: [],
+ summary: "Old summary",
+ script: "function invoke() { return 'old'; }",
+ )
+
+ import_data_with_tools = valid_import_data.deep_dup.merge(force: true)
+ import_data_with_tools[:agent][:tools] = [
+ ["custom-scan_public_discourse_community", { max_results: 20 }, false],
+ ]
+ import_data_with_tools[:custom_tools] = [
+ {
+ identifier: "scan_public_discourse_community",
+ name: "Community Scanner",
+ description: "Scans the public Discourse community",
+ tool_name: "scan_public_discourse_community",
+ parameters: [{ name: "max_results", type: "integer", required: false }],
+ summary: "Returns matching public community topics",
+ script: "function invoke(params) { return params.max_results || 10; }",
+ },
+ ]
+
+ initial_tool_count = AiTool.count
+
+ expect {
+ post "/admin/plugins/discourse-ai/ai-agents/import.json",
+ params: import_data_with_tools,
+ as: :json
+ }.to change(AiAgent, :count).by(1)
+
+ expect(response).to have_http_status(:created)
+ expect(AiTool.count).to eq(initial_tool_count)
+
+ agent = AiAgent.find_by(name: "ImportedAgent")
+ expect(agent).to be_present
+
+ existing_tool.reload
+ expect(existing_tool.name).to eq("Community Scanner")
+ expect(existing_tool.description).to eq("Scans the public Discourse community")
+ expect(existing_tool.summary).to eq("Returns matching public community topics")
+ expect(existing_tool.script).to eq(
+ "function invoke(params) { return params.max_results || 10; }",
+ )
+
+ expect(agent.tools).to eq([["custom-#{existing_tool.id}", { "max_results" => 20 }, false]])
+ end
+
it "handles invalid import data gracefully" do
invalid_data = { invalid: "data" }