Improves entire flow for first time usage and adds a system

spec

Author: SamSaffron

app/controllers/discourse_ai/admin/ai_spam_controller.rb

@@ -21,13 +21,23 @@ def update
         } if allowed_params.key?(:custom_instructions)
 
         if updated_params.present?
-          updated_params[:setting_type] = :spam
-          AiModerationSetting.upsert(updated_params, unique_by: :setting_type)
+          # not using upsert cause we will not get the correct validation errors
+          if AiModerationSetting.spam
+            AiModerationSetting.spam.update!(updated_params)
+          else
+            AiModerationSetting.create!(updated_params.merge(setting_type: :spam))
+          end
         end
 
         is_enabled = ActiveModel::Type::Boolean.new.cast(allowed_params[:is_enabled])
 
-        SiteSetting.ai_spam_detection_enabled = is_enabled if allowed_params.key?(:is_enabled)
+        if allowed_params.key?(:is_enabled)
+          if is_enabled && !AiModerationSetting.spam&.llm_model_id
+            return render_json_error(I18n.t("discourse_ai.llm.configuration.must_select_model"), status: 422)
+          end
+
+          SiteSetting.ai_spam_detection_enabled = is_enabled
+        end
 
         render json: AiSpamSerializer.new(spam_config, root: false)
       end

app/models/ai_moderation_setting.rb

@@ -2,6 +2,7 @@
 class AiModerationSetting < ActiveRecord::Base
   belongs_to :llm_model
 
+  validates :llm_model_id, presence: true
   validates :setting_type, presence: true
   validates :setting_type, uniqueness: true
 

assets/javascripts/discourse/components/ai-spam.gjs

@@ -3,6 +3,7 @@ import { tracked } from "@glimmer/tracking";
 import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DToggleSwitch from "discourse/components/d-toggle-switch";
@@ -38,7 +39,15 @@ export default class AiSpam extends Component {
   initializeFromModel() {
     const model = this.args.model;
     this.isEnabled = model.is_enabled;
-    this.selectedLLM = "custom:" + model.llm_id;
+
+    if (model.llm_id) {
+      this.selectedLLM = "custom:" + model.llm_id;
+    } else {
+      if (this.availableLLMs.length) {
+        this.selectedLLM = this.availableLLMs[0].id;
+        this.autoSelectedLLM = true;
+      }
+    }
     this.customInstructions = model.custom_instructions;
     this.stats = model.stats;
   }
@@ -49,15 +58,20 @@ export default class AiSpam extends Component {
 
   @action
   async toggleEnabled() {
+    this.isEnabled = !this.isEnabled;
+    const data = { is_enabled: this.isEnabled };
+    if (this.autoSelectedLLM) {
+      data.llm_model_id = this.selectedLLM.toString().split(":")[1];
+    }
     try {
-      // so UI responds immediately
-      this.isEnabled = !this.isEnabled;
       const response = await ajax("/admin/plugins/discourse-ai/ai-spam.json", {
         type: "PUT",
-        data: { is_enabled: this.isEnabled },
+        data,
       });
+      this.autoSelectedLLM = false;
       this.isEnabled = response.is_enabled;
     } catch (error) {
+      this.isEnabled = !this.isEnabled;
       popupAjaxError(error);
     }
   }
@@ -132,12 +146,20 @@ export default class AiSpam extends Component {
           <label class="ai-spam__llm-label">{{i18n
               "discourse_ai.spam.select_llm"
             }}</label>
-          <ComboBox
-            @value={{this.selectedLLM}}
-            @content={{this.availableLLMs}}
-            @onChange={{this.updateLLM}}
-            class="ai-spam__llm-selector"
-          />
+          {{#if this.availableLLMs.length}}
+            <ComboBox
+              @value={{this.selectedLLM}}
+              @content={{this.availableLLMs}}
+              @onChange={{this.updateLLM}}
+              class="ai-spam__llm-selector"
+            />
+          {{else}}
+            <span class="ai-spam__llm-placeholder">
+              <LinkTo @route="adminPlugins.show.discourse-ai-llms.index">
+                {{i18n "discourse_ai.spam.no_llms"}}
+              </LinkTo>
+            </span>
+          {{/if}}
         </div>
 
         <div class="ai-spam__instructions">

config/locales/client.en.yml

@@ -141,6 +141,7 @@ en:
         enable: "Enable"
         spam_tip: "AI spam detection will scan the first 3 posts by all new users on public topics. It will flag them for review and block users if they are likely spam."
         settings_saved: "Settings saved"
+        no_llms: "No LLMs available"
 
       usage:
         short_title: "Usage"

config/locales/server.en.yml

@@ -419,6 +419,7 @@ en:
         set_llm_first: "Set %{setting} first."
         model_unreachable: "We couldn't get a response from this model. Check your settings first."
         invalid_seeded_model: "You can't use this model with this feature."
+        must_select_model: "You must select a LLM first."
       endpoints:
         not_configured: "%{display_name} (not configured)"
         configuration_hint:

spec/requests/admin/ai_spam_controller_spec.rb

@@ -25,6 +25,16 @@
         expect(AiModerationSetting.spam.data["custom_instructions"]).to eq("custom instructions")
       end
 
+      it "can not enable spam detection without a model selected" do
+        put "/admin/plugins/discourse-ai/ai-spam.json", params: { custom_instructions: "custom instructions" }
+        expect(response.status).to eq(422)
+      end
+
+      it "can not fiddle with custom instructions without an llm" do
+        put "/admin/plugins/discourse-ai/ai-spam.json", params: { is_enabled: true}
+        expect(response.status).to eq(422)
+      end
+
       context "when spam detection was already set" do
         fab!(:setting) do
           AiModerationSetting.create(

spec/system/ai_moderation/ai_spam_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+RSpec.describe "AI Spam Configuration", type: :system, js: true do
+  fab!(:admin)
+  let(:llm_model) { Fabricate(:llm_model) }
+
+  before do
+    SiteSetting.discourse_ai_enabled = true
+    sign_in(admin)
+  end
+
+  it "can properly configure spam settings" do
+    visit "/admin/plugins/discourse-ai/ai-spam"
+
+    expect(page).to have_css(".ai-spam__llm-placeholder")
+
+    toggle = PageObjects::Components::DToggleSwitch.new(".ai-spam__toggle")
+
+    toggle.toggle
+    dialog = PageObjects::Components::Dialog.new
+    expect(dialog).to have_content(I18n.t("discourse_ai.llm.configuration.must_select_model"))
+    dialog.click_ok
+
+    expect(toggle.unchecked?).to eq(true)
+
+    llm_model
+    visit "/admin/plugins/discourse-ai/ai-spam"
+
+    toggle = PageObjects::Components::DToggleSwitch.new(".ai-spam__toggle")
+    toggle.toggle
+
+    try_until_success { expect(AiModerationSetting.spam&.llm_model_id).to eq(llm_model.id) }
+
+    find(".ai-spam__instructions-input").fill_in(with: "Test spam detection instructions")
+    find(".ai-spam__instructions-save").click
+
+    toasts = PageObjects::Components::Toasts.new
+    expect(toasts).to have_content(I18n.t("js.discourse_ai.spam.settings_saved"))
+
+    expect(AiModerationSetting.spam.custom_instructions).to eq("Test spam detection instructions")
+
+    visit "/admin/plugins/discourse-ai/ai-llms"
+
+    expect(find(".ai-llm-list-editor__usages")).to have_content(
+      I18n.t("js.discourse_ai.llms.usage.ai_spam"),
+    )
+  end
+end