fix tests

Author: SamSaffron

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -96,17 +96,20 @@ def ai_persona_params
             :temperature,
             :default_llm,
             :user_id,
-            :mentionable,
             :max_context_posts,
             :vision_enabled,
             :vision_max_pixels,
             :rag_chunk_tokens,
             :rag_chunk_overlap_tokens,
             :rag_conversation_chunks,
             :question_consolidator_llm,
-            :allow_chat,
+            :allow_chat_channel_mentions,
+            :allow_chat_direct_messages,
+            :allow_topic_mentions,
+            :allow_personal_messages,
             :tool_details,
             :forced_tool_count,
+            :force_default_llm,
             allowed_group_ids: [],
             rag_uploads: [:id],
           )

app/models/ai_persona.rb

@@ -2,7 +2,7 @@
 
 class AiPersona < ActiveRecord::Base
   # TODO remove this line 01-1-2025
-  self.ignored_columns = [:commands, :allow_chat, :mentionable]
+  self.ignored_columns = %i[commands allow_chat mentionable]
 
   # places a hard limit, so per site we cache a maximum of 500 classes
   MAX_PERSONAS_PER_SITE = 500
@@ -68,7 +68,7 @@ def self.persona_users(user: nil)
         end
 
     if user
-      persona_users.select { |user| user.in_any_groups?(mentionable[:allowed_group_ids]) }
+      persona_users.select { |persona_user| user.in_any_groups?(persona_user[:allowed_group_ids]) }
     else
       persona_users
     end
@@ -252,7 +252,10 @@ def regenerate_rag_fragments
   private
 
   def chat_preconditions
-    if (allow_chat_channel_mentions || allow_chat_direct_messages) && !default_llm
+    if (
+         allow_chat_channel_mentions || allow_chat_direct_messages || allow_topic_mentions ||
+           force_default_llm
+       ) && !default_llm
       errors.add(:default_llm, I18n.t("discourse_ai.ai_bot.personas.default_llm_required"))
     end
   end

app/serializers/localized_ai_persona_serializer.rb

@@ -14,7 +14,6 @@ class LocalizedAiPersonaSerializer < ApplicationSerializer
              :allowed_group_ids,
              :temperature,
              :top_p,
-             :mentionable,
              :default_llm,
              :user_id,
              :max_context_posts,
@@ -24,9 +23,13 @@ class LocalizedAiPersonaSerializer < ApplicationSerializer
              :rag_chunk_overlap_tokens,
              :rag_conversation_chunks,
              :question_consolidator_llm,
-             :allow_chat,
              :tool_details,
-             :forced_tool_count
+             :forced_tool_count,
+             :allow_chat_channel_mentions,
+             :allow_chat_direct_messages,
+             :allow_topic_mentions,
+             :allow_personal_messages,
+             :force_default_llm
 
   has_one :user, serializer: BasicUserSerializer, embed: :object
   has_many :rag_uploads, serializer: UploadSerializer, embed: :object

lib/ai_bot/entry_point.rb

@@ -8,7 +8,9 @@ class EntryPoint
       Bot = Struct.new(:id, :name, :llm)
 
       def self.all_bot_ids
-        AiPersona.persona_users.map { |persona| persona[:user_id] }
+        AiPersona.persona_users.map { |persona| persona[:user_id] }.concat(
+          LlmModel.where(enabled_chat_bot: true).pluck(:user_id),
+        )
       end
 
       def self.find_participant_in(participant_ids)

spec/lib/modules/ai_bot/entry_point_spec.rb

@@ -35,15 +35,16 @@
         expect(serializer[:current_user][:can_debug_ai_bot_conversations]).to eq(true)
       end
 
-      it "adds mentionables to current_user_serializer" do
+      it "adds information about forcint default llm to current_user_serializer" do
         Group.refresh_automatic_groups!
 
         persona =
           Fabricate(
             :ai_persona,
-            mentionable: true,
             enabled: true,
             allowed_group_ids: [bot_allowed_group.id],
+            default_llm: "claude-2",
+            force_default_llm: true,
           )
         persona.create_user!
 
@@ -54,7 +55,7 @@
         persona_bot = bots.find { |bot| bot["id"] == persona.user_id }
 
         expect(persona_bot["username"]).to eq(persona.user.username)
-        expect(persona_bot["mentionable"]).to eq(true)
+        expect(persona_bot["force_default_llm"]).to eq(true)
       end
 
       it "includes user ids for all personas in the serializer" do
@@ -69,7 +70,7 @@
 
         persona_bot = bots.find { |bot| bot["id"] == persona.user_id }
         expect(persona_bot["username"]).to eq(persona.user.username)
-        expect(persona_bot["mentionable"]).to eq(false)
+        expect(persona_bot["force_default_llm"]).to eq(false)
       end
 
       it "queues a job to generate a reply by the AI" do

spec/models/ai_persona_spec.rb

@@ -71,9 +71,12 @@
     forum_helper = AiPersona.find_by(name: "Forum Helper")
     forum_helper.update!(
       user_id: 1,
-      mentionable: true,
       default_llm: "anthropic:claude-2",
       max_context_posts: 3,
+      allow_topic_mentions: true,
+      allow_personal_messages: true,
+      allow_chat_channel_mentions: true,
+      allow_chat_direct_messages: true,
     )
 
     klass = forum_helper.class_instance
@@ -83,9 +86,12 @@
     # tl 0 by default
     expect(klass.allowed_group_ids).to eq([10])
     expect(klass.user_id).to eq(1)
-    expect(klass.mentionable).to eq(true)
     expect(klass.default_llm).to eq("anthropic:claude-2")
     expect(klass.max_context_posts).to eq(3)
+    expect(klass.allow_topic_mentions).to eq(true)
+    expect(klass.allow_personal_messages).to eq(true)
+    expect(klass.allow_chat_channel_mentions).to eq(true)
+    expect(klass.allow_chat_direct_messages).to eq(true)
   end
 
   it "defines singleton methods non persona classes" do
@@ -98,7 +104,10 @@
         allowed_group_ids: [],
         default_llm: "anthropic:claude-2",
         max_context_posts: 3,
-        mentionable: true,
+        allow_topic_mentions: true,
+        allow_personal_messages: true,
+        allow_chat_channel_mentions: true,
+        allow_chat_direct_messages: true,
         user_id: 1,
       )
 
@@ -108,20 +117,53 @@
     expect(klass.system).to eq(false)
     expect(klass.allowed_group_ids).to eq([])
     expect(klass.user_id).to eq(1)
-    expect(klass.mentionable).to eq(true)
     expect(klass.default_llm).to eq("anthropic:claude-2")
     expect(klass.max_context_posts).to eq(3)
+    expect(klass.allow_topic_mentions).to eq(true)
+    expect(klass.allow_personal_messages).to eq(true)
+    expect(klass.allow_chat_channel_mentions).to eq(true)
+    expect(klass.allow_chat_direct_messages).to eq(true)
   end
 
-  it "does not allow setting allow_chat without a default_llm" do
+  it "does not allow setting allowing chat without a default_llm" do
     persona =
       AiPersona.create(
         name: "test",
         description: "test",
         system_prompt: "test",
         allowed_group_ids: [],
         default_llm: nil,
-        allow_chat: true,
+        allow_chat_channel_mentions: true,
+      )
+
+    expect(persona.valid?).to eq(false)
+    expect(persona.errors[:default_llm].first).to eq(
+      I18n.t("discourse_ai.ai_bot.personas.default_llm_required"),
+    )
+
+    persona =
+      AiPersona.create(
+        name: "test",
+        description: "test",
+        system_prompt: "test",
+        allowed_group_ids: [],
+        default_llm: nil,
+        allow_chat_direct_messages: true,
+      )
+
+    expect(persona.valid?).to eq(false)
+    expect(persona.errors[:default_llm].first).to eq(
+      I18n.t("discourse_ai.ai_bot.personas.default_llm_required"),
+    )
+
+    persona =
+      AiPersona.create(
+        name: "test",
+        description: "test",
+        system_prompt: "test",
+        allowed_group_ids: [],
+        default_llm: nil,
+        allow_topic_mentions: true,
       )
 
     expect(persona.valid?).to eq(false)

spec/plugin_helper.rb

@@ -2,7 +2,10 @@
 
 module DiscourseAi::ChatBotHelper
   def toggle_enabled_bots(bots: [])
-    LlmModel.update_all(enabled_chat_bot: false)
+    models = LlmModel.all
+    models = models.where("id not in (?)", bots.map(&:id)) if bots.present?
+    models.update_all(enabled_chat_bot: false)
+
     bots.each { |b| b.update!(enabled_chat_bot: true) }
     DiscourseAi::AiBot::SiteSettingsExtension.enable_or_disable_ai_bots
   end

spec/requests/admin/ai_personas_controller_spec.rb

@@ -40,7 +40,10 @@
           :ai_persona,
           name: "search2",
           tools: [["SearchCommand", { base_query: "test" }, true]],
-          mentionable: true,
+          allow_topic_mentions: true,
+          allow_personal_messages: true,
+          allow_chat_channel_mentions: true,
+          allow_chat_direct_messages: true,
           default_llm: "anthropic:claude-2",
           forced_tool_count: 2,
         )
@@ -52,7 +55,11 @@
       serializer_persona1 = response.parsed_body["ai_personas"].find { |p| p["id"] == persona1.id }
       serializer_persona2 = response.parsed_body["ai_personas"].find { |p| p["id"] == persona2.id }
 
-      expect(serializer_persona2["mentionable"]).to eq(true)
+      expect(serializer_persona2["allow_topic_mentions"]).to eq(true)
+      expect(serializer_persona2["allow_personal_messages"]).to eq(true)
+      expect(serializer_persona2["allow_chat_channel_mentions"]).to eq(true)
+      expect(serializer_persona2["allow_chat_direct_messages"]).to eq(true)
+
       expect(serializer_persona2["default_llm"]).to eq("anthropic:claude-2")
       expect(serializer_persona2["user_id"]).to eq(persona2.user_id)
       expect(serializer_persona2["user"]["id"]).to eq(persona2.user_id)
@@ -167,7 +174,10 @@
           tools: [["search", { "base_query" => "test" }, true]],
           top_p: 0.1,
           temperature: 0.5,
-          mentionable: true,
+          allow_topic_mentions: true,
+          allow_personal_messages: true,
+          allow_chat_channel_mentions: true,
+          allow_chat_direct_messages: true,
           default_llm: "anthropic:claude-2",
           forced_tool_count: 2,
         }
@@ -186,9 +196,12 @@
           expect(persona_json["name"]).to eq("superbot")
           expect(persona_json["top_p"]).to eq(0.1)
           expect(persona_json["temperature"]).to eq(0.5)
-          expect(persona_json["mentionable"]).to eq(true)
           expect(persona_json["default_llm"]).to eq("anthropic:claude-2")
           expect(persona_json["forced_tool_count"]).to eq(2)
+          expect(persona_json["allow_topic_mentions"]).to eq(true)
+          expect(persona_json["allow_personal_messages"]).to eq(true)
+          expect(persona_json["allow_chat_channel_mentions"]).to eq(true)
+          expect(persona_json["allow_chat_direct_messages"]).to eq(true)
 
           persona = AiPersona.find(persona_json["id"])
 

spec/requests/embeddings/embeddings_controller_spec.rb

@@ -63,8 +63,6 @@ def create_api_key(user)
     context "when rate limiting is enabled" do
       before { RateLimiter.enable }
 
-      use_redis_snapshotting
-
       it "will rate limit correctly" do
         stub_const(subject.class, :MAX_HYDE_SEARCHES_PER_MINUTE, 1) do
           stub_const(subject.class, :MAX_SEARCHES_PER_MINUTE, 2) do