DEV: Test if site setting can be added without translation

.discourse-compatibility

@@ -1,6 +1,8 @@
-< 3.4.0.beta1-dev: 9d887ad4ace8e33c3fe7dbb39237e882c08b4f0b
-< 3.3.0.beta5-dev: 4d8090002f6dcd8e34d41033606bf131fa221475
 < 3.3.0.beta2-dev: 61890b667c06299841ae88946f84a112f00060e1
-< 3.3.0.beta1-dev: d94234d89f50733678a5c62809445198a9fda74b
-3.2.999: d94234d89f50733678a5c62809445198a9fda74b
+< 3.3.0.beta1-dev: a65c4076a63104b61d213534db7f89aa3c8acd9e
+< 3.2.0.beta5-dev: c70f43f130fb98e4a1adb1afd9b621aaa49088e3
+< 3.2.0.beta4-dev: 493b48477a9288f2f1b6f021954088705a6673d6
+< 3.2.0.beta2-dev: 3bced1c6f525553fe2b5b79d29bd66c1cf2a47d5
 3.1.999: c0415bb7eb878b1b7abf112d65cba981030df8df
+< 3.2.0.beta1-dev: 3e7c99de894b03e9161d9481da118fe893991a1d
+3.1.0.beta3: 057fbe1ce6

Gemfile.lock

@@ -32,7 +32,7 @@ GEM
     rack (3.1.6)
     rainbow (3.1.1)
     regexp_parser (2.9.2)
-    rexml (3.3.3)
+    rexml (3.3.1)
       strscan
     rubocop (1.64.1)
       json (~> 2.3)

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-new.js

@@ -3,7 +3,6 @@ import DiscourseRoute from "discourse/routes/discourse";
 export default DiscourseRoute.extend({
   async model() {
     const record = this.store.createRecord("ai-llm");
-    record.provider_params = {};
     return record;
   },
 

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-show.js

@@ -4,9 +4,7 @@ export default DiscourseRoute.extend({
   async model(params) {
     const allLlms = this.modelFor("adminPlugins.show.discourse-ai-llms");
     const id = parseInt(params.id, 10);
-    const record = allLlms.findBy("id", id);
-    record.provider_params = record.provider_params || {};
-    return record;
+    return allLlms.findBy("id", id);
   },
 
   setupController(controller, model) {

app/controllers/discourse_ai/admin/ai_llms_controller.rb

@@ -38,32 +38,24 @@ module DiscourseAi
           llm_model.toggle_companion_user
           render json: { ai_persona: LlmModelSerializer.new(llm_model) }, status: :created
         else
-          render_json_error llm_model
+          render_json_error LlmModelSerializer.new(llm_model)
         end
       end
 
       def update
         llm_model = LlmModel.find(params[:id])
 
-        if llm_model.seeded?
-          return render_json_error(I18n.t("discourse_ai.llm.cannot_edit_builtin"), status: 403)
-        end
-
         if llm_model.update(ai_llm_params(updating: llm_model))
           llm_model.toggle_companion_user
           render json: LlmModelSerializer.new(llm_model)
         else
-          render_json_error llm_model
+          render_json_error LlmModelSerializer.new(llm_model)
         end
       end
 
       def destroy
         llm_model = LlmModel.find(params[:id])
 
-        if llm_model.seeded?
-          return render_json_error(I18n.t("discourse_ai.llm.cannot_delete_builtin"), status: 403)
-        end
-
         in_use_by = DiscourseAi::Configuration::LlmValidator.new.modules_using(llm_model)
 
         if !in_use_by.empty?
@@ -105,8 +97,6 @@ module DiscourseAi
       private
 
       def ai_llm_params(updating: nil)
-        return {} if params[:ai_llm].blank?
-
         permitted =
           params.require(:ai_llm).permit(
             :display_name,
@@ -116,30 +106,20 @@ module DiscourseAi
             :max_prompt_tokens,
             :api_key,
             :enabled_chat_bot,
-            :vision_enabled,
           )
 
         provider = updating ? updating.provider : permitted[:provider]
-        permit_url = provider != LlmModel::BEDROCK_PROVIDER_NAME
+        permit_url =
+          (updating && updating.url != LlmModel::RESERVED_VLLM_SRV_URL) ||
+            provider != LlmModel::BEDROCK_PROVIDER_NAME
 
-        new_url = params.dig(:ai_llm, :url)
-        permitted[:url] = new_url if permit_url && new_url
+        permitted[:url] = params.dig(:ai_llm, :url) if permit_url
 
-        extra_field_names = LlmModel.provider_params.dig(provider&.to_sym)
-        if extra_field_names.present?
-          received_prov_params =
-            params.dig(:ai_llm, :provider_params)&.slice(*extra_field_names.keys)
-
-          if received_prov_params.present?
-            received_prov_params.each do |pname, value|
-              if extra_field_names[pname.to_sym] == :checkbox
-                received_prov_params[pname] = ActiveModel::Type::Boolean.new.cast(value)
-              end
-            end
-
-            permitted[:provider_params] = received_prov_params.permit!
-          end
-        end
+        extra_field_names = LlmModel.provider_params.dig(provider&.to_sym, :fields).to_a
+        received_prov_params = params.dig(:ai_llm, :provider_params)
+        permitted[:provider_params] = received_prov_params.slice(
+          *extra_field_names,
+        ).permit! if !extra_field_names.empty? && received_prov_params.present?
 
         permitted
       end

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -63,7 +63,7 @@ module DiscourseAi
 
           render json: LocalizedAiPersonaSerializer.new(@ai_persona, root: false)
         else
-          render_json_error @ai_persona
+          render_json_error LocalizedAiPersonaSerializer.new(@ai_persona, root: false)
         end
       end
 
@@ -71,7 +71,7 @@ module DiscourseAi
         if @ai_persona.destroy
           head :no_content
         else
-          render_json_error @ai_persona
+          render_json_error LocalizedAiPersonaSerializer.new(@ai_persona, root: false)
         end
       end
 

app/controllers/discourse_ai/admin/ai_tools_controller.rb

@@ -81,7 +81,7 @@ module DiscourseAi
           :description,
           :script,
           :summary,
-          parameters: [:name, :type, :description, :required, enum: []],
+          parameters: [:name, :type, :description, :required, :enum, enum_values: []],
         )
       end
     end

app/controllers/discourse_ai/ai_helper/assistant_controller.rb

@@ -89,26 +89,18 @@ module DiscourseAi
         end
       end
 
-      def stream_suggestion
+      def explain
         post_id = get_post_param!
-        text = get_text_param!
+        term_to_explain = get_text_param!
         post = Post.includes(:topic).find_by(id: post_id)
-        prompt = CompletionPrompt.find_by(id: params[:mode])
 
-        raise Discourse::InvalidParameters.new(:mode) if !prompt || !prompt.enabled?
         raise Discourse::InvalidParameters.new(:post_id) unless post
 
-        if prompt.id == CompletionPrompt::CUSTOM_PROMPT
-          raise Discourse::InvalidParameters.new(:custom_prompt) if params[:custom_prompt].blank?
-        end
-
         Jobs.enqueue(
           :stream_post_helper,
           post_id: post.id,
           user_id: current_user.id,
-          text: text,
-          prompt: prompt.name,
-          custom_prompt: params[:custom_prompt],
+          term_to_explain: term_to_explain,
         )
 
         render json: { success: true }, status: 200
@@ -165,13 +157,9 @@ module DiscourseAi
       end
 
       def ensure_can_request_suggestions
-        allowed_groups =
-          (
-            SiteSetting.composer_ai_helper_allowed_groups_map |
-              SiteSetting.post_ai_helper_allowed_groups_map
-          )
-
-        raise Discourse::InvalidAccess if !current_user.in_any_groups?(allowed_groups)
+        if !current_user.in_any_groups?(SiteSetting.ai_helper_allowed_groups_map)
+          raise Discourse::InvalidAccess
+        end
       end
     end
   end

app/controllers/discourse_ai/embeddings/embeddings_controller.rb

@@ -9,7 +9,6 @@ module DiscourseAi
 
       def search
         query = params[:q].to_s
-        skip_hyde = params[:hyde].downcase.to_s == "false" || params[:hyde].to_s == "0"
 
         if query.length < SiteSetting.min_search_term_length
           raise Discourse::InvalidParameters.new(:q)
@@ -32,7 +31,7 @@ module DiscourseAi
 
         hijack do
           semantic_search
-            .search_for_topics(query, _page = 1, hyde: !skip_hyde)
+            .search_for_topics(query)
             .each { |topic_post| grouped_results.add(topic_post) }
 
           render_serialized(grouped_results, GroupedSearchResultSerializer, result: grouped_results)
@@ -40,9 +39,6 @@ module DiscourseAi
       end
 
       def quick_search
-        # this search function searches posts (vs: topics)
-        # it requires post embeddings and a reranker
-        # it will not perform a hyde expantion
         query = params[:q].to_s
 
         if query.length < SiteSetting.min_search_term_length

app/controllers/discourse_ai/summarization/summary_controller.rb

@@ -14,32 +14,19 @@ module DiscourseAi
         RateLimiter.new(current_user, "summary", 6, 5.minutes).performed! if current_user
 
         opts = params.permit(:skip_age_check)
-        skip_age_check = opts[:skip_age_check] == "true"
 
         if params[:stream] && current_user
-          cached_summary = DiscourseAi::TopicSummarization.cached_summary(topic, current_user)
-
-          if cached_summary && !skip_age_check
-            render_serialized(cached_summary, AiTopicSummarySerializer)
-            return
-          end
-
           Jobs.enqueue(
             :stream_topic_ai_summary,
             topic_id: topic.id,
             user_id: current_user.id,
-            skip_age_check: skip_age_check,
+            opts: opts.as_json,
           )
 
           render json: success_json
         else
           hijack do
-            summary =
-              DiscourseAi::TopicSummarization.summarize(
-                topic,
-                current_user,
-                skip_age_check: skip_age_check,
-              )
+            summary = DiscourseAi::TopicSummarization.summarize(topic, current_user, opts)
             render_serialized(summary, AiTopicSummarySerializer)
           end
         end

app/jobs/regular/stream_post_helper.rb

@@ -7,35 +7,27 @@ module Jobs
     def execute(args)
       return unless post = Post.includes(:topic).find_by(id: args[:post_id])
       return unless user = User.find_by(id: args[:user_id])
-      return unless args[:text]
+      return unless args[:term_to_explain]
 
       topic = post.topic
       reply_to = post.reply_to_post
 
       return unless user.guardian.can_see?(post)
 
-      prompt = CompletionPrompt.enabled_by_name(args[:prompt])
+      prompt = CompletionPrompt.enabled_by_name("explain")
 
-      if prompt.id == CompletionPrompt::CUSTOM_PROMPT
-        prompt.custom_instruction = args[:custom_prompt]
-      end
-
-      if prompt.name == "explain"
-        input = <<~TEXT
-      <term>#{args[:text]}</term>
+      input = <<~TEXT
+      <term>#{args[:term_to_explain]}</term>
       <context>#{post.raw}</context>
           <topic>#{topic.title}</topic>
           #{reply_to ? "<replyTo>#{reply_to.raw}</replyTo>" : nil}
         TEXT
-      else
-        input = args[:text]
-      end
 
       DiscourseAi::AiHelper::Assistant.new.stream_prompt(
         prompt,
         input,
         user,
-        "/discourse-ai/ai-helper/stream_suggestion/#{post.id}",
+        "/discourse-ai/ai-helper/explain/#{post.id}",
       )
     end
   end

app/jobs/regular/stream_topic_ai_summary.rb

@@ -14,15 +14,15 @@ module Jobs
       guardian = Guardian.new(user)
       return unless guardian.can_see?(topic)
 
-      skip_age_check = !!args[:skip_age_check]
+      opts = args[:opts] || {}
 
       streamed_summary = +""
       start = Time.now
 
       summary =
         DiscourseAi::TopicSummarization
-          .new(strategy, topic, user)
-          .summarize(skip_age_check: skip_age_check) do |partial_summary|
+          .new(strategy)
+          .summarize(topic, user, opts) do |partial_summary|
             streamed_summary << partial_summary
 
             # Throttle updates.

app/jobs/regular/update_ai_bot_pm_title.rb

@@ -12,13 +12,6 @@ module ::Jobs
       return unless post.topic.custom_fields[DiscourseAi::AiBot::EntryPoint::REQUIRE_TITLE_UPDATE]
 
       DiscourseAi::AiBot::Playground.new(bot).title_playground(post)
-
-      publish_update(post.topic, { title: post.topic.title })
-    end
-
-    def publish_update(topic, payload)
-      allowed_users = topic.topic_allowed_users.pluck(:user_id)
-      MessageBus.publish("/discourse-ai/ai-bot/topic/#{topic.id}", payload, user_ids: allowed_users)
     end
   end
 end

app/models/llm_model.rb

@@ -2,41 +2,59 @@
 
 class LlmModel < ActiveRecord::Base
   FIRST_BOT_USER_ID = -1200
+  RESERVED_VLLM_SRV_URL = "https://vllm.shadowed-by-srv.invalid"
   BEDROCK_PROVIDER_NAME = "aws_bedrock"
 
   belongs_to :user
 
-  validates :display_name, presence: true, length: { maximum: 100 }
-  validates :tokenizer, presence: true, inclusion: DiscourseAi::Completions::Llm.tokenizer_names
-  validates :provider, presence: true, inclusion: DiscourseAi::Completions::Llm.provider_names
-  validates :url, presence: true, unless: -> { provider == BEDROCK_PROVIDER_NAME }
-  validates_presence_of :name, :api_key
-  validates :max_prompt_tokens, numericality: { greater_than: 0 }
-  validate :required_provider_params
+  validates :url, exclusion: { in: [RESERVED_VLLM_SRV_URL] }, if: :url_changed?
+
+  def self.seed_srv_backed_model
+    srv = SiteSetting.ai_vllm_endpoint_srv
+    srv_model = find_by(url: RESERVED_VLLM_SRV_URL)
+
+    if srv.present?
+      if srv_model.present?
+        current_key = SiteSetting.ai_vllm_api_key
+        srv_model.update!(api_key: current_key) if current_key != srv_model.api_key
+      else
+        record =
+          new(
+            display_name: "vLLM SRV LLM",
+            name: "mistralai/Mixtral-8x7B-Instruct-v0.1",
+            provider: "vllm",
+            tokenizer: "DiscourseAi::Tokenizer::MixtralTokenizer",
+            url: RESERVED_VLLM_SRV_URL,
+            max_prompt_tokens: 8000,
+            api_key: SiteSetting.ai_vllm_api_key,
+          )
+
+        record.save(validate: false) # Ignore reserved URL validation
+      end
+    else
+      # Clean up companion users
+      srv_model&.enabled_chat_bot = false
+      srv_model&.toggle_companion_user
+
+      srv_model&.destroy!
+    end
+  end
 
   def self.provider_params
     {
       aws_bedrock: {
-        access_key_id: :text,
-        region: :text,
+        url_editable: false,
+        fields: %i[access_key_id region],
       },
       open_ai: {
-        organization: :text,
-      },
-      hugging_face: {
-        disable_system_prompt: :checkbox,
-      },
-      vllm: {
-        disable_system_prompt: :checkbox,
-      },
-      ollama: {
-        disable_system_prompt: :checkbox,
+        url_editable: true,
+        fields: %i[organization],
       },
     }
   end
 
   def to_llm
-    DiscourseAi::Completions::Llm.proxy("custom:#{id}")
+    DiscourseAi::Completions::Llm.proxy_from_obj(self)
   end
 
   def toggle_companion_user
@@ -88,22 +106,6 @@ class LlmModel < ActiveRecord::Base
   def lookup_custom_param(key)
     provider_params&.dig(key)
   end
-
-  def seeded?
-    id < 0
-  end
-
-  private
-
-  def required_provider_params
-    return if provider != BEDROCK_PROVIDER_NAME
-
-    %w[access_key_id region].each do |field|
-      if lookup_custom_param(field).blank?
-        errors.add(:base, I18n.t("discourse_ai.llm_models.missing_provider_param", param: field))
-      end
-    end
-  end
 end
 
 # == Schema Information
@@ -122,6 +124,4 @@ end
 #  api_key           :string
 #  user_id           :integer
 #  enabled_chat_bot  :boolean          default(FALSE), not null
-#  provider_params   :jsonb
-#  vision_enabled    :boolean          default(FALSE), not null
 #

app/serializers/ai_topic_summary_serializer.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 class AiTopicSummarySerializer < ApplicationSerializer
-  attributes :summarized_text,
-             :algorithm,
-             :outdated,
-             :can_regenerate,
-             :new_posts_since_summary,
-             :updated_at
+  attributes :summarized_text, :algorithm, :outdated, :can_regenerate, :new_posts_since_summary
 
   def can_regenerate
     scope.can_request_summary?

app/serializers/llm_model_serializer.rb

@@ -12,25 +12,12 @@ class LlmModelSerializer < ApplicationSerializer
              :api_key,
              :url,
              :enabled_chat_bot,
-             :provider_params,
-             :vision_enabled,
-             :used_by
+             :shadowed_by_srv,
+             :provider_params
 
   has_one :user, serializer: BasicUserSerializer, embed: :object
 
-  def used_by
-    DiscourseAi::Configuration::LlmValidator.new.modules_using(object)
-  end
-
-  def api_key
-    object.seeded? ? "********" : object.api_key
-  end
-
-  def url
-    object.seeded? ? "********" : object.url
-  end
-
-  def provider
-    object.seeded? ? "CDCK" : object.provider
+  def shadowed_by_srv
+    object.url == LlmModel::RESERVED_VLLM_SRV_URL
   end
 end

app/services/discourse_ai/topic_summarization.rb

@@ -2,36 +2,33 @@
 
 module DiscourseAi
   class TopicSummarization
-    def self.summarize(topic, user, skip_age_check: false, &on_partial_blk)
-      new(DiscourseAi::Summarization.default_strategy, topic, user).summarize(
-        skip_age_check: skip_age_check,
-        &on_partial_blk
-      )
+    def self.summarize(topic, user, opts = {}, &on_partial_blk)
+      new(DiscourseAi::Summarization.default_strategy).summarize(topic, user, opts, &on_partial_blk)
     end
 
-    def self.cached_summary(topic, user)
-      new(DiscourseAi::Summarization.default_strategy, topic, user).cached_summary
-    end
-
-    def initialize(strategy, topic, user)
+    def initialize(strategy)
       @strategy = strategy
-      @topic = topic
-      @user = user
     end
 
-    attr_reader :strategy, :topic, :user
+    def summarize(topic, user, opts = {}, &on_partial_blk)
+      existing_summary = AiSummary.find_by(target: topic)
 
-    def cached_summary
-      existing_summary
-    end
-
-    def summarize(skip_age_check: false, &on_partial_blk)
       # Existing summary shouldn't be nil in this scenario because the controller checks its existence.
       return if !user && !existing_summary
 
-      return existing_summary if use_cached?(skip_age_check)
+      targets_data = summary_targets(topic).pluck(:post_number, :raw, :username)
 
-      delete_cached_summaries! if existing_summary
+      current_topic_sha = build_sha(targets_data.map(&:first))
+      can_summarize = Guardian.new(user).can_request_summary?
+
+      if use_cached?(existing_summary, can_summarize, current_topic_sha, !!opts[:skip_age_check])
+        # It's important that we signal a cached summary is outdated
+        existing_summary.mark_as_outdated if new_targets?(existing_summary, current_topic_sha)
+
+        return existing_summary
+      end
+
+      delete_cached_summaries_of(topic) if existing_summary
 
       content = {
         resource_path: "#{Discourse.base_path}/t/-/#{topic.id}",
@@ -39,7 +36,7 @@ module DiscourseAi
         contents: [],
       }
 
-      summary_targets_data.map do |(pn, raw, username)|
+      targets_data.map do |(pn, raw, username)|
         raw_text = raw
 
         if pn == 1 && topic.topic_embed&.embed_content_cache.present?
@@ -50,34 +47,19 @@ module DiscourseAi
       end
 
       summarization_result = strategy.summarize(content, user, &on_partial_blk)
-      cache_summary(summarization_result)
+
+      cache_summary(summarization_result, targets_data.map(&:first), topic)
     end
 
-    def summary_targets
-      topic.has_summary? ? best_replies : pick_selection
+    def summary_targets(topic)
+      topic.has_summary? ? best_replies(topic) : pick_selection(topic)
     end
 
     private
 
-    def summary_sha
-      @summary_sha ||= build_sha(summary_targets_data.map(&:first))
-    end
+    attr_reader :strategy
 
-    def summary_targets_data
-      @summary_targets_data ||= summary_targets.pluck(:post_number, :raw, :username)
-    end
-
-    def existing_summary
-      if !defined?(@existing_summary)
-        @existing_summary = AiSummary.find_by(target: topic)
-        if @existing_summary && existing_summary.original_content_sha != summary_sha
-          @existing_summary.mark_as_outdated
-        end
-      end
-      @existing_summary
-    end
-
-    def best_replies
+    def best_replies(topic)
       Post
         .summary(topic.id)
         .where("post_type = ?", Post.types[:regular])
@@ -86,7 +68,7 @@ module DiscourseAi
         .order(:post_number)
     end
 
-    def pick_selection
+    def pick_selection(topic)
       posts =
         Post
           .where(topic_id: topic.id)
@@ -105,34 +87,31 @@ module DiscourseAi
         .order(:post_number)
     end
 
-    def delete_cached_summaries!
+    def delete_cached_summaries_of(topic)
       AiSummary.where(target: topic).destroy_all
     end
 
-    def use_cached?(skip_age_check)
-      can_summarize = Guardian.new(user).can_request_summary?
-
+    # For users without permissions to generate a summary or fresh summaries, we return what we have cached.
+    def use_cached?(existing_summary, can_summarize, current_sha, skip_age_check)
       existing_summary &&
         !(
-          can_summarize && new_targets? &&
+          can_summarize && new_targets?(existing_summary, current_sha) &&
             (skip_age_check || existing_summary.created_at < 1.hour.ago)
         )
     end
 
-    def new_targets?
-      existing_summary&.original_content_sha != summary_sha
+    def new_targets?(summary, current_sha)
+      summary.original_content_sha != current_sha
     end
 
-    def cache_summary(result)
-      post_numbers = summary_targets_data.map(&:first)
-
+    def cache_summary(result, post_numbers, topic)
       cached_summary =
         AiSummary.create!(
           target: topic,
           algorithm: strategy.display_name,
           content_range: (post_numbers.first..post_numbers.last),
           summarized_text: result[:summary],
-          original_content_sha: summary_sha,
+          original_content_sha: build_sha(post_numbers),
         )
 
       cached_summary

assets/javascripts/discourse/admin/models/ai-llm.js

@@ -13,8 +13,7 @@ export default class AiLlm extends RestModel {
       "url",
       "api_key",
       "enabled_chat_bot",
-      "provider_params",
-      "vision_enabled"
+      "provider_params"
     );
   }
 

assets/javascripts/discourse/admin/models/ai-tool.js

@@ -20,25 +20,22 @@ export default class AiTool extends RestModel {
     return this.getProperties(CREATE_ATTRIBUTES);
   }
 
-  trackParameters(parameters) {
-    return new TrackedArray(
-      parameters?.map((p) => {
+  workingCopy() {
+    const attrs = this.getProperties(CREATE_ATTRIBUTES);
+
+    attrs.parameters = new TrackedArray(
+      attrs.parameters?.map((p) => {
         const parameter = new TrackedObject(p);
 
-        if (parameter.enum && parameter.enum.length) {
-          parameter.enum = new TrackedArray(parameter.enum);
-        } else {
-          parameter.enum = null;
+        if (parameter.enum_values) {
+          parameter.enumValues = new TrackedArray(parameter.enum_values);
+          delete parameter.enum_values;
         }
 
         return parameter;
       })
     );
-  }
 
-  workingCopy() {
-    const attrs = this.getProperties(CREATE_ATTRIBUTES);
-    attrs.parameters = this.trackParameters(attrs.parameters);
     return this.store.createRecord("ai-tool", attrs);
   }
 }

assets/javascripts/discourse/components/ai-helper-button-group.gjs

@@ -1,19 +0,0 @@
-import DButton from "discourse/components/d-button";
-import concatClass from "discourse/helpers/concat-class";
-
-const AiHelperButtonGroup = <template>
-  <ul class="ai-helper-button-group" ...attributes>
-    {{#each @buttons as |button|}}
-      <li>
-        <DButton
-          @icon={{button.icon}}
-          @label={{button.label}}
-          @action={{button.action}}
-          class={{concatClass "btn-flat" button.classes}}
-        />
-      </li>
-    {{/each}}
-  </ul>
-</template>;
-
-export default AiHelperButtonGroup;

assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs

@@ -1,40 +1,38 @@
 import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { Input } from "@ember/component";
 import { fn } from "@ember/helper";
-import { on } from "@ember/modifier";
 import { action } from "@ember/object";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import DButton from "discourse/components/d-button";
-import withEventValue from "discourse/helpers/with-event-value";
-import autoFocus from "discourse/modifiers/auto-focus";
 import i18n from "discourse-common/helpers/i18n";
 import not from "truth-helpers/helpers/not";
 
 export default class AiHelperCustomPrompt extends Component {
+  @tracked _customPromptInput;
+
   @action
-  sendInput(event) {
-    if (event.key !== "Enter") {
-      return;
-    }
+  setupCustomPrompt() {
+    this._customPromptInput = document.querySelector(
+      ".ai-custom-prompt__input"
+    );
+    this._customPromptInput.focus();
+  }
+
+  @action
+  sendInput() {
     return this.args.submit(this.args.promptArgs);
   }
 
   <template>
-    <div class="ai-custom-prompt">
-
-      <input
-        {{on "input" (withEventValue (fn (mut @value)))}}
-        {{on "keydown" this.sendInput}}
-        value={{@value}}
+    <div class="ai-custom-prompt" {{didInsert this.setupCustomPrompt}}>
+      <Input
+        @value={{@value}}
         placeholder={{i18n
           "discourse_ai.ai_helper.context_menu.custom_prompt.placeholder"
         }}
         class="ai-custom-prompt__input"
-        type="text"
-        {{!-- Using {{autoFocus}} helper instead of built in autofocus="autofocus"
-            because built in autofocus doesn't work consistently when component is
-            invoked twice separetly without a page refresh.
-            (i.e. trigger in post AI helper followed by trigger in composer AI helper)
-      --}}
-        {{autoFocus}}
+        @enter={{this.sendInput}}
       />
 
       <DButton

assets/javascripts/discourse/components/ai-helper-loading.gjs

@@ -2,7 +2,7 @@ import DButton from "discourse/components/d-button";
 import i18n from "discourse-common/helpers/i18n";
 
 const AiHelperLoading = <template>
-  <div class="ai-helper-loading">
+  <div class="ai-helper-context-menu__loading">
     <div class="dot-falling"></div>
     <span>
       {{i18n "discourse_ai.ai_helper.context_menu.loading"}}

assets/javascripts/discourse/components/ai-helper-options-list.gjs

@@ -1,31 +0,0 @@
-import { fn } from "@ember/helper";
-import DButton from "discourse/components/d-button";
-import eq from "truth-helpers/helpers/eq";
-import AiHelperCustomPrompt from "../components/ai-helper-custom-prompt";
-
-const AiHelperOptionsList = <template>
-  <ul class="ai-helper-options">
-    {{#each @options as |option|}}
-      {{#if (eq option.name "custom_prompt")}}
-        <AiHelperCustomPrompt
-          @value={{@customPromptValue}}
-          @promptArgs={{option}}
-          @submit={{@performAction}}
-        />
-      {{else}}
-        <li data-name={{option.translated_name}} data-value={{option.id}}>
-          <DButton
-            @icon={{option.icon}}
-            @translatedLabel={{option.translated_name}}
-            @action={{fn @performAction option}}
-            data-name={{option.name}}
-            data-value={{option.id}}
-            class="btn-flat ai-helper-options__button"
-          />
-        </li>
-      {{/if}}
-    {{/each}}
-  </ul>
-</template>;
-
-export default AiHelperOptionsList;

assets/javascripts/discourse/components/ai-tool-editor.gjs

@@ -6,13 +6,13 @@ import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import didUpdate from "@ember/render-modifiers/modifiers/did-update";
 import { service } from "@ember/service";
-import AceEditor from "discourse/components/ace-editor";
 import BackButton from "discourse/components/back-button";
 import DButton from "discourse/components/d-button";
 import DTooltip from "discourse/components/d-tooltip";
 import withEventValue from "discourse/helpers/with-event-value";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import I18n from "discourse-i18n";
+import AceEditor from "admin/components/ace-editor";
 import ComboBox from "select-kit/components/combo-box";
 import AiToolParameterEditor from "./ai-tool-parameter-editor";
 import AiToolTestModal from "./modal/ai-tool-test-modal";
@@ -25,7 +25,6 @@ export default class AiToolEditor extends Component {
   @service dialog;
   @service modal;
   @service toasts;
-  @service store;
 
   @tracked isSaving = false;
   @tracked editingModel = null;
@@ -54,9 +53,8 @@ export default class AiToolEditor extends Component {
   @action
   configurePreset() {
     this.selectedPreset = this.args.presets.findBy("preset_id", this.presetId);
-    this.editingModel = this.store
-      .createRecord("ai-tool", this.selectedPreset)
-      .workingCopy();
+    this.editingModel = this.args.model.workingCopy();
+    this.editingModel.setProperties(this.selectedPreset);
     this.showDelete = false;
   }
 
@@ -73,6 +71,13 @@ export default class AiToolEditor extends Component {
         "summary"
       );
 
+      for (const p of data.parameters) {
+        if (p.enumValues) {
+          p.enum_values = p.enumValues;
+          delete p.enumValues;
+        }
+      }
+
       await this.args.model.save(data);
 
       this.toasts.success({
@@ -119,7 +124,7 @@ export default class AiToolEditor extends Component {
   <template>
     <BackButton
       @route="adminPlugins.show.discourse-ai-tools"
-      @label="discourse_ai.tools.back"
+      @label="discourse_ai.ai_tool.back"
     />
 
     <form
@@ -194,7 +199,7 @@ export default class AiToolEditor extends Component {
           <label>{{I18n.t "discourse_ai.tools.script"}}</label>
           <AceEditor
             @content={{this.editingModel.script}}
-            @onChange={{fn (mut this.editingModel.script)}}
+            @onChange={{withEventValue (fn (mut this.editingModel.script))}}
             @mode={{ACE_EDITOR_MODE}}
             @theme={{ACE_EDITOR_THEME}}
             @editorId="ai-tool-script-editor"

assets/javascripts/discourse/components/ai-tool-parameter-editor.gjs

@@ -24,7 +24,8 @@ export default class AiToolParameterEditor extends Component {
         description: "",
         type: "string",
         required: false,
-        enum: null,
+        enum: false,
+        enumValues: null,
       })
     );
   }
@@ -42,30 +43,26 @@ export default class AiToolParameterEditor extends Component {
 
   @action
   toggleEnum(parameter) {
-    if (parameter.enum) {
-      parameter.enum = null;
-    } else {
-      this.addEnumValue(parameter);
+    parameter.enum = !parameter.enum;
+    if (!parameter.enum) {
+      parameter.enumValues = null;
     }
   }
 
   @action
   addEnumValue(parameter) {
-    parameter.enum ||= new TrackedArray();
-    parameter.enum.push("");
+    parameter.enumValues ||= new TrackedArray();
+    parameter.enumValues.push("");
   }
 
   @action
   removeEnumValue(parameter, index) {
-    parameter.enum.splice(index, 1);
-    if (parameter.enum.length === 0) {
-      parameter.enum = null;
-    }
+    parameter.enumValues.splice(index, 1);
   }
 
   @action
   updateEnumValue(parameter, index, event) {
-    parameter.enum[index] = event.target.value;
+    parameter.enumValues[index] = event.target.value;
   }
 
   <template>
@@ -96,7 +93,6 @@ export default class AiToolParameterEditor extends Component {
               {{on "input" (fn this.toggleRequired parameter)}}
               checked={{parameter.required}}
               type="checkbox"
-              class="parameter-row__required-toggle"
             />
             {{I18n.t "discourse_ai.tools.parameter_required"}}
           </label>
@@ -106,7 +102,6 @@ export default class AiToolParameterEditor extends Component {
               {{on "input" (fn this.toggleEnum parameter)}}
               checked={{parameter.enum}}
               type="checkbox"
-              class="parameter-row__enum-toggle"
             />
             {{I18n.t "discourse_ai.tools.parameter_enum"}}
           </label>
@@ -120,7 +115,7 @@ export default class AiToolParameterEditor extends Component {
 
         {{#if parameter.enum}}
           <div class="parameter-enum-values">
-            {{#each parameter.enum as |enumValue enumIndex|}}
+            {{#each parameter.enumValues as |enumValue enumIndex|}}
               <div class="enum-value-row">
                 <input
                   {{on "change" (fn this.updateEnumValue parameter enumIndex)}}

assets/javascripts/discourse/components/modal/diff-modal.gjs

@@ -1,86 +1,21 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { next } from "@ember/runloop";
-import { inject as service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
-import CookText from "discourse/components/cook-text";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import i18n from "discourse-common/helpers/i18n";
 
 export default class ModalDiffModal extends Component {
-  @service currentUser;
-  @tracked loading = false;
-  @tracked diff;
-  suggestion = "";
-
-  PROOFREAD_ID = -303;
-
-  constructor() {
-    super(...arguments);
-    this.diff = this.args.model.diff;
-
-    next(() => {
-      if (this.args.model.toolbarEvent) {
-        this.loadDiff();
-      }
-    });
-  }
-
-  async loadDiff() {
-    this.loading = true;
-
-    try {
-      const suggestion = await ajax("/discourse-ai/ai-helper/suggest", {
-        method: "POST",
-        data: {
-          mode: this.PROOFREAD_ID,
-          text: this.selectedText,
-          force_default_locale: true,
-        },
-      });
-
-      this.diff = suggestion.diff;
-      this.suggestion = suggestion.suggestions[0];
-    } catch (e) {
-      popupAjaxError(e);
-    } finally {
-      this.loading = false;
-    }
-  }
-
-  get selectedText() {
-    const selected = this.args.model.toolbarEvent.selected;
-
-    if (selected.value === "") {
-      return selected.pre + selected.post;
-    }
-
-    return selected.value;
-  }
-
   @action
   triggerConfirmChanges() {
     this.args.closeModal();
-    if (this.args.model.confirm) {
-      this.args.model.confirm();
-    }
-
-    if (this.args.model.toolbarEvent && this.suggestion) {
-      this.args.model.toolbarEvent.replaceText(
-        this.selectedText,
-        this.suggestion
-      );
-    }
+    this.args.confirm();
   }
 
   @action
   triggerRevertChanges() {
-    this.args.model.revert();
     this.args.closeModal();
+    this.args.revert();
   }
 
   <template>
@@ -90,46 +25,30 @@ export default class ModalDiffModal extends Component {
       @closeModal={{@closeModal}}
     >
       <:body>
-        {{#if this.loading}}
-          <div class="composer-ai-helper-modal__loading">
-            <CookText @rawText={{this.selectedText}} />
-          </div>
+        {{#if @diff}}
+          {{htmlSafe @diff}}
         {{else}}
-          {{#if this.diff}}
-            {{htmlSafe this.diff}}
-          {{else}}
-            <div class="composer-ai-helper-modal__old-value">
-              {{@model.oldValue}}
-            </div>
+          <div class="composer-ai-helper-modal__old-value">
+            {{@oldValue}}
+          </div>
 
-            <div class="composer-ai-helper-modal__new-value">
-              {{@model.newValue}}
-            </div>
-          {{/if}}
+          <div class="composer-ai-helper-modal__new-value">
+            {{@newValue}}
+          </div>
         {{/if}}
       </:body>
 
       <:footer>
-        {{#if this.loading}}
-          <DButton
-            class="btn-primary"
-            @label="discourse_ai.ai_helper.context_menu.loading"
-            @disabled={{true}}
-          />
-        {{else}}
-          <DButton
-            class="btn-primary confirm"
-            @action={{this.triggerConfirmChanges}}
-            @label="discourse_ai.ai_helper.context_menu.confirm"
-          />
-          {{#if @model.revert}}
-            <DButton
-              class="btn-flat revert"
-              @action={{this.triggerRevertChanges}}
-              @label="discourse_ai.ai_helper.context_menu.revert"
-            />
-          {{/if}}
-        {{/if}}
+        <DButton
+          class="btn-primary confirm"
+          @action={{this.triggerConfirmChanges}}
+          @label="discourse_ai.ai_helper.context_menu.confirm"
+        />
+        <DButton
+          class="btn-flat"
+          @action={{this.triggerRevertChanges}}
+          @label="discourse_ai.ai_helper.context_menu.revert"
+        />
       </:footer>
     </DModal>
   </template>

assets/javascripts/discourse/components/modal/thumbnail-suggestions.gjs

@@ -53,7 +53,7 @@ export default class ThumbnailSuggestions extends Component {
     >
       <:body>
         <div class="ai-thumbnail-suggestions">
-          {{#each @model.thumbnails as |thumbnail|}}
+          {{#each @thumbnails as |thumbnail|}}
             <ThumbnailSuggestionItem
               @thumbnail={{thumbnail}}
               @addSelection={{this.addSelection}}