Allow system personas to use tool options

SamSaffron · SamSaffron · commit 91b6a0e0f23e · 2025-01-30T15:34:58.000+11:00
This unlocks tool options to system personas and introduces llm and enum options for tools
diff --git a/app/models/ai_persona.rb b/app/models/ai_persona.rb
@@ -263,9 +263,19 @@ def chat_preconditions
   end
 
   def system_persona_unchangeable
-    if top_p_changed? || temperature_changed? || system_prompt_changed? || tools_changed? ||
-         name_changed? || description_changed?
+    if top_p_changed? || temperature_changed? || system_prompt_changed? || name_changed? ||
+         description_changed?
       errors.add(:base, I18n.t("discourse_ai.ai_bot.personas.cannot_edit_system_persona"))
+    elsif tools_changed?
+      old_tools = tools_change[0]
+      new_tools = tools_change[1]
+
+      old_tool_names = old_tools.map { |t| t.is_a?(Array) ? t[0] : t }.to_set
+      new_tool_names = new_tools.map { |t| t.is_a?(Array) ? t[0] : t }.to_set
+
+      if old_tool_names != new_tool_names
+        errors.add(:base, I18n.t("discourse_ai.ai_bot.personas.cannot_edit_system_persona"))
+      end
     end
   end
 
diff --git a/app/serializers/ai_tool_serializer.rb b/app/serializers/ai_tool_serializer.rb
@@ -26,6 +26,8 @@ def options
         name: option.localized_name,
         description: option.localized_description,
         type: option.type,
+        values: option.values,
+        default: option.default,
       }
     end
     options
diff --git a/assets/javascripts/discourse/admin/models/ai-persona.js b/assets/javascripts/discourse/admin/models/ai-persona.js
@@ -41,6 +41,7 @@ const SYSTEM_ATTRIBUTES = [
   "enabled",
   "system",
   "priority",
+  "tools",
   "user_id",
   "default_llm",
   "force_default_llm",
diff --git a/assets/javascripts/discourse/components/ai-llm-selector.js b/assets/javascripts/discourse/components/ai-llm-selector.js
@@ -15,10 +15,12 @@ export default class AiLlmSelector extends ComboBox {
 
   @computed
   get content() {
+    const blankName =
+      this.attrs.blankName || i18n("discourse_ai.ai_persona.no_llm_selected");
     return [
       {
         id: "blank",
-        name: i18n("discourse_ai.ai_persona.no_llm_selected"),
+        name: blankName,
       },
     ].concat(this.llms);
   }
diff --git a/assets/javascripts/discourse/components/ai-persona-editor.gjs b/assets/javascripts/discourse/components/ai-persona-editor.gjs
@@ -420,13 +420,12 @@ export default class PersonaEditor extends Component {
           </div>
         {{/if}}
       {{/if}}
-      {{#unless this.editingModel.system}}
-        <AiPersonaToolOptions
-          @persona={{this.editingModel}}
-          @tools={{this.selectedToolNames}}
-          @allTools={{@personas.resultSetMeta.tools}}
-        />
-      {{/unless}}
+      <AiPersonaToolOptions
+        @persona={{this.editingModel}}
+        @tools={{this.selectedToolNames}}
+        @llms={{@personas.resultSetMeta.llms}}
+        @allTools={{@personas.resultSetMeta.tools}}
+      />
       <div class="control-group">
         <label>{{i18n "discourse_ai.ai_persona.allowed_groups"}}</label>
         <GroupChooser
diff --git a/assets/javascripts/discourse/components/ai-persona-tool-option-editor.gjs b/assets/javascripts/discourse/components/ai-persona-tool-option-editor.gjs
@@ -2,28 +2,78 @@ import Component from "@glimmer/component";
 import { Input } from "@ember/component";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
+import { eq } from "truth-helpers";
+import { i18n } from "discourse-i18n";
+import AiLlmSelector from "./ai-llm-selector";
 
 export default class AiPersonaToolOptionEditor extends Component {
   get isBoolean() {
     return this.args.option.type === "boolean";
   }
 
+  get isEnum() {
+    return this.args.option.type === "enum";
+  }
+
+  get isLlm() {
+    return this.args.option.type === "llm";
+  }
+
   get selectedValue() {
     return this.args.option.value.value === "true";
   }
 
+  get selectedLlm() {
+    if (this.args.option.value.value) {
+      return `custom:${this.args.option.value.value}`;
+    } else {
+      return "blank";
+    }
+  }
+
+  set selectedLlm(value) {
+    if (value === "blank") {
+      this.args.option.value.value = null;
+    } else {
+      this.args.option.value.value = value.replace("custom:", "");
+    }
+  }
+
   @action
   onCheckboxChange(event) {
     this.args.option.value.value = event.target.checked ? "true" : "false";
   }
 
+  @action
+  onSelectOption(event) {
+    this.args.option.value.value = event.target.value;
+  }
+
   <template>
     <div class="control-group ai-persona-tool-option-editor">
       <label>
         {{@option.name}}
       </label>
       <div class="">
-        {{#if this.isBoolean}}
+        {{#if this.isEnum}}
+          <select name="input" {{on "change" this.onSelectOption}}>
+            {{#each this.args.option.values as |value|}}
+              <option
+                value={{value}}
+                selected={{eq value this.args.option.value.value}}
+              >
+                {{value}}
+              </option>
+            {{/each}}
+          </select>
+        {{else if this.isLlm}}
+          <AiLlmSelector
+            class="ai-persona-tool-option-editor__llms"
+            @value={{this.selectedLlm}}
+            @llms={{@llms}}
+            @blankName={{i18n "discourse_ai.ai_persona.use_parent_llm"}}
+          />
+        {{else if this.isBoolean}}
           <input
             type="checkbox"
             checked={{this.selectedValue}}
diff --git a/assets/javascripts/discourse/components/ai-persona-tool-options.gjs b/assets/javascripts/discourse/components/ai-persona-tool-options.gjs
@@ -67,7 +67,10 @@ export default class AiPersonaToolOptions extends Component {
               </div>
               <div class="ai-persona-editor__tool-option-options">
                 {{#each toolOption.options as |option|}}
-                  <AiPersonaToolOptionEditor @option={{option}} />
+                  <AiPersonaToolOptionEditor
+                    @option={{option}}
+                    @llms={{@llms}}
+                  />
                 {{/each}}
               </div>
             </div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
@@ -213,6 +213,7 @@ en:
         edit: "Edit"
         description: "Description"
         no_llm_selected: "No language model selected"
+        use_parent_llm: "Use personas language model"
         max_context_posts: "Max context posts"
         max_context_posts_help: "The maximum number of posts to use as context for the AI when responding to a user. (empty for default)"
         vision_enabled: Vision enabled
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
@@ -293,6 +293,20 @@ en:
       summarizing: "Summarizing topic"
       searching: "Searching for: '%{query}'"
       tool_options:
+        create_artifact:
+          creator_llm:
+            name: "LLM"
+            description: "Language model to use for artifact creation"
+          echo_artifact:
+            name: "Echo Artifact"
+            description: "Include full artifact source in subsequent replies"
+        update_artifact:
+          editor_llm:
+            name: "LLM"
+            description: "Language model to use for artifact edits"
+          update_algorithm:
+            name: "Update Algorithm"
+            description: "Algorithm used for artifact updates (full vs diff)"
         google:
           base_query:
             name: "Base Search Query"
diff --git a/db/fixtures/ai_bot/603_bot_ai_personas.rb b/db/fixtures/ai_bot/603_bot_ai_personas.rb
@@ -37,7 +37,19 @@
 
   persona.system = true
   instance = persona_class.new
-  persona.tools = instance.tools.map { |tool| tool.to_s.split("::").last }
+  tools = {}
+  instance.tools.map { |tool| tool.to_s.split("::").last }.each { |name| tools[name] = nil }
+  existing_tools = persona.tools || []
+
+  existing_tools.each do |tool|
+    if tool.is_a?(Array)
+      name, value = tool
+      tools[name] = value if tools.key?(name)
+    end
+  end
+
+  persona.tools = tools.map { |name, value| [name, value] }
+
   persona.system_prompt = instance.system_prompt
   persona.top_p = instance.top_p
   persona.temperature = instance.temperature
diff --git a/lib/ai_bot/tools/create_artifact.rb b/lib/ai_bot/tools/create_artifact.rb
@@ -101,6 +101,10 @@ def self.inject_prompt(prompt:, context:)
           end
         end
 
+        def self.accepted_options
+          [option(:creator_llm, type: :llm), option(:echo_artifact, type: :boolean)]
+        end
+
         def invoke
           name = parameters[:name] || "New Artifact"
           yield "#{name}\n\n" + parameters[:specification].to_s
diff --git a/lib/ai_bot/tools/option.rb b/lib/ai_bot/tools/option.rb
@@ -4,12 +4,14 @@ module DiscourseAi
   module AiBot
     module Tools
       class Option
-        attr_reader :tool, :name, :type
+        attr_reader :tool, :name, :type, :values, :default
 
-        def initialize(tool:, name:, type:)
+        def initialize(tool:, name:, type:, values: nil, default: nil)
           @tool = tool
           @name = name.to_s
           @type = type
+          @values = values
+          @default = default
         end
 
         def localized_name
diff --git a/lib/ai_bot/tools/tool.rb b/lib/ai_bot/tools/tool.rb
@@ -27,8 +27,8 @@ def accepted_options
             []
           end
 
-          def option(name, type:)
-            Option.new(tool: self, name: name, type: type)
+          def option(name, type:, values: nil, default: nil)
+            Option.new(tool: self, name: name, type: type, values: values, default: default)
           end
 
           def help
@@ -92,8 +92,13 @@ def options
                 val = (val.to_s == "true")
               when :integer
                 val = val.to_i
+              when :enum
+                val = val.to_s
+                val = option.default if option.values && !option.values.include?(val)
               end
               result[option.name] = val
+            elsif val.nil?
+              result[option.name] = option.default
             end
           end
           result
diff --git a/lib/ai_bot/tools/update_artifact.rb b/lib/ai_bot/tools/update_artifact.rb
@@ -37,6 +37,13 @@ def self.signature
           }
         end
 
+        def self.accepted_options
+          [
+            option(:editor_llm, type: :llm),
+            option(:update_algorithm, type: :enum, values: %w[full diff], default: "full"),
+          ]
+        end
+
         def invoke
           yield "Updating Artifact\n#{parameters[:instructions]}\n\n"
 
diff --git a/spec/models/ai_persona_spec.rb b/spec/models/ai_persona_spec.rb
@@ -187,4 +187,32 @@
     RailsMultisite::ConnectionManagement.stubs(:current_db) { "abc" }
     expect(AiPersona.persona_cache[:value]).to eq(nil)
   end
+
+  describe "system persona validations" do
+    let(:system_persona) do
+      AiPersona.create!(
+        name: "system_persona",
+        description: "system persona",
+        system_prompt: "system persona",
+        tools: %w[Search Time],
+        system: true,
+      )
+    end
+
+    context "when modifying a system persona" do
+      it "allows changing tool options without allowing tool additions/removals" do
+        tools = [["Search", { "base_query" => "abc" }], ["Time"]]
+        system_persona.update!(tools: tools)
+
+        system_persona.reload
+        expect(system_persona.tools).to eq(tools)
+
+        invalid_tools = ["Time"]
+        system_persona.update(tools: invalid_tools)
+        expect(system_persona.errors[:base]).to include(
+          I18n.t("discourse_ai.ai_bot.personas.cannot_edit_system_persona"),
+        )
+      end
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ def options`
`26`	`26`	`name: option.localized_name,`
`27`	`27`	`description: option.localized_description,`
`28`	`28`	`type: option.type,`
	`29`	`+ values: option.values,`
	`30`	`+ default: option.default,`
`29`	`31`	`}`
`30`	`32`	`end`
`31`	`33`	`options`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,12 @@ export default class AiLlmSelector extends ComboBox {`
`15`	`15`
`16`	`16`	`@computed`
`17`	`17`	`get content() {`
	`18`	`+ const blankName =`
	`19`	`+ this.attrs.blankName \|\| i18n("discourse_ai.ai_persona.no_llm_selected");`
`18`	`20`	`return [`
`19`	`21`	`{`
`20`	`22`	`id: "blank",`
`21`		`- name: i18n("discourse_ai.ai_persona.no_llm_selected"),`
	`23`	`+ name: blankName,`
`22`	`24`	`},`
`23`	`25`	`].concat(this.llms);`
`24`	`26`	`}`