DEV: Validate duplicate tool_name between builin tools and custom tools

Author: nvh0412

app/models/ai_persona.rb

@@ -114,15 +114,40 @@ def tools_can_not_be_duplicated
 
     seen_tools = Set.new
 
+    custom_tool_ids = Set.new
+    builtin_tool_names = Set.new
+
     tools.each do |tool|
       inner_name, _, _ = tool.is_a?(Array) ? tool : [tool, nil]
 
+      if inner_name.start_with?("custom-")
+        custom_tool_ids.add(inner_name.split("-", 2).last.to_i)
+      else
+        builtin_tool_names.add(inner_name.downcase)
+      end
+
       if seen_tools.include?(inner_name)
         errors.add(:tools, I18n.t("discourse_ai.ai_bot.personas.cannot_have_duplicate_tools"))
+        break
       else
         seen_tools.add(inner_name)
       end
     end
+
+    return if errors.any?
+
+    # Checking if there are any duplicate tool_names between custom and builtin tools
+    if builtin_tool_names.present? && custom_tool_ids.present?
+      AiTool
+        .where(id: custom_tool_ids)
+        .pluck(:tool_name)
+        .each do |tool_name|
+          if builtin_tool_names.include?(tool_name.downcase)
+            errors.add(:tools, I18n.t("discourse_ai.ai_bot.personas.cannot_have_duplicate_tools"))
+            break
+          end
+        end
+    end
   end
 
   def class_instance

spec/models/ai_persona_spec.rb

@@ -34,17 +34,41 @@
         allowed_group_ids: [],
       )
 
+    Fabricate(:ai_tool, id: 1)
+    Fabricate(:ai_tool, id: 2, name: "Archie search", tool_name: "search")
+
     expect(persona.valid?).to eq(true)
 
-    persona.tools = [["test-1", { test: "test" }, false]]
+    persona.tools = %w[search image_generation]
     expect(persona.valid?).to eq(true)
 
-    persona.tools = [["test-1", { test: "test" }, false], ["test-1", { test: "test" }, false]]
+    persona.tools = %w[search image_generation search]
     expect(persona.valid?).to eq(false)
     expect(persona.errors[:tools]).to eq(["Can not have duplicate tools"])
 
-    persona.tools = [["test-1", { test: "test" }, false], ["test-2", { test: "test" }, false]]
+    persona.tools = [["custom-1", { test: "test" }, false], ["custom-2", { test: "test" }, false]]
     expect(persona.valid?).to eq(true)
+    expect(persona.errors[:tools]).to eq([])
+
+    persona.tools = [["custom-1", { test: "test" }, false], ["custom-1", { test: "test" }, false]]
+    expect(persona.valid?).to eq(false)
+    expect(persona.errors[:tools]).to eq(["Can not have duplicate tools"])
+
+    persona.tools = [
+      ["custom-1", { test: "test" }, false],
+      ["custom-2", { test: "test" }, false],
+      "image_generation",
+    ]
+    expect(persona.valid?).to eq(true)
+    expect(persona.errors[:tools]).to eq([])
+
+    persona.tools = [
+      ["custom-1", { test: "test" }, false],
+      ["custom-2", { test: "test" }, false],
+      "Search",
+    ]
+    expect(persona.valid?).to eq(false)
+    expect(persona.errors[:tools]).to eq(["Can not have duplicate tools"])
   end
 
   it "allows creation of user" do