fix various specs... a bunch left

Author: SamSaffron

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -185,15 +185,15 @@ def ai_persona_params
             :priority,
             :top_p,
             :temperature,
-            :default_llm,
+            :default_llm_id,
             :user_id,
             :max_context_posts,
             :vision_enabled,
             :vision_max_pixels,
             :rag_chunk_tokens,
             :rag_chunk_overlap_tokens,
             :rag_conversation_chunks,
-            :question_consolidator_llm,
+            :question_consolidator_llm_id,
             :allow_chat_channel_mentions,
             :allow_chat_direct_messages,
             :allow_topic_mentions,

app/serializers/localized_ai_persona_serializer.rb

@@ -14,15 +14,15 @@ class LocalizedAiPersonaSerializer < ApplicationSerializer
              :allowed_group_ids,
              :temperature,
              :top_p,
-             :default_llm,
+             :default_llm_id,
              :user_id,
              :max_context_posts,
              :vision_enabled,
              :vision_max_pixels,
              :rag_chunk_tokens,
              :rag_chunk_overlap_tokens,
              :rag_conversation_chunks,
-             :question_consolidator_llm,
+             :question_consolidator_llm_id,
              :tool_details,
              :forced_tool_count,
              :allow_chat_channel_mentions,

lib/ai_bot/bot.rb

@@ -16,7 +16,8 @@ def self.as(bot_user, persona: DiscourseAi::AiBot::Personas::General.new, model:
       def initialize(bot_user, persona, model = nil)
         @bot_user = bot_user
         @persona = persona
-        @model = model || self.class.guess_model(bot_user) || @persona.class.default_llm
+        @model =
+          model || self.class.guess_model(bot_user) || LlmModel.find(@persona.class.default_llm_id)
       end
 
       attr_reader :bot_user

spec/lib/modules/ai_bot/playground_spec.rb

@@ -240,7 +240,7 @@
         system_prompt: "You are a helpful bot",
         vision_enabled: true,
         vision_max_pixels: 1_000,
-        default_llm: "custom:#{opus_model.id}",
+        default_llm_id: opus_model.id,
         allow_topic_mentions: true,
       )
     end
@@ -292,7 +292,7 @@
 
       persona.create_user!
       persona.update!(
-        default_llm: "custom:#{claude_2.id}",
+        default_llm_id: claude_2.id,
         allow_chat_channel_mentions: true,
         allow_topic_mentions: true,
       )
@@ -312,7 +312,7 @@
         SiteSetting.ai_bot_enabled = true
         SiteSetting.chat_allowed_groups = "#{Group::AUTO_GROUPS[:trust_level_0]}"
         Group.refresh_automatic_groups!
-        persona.update!(allow_chat_channel_mentions: true, default_llm: "custom:#{opus_model.id}")
+        persona.update!(allow_chat_channel_mentions: true, default_llm_id: opus_model.id)
       end
 
       it "should behave in a sane way when threading is enabled" do
@@ -427,7 +427,7 @@
           allow_chat_direct_messages: true,
           allow_topic_mentions: false,
           allow_chat_channel_mentions: false,
-          default_llm: "custom:#{opus_model.id}",
+          default_llm_id: opus_model.id,
         )
         SiteSetting.ai_bot_enabled = true
       end
@@ -628,7 +628,7 @@
       post = nil
       DiscourseAi::Completions::Llm.with_prepared_responses(
         ["Yes I can", "Magic Title"],
-        llm: "custom:#{claude_2.id}",
+        llm: claude_2,
       ) do
         post =
           create_post(
@@ -647,10 +647,7 @@
 
       llm2.toggle_companion_user
 
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        ["Hi from bot two"],
-        llm: "custom:#{llm2.id}",
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(["Hi from bot two"], llm: llm2) do
         create_post(
           user: admin,
           raw: "hi @#{llm2.user.username.capitalize} how are you",
@@ -665,10 +662,7 @@
       # tether llm, so it can no longer be switched
       persona.update!(force_default_llm: true, default_llm: "custom:#{claude_2.id}")
 
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        ["Hi from bot one"],
-        llm: "custom:#{claude_2.id}",
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(["Hi from bot one"], llm: claude_2) do
         create_post(
           user: admin,
           raw: "hi @#{llm2.user.username.capitalize} how are you",
@@ -688,7 +682,7 @@
 
       DiscourseAi::Completions::Llm.with_prepared_responses(
         ["Yes I can", "Magic Title"],
-        llm: "custom:#{claude_2.id}",
+        llm: claude_2,
       ) do
         post =
           create_post(
@@ -730,11 +724,11 @@
       toggle_enabled_bots(bots: [gpt_35_turbo, claude_2])
 
       post = nil
-      persona.update!(force_default_llm: true, default_llm: "custom:#{gpt_35_turbo.id}")
+      persona.update!(force_default_llm: true, default_llm_id: gpt_35_turbo.id)
 
       DiscourseAi::Completions::Llm.with_prepared_responses(
         ["Yes I can", "Magic Title"],
-        llm: "custom:#{gpt_35_turbo.id}",
+        llm: gpt_35_turbo,
       ) do
         post =
           create_post(

spec/requests/admin/ai_personas_controller_spec.rb

@@ -27,9 +27,13 @@
       expect(response).to be_successful
 
       expect(response.parsed_body["meta"]["llms"]).to eq(
-        DiscourseAi::Configuration::LlmEnumerator.values.map do |hash|
-          { "id" => hash[:value], "name" => hash[:name] }
-        end,
+        [
+          {
+            id: llm_model.id,
+            name: llm_model.display_name,
+            vision: llm_model.vision_enabled,
+          }.stringify_keys,
+        ],
       )
     end
 
@@ -45,6 +49,7 @@
           allow_chat_channel_mentions: true,
           allow_chat_direct_messages: true,
           default_llm_id: llm_model.id,
+          question_consolidator_llm_id: llm_model.id,
           forced_tool_count: 2,
         )
       persona2.create_user!
@@ -60,7 +65,8 @@
       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["default_llm_id"]).to eq(llm_model.id)
+      expect(serializer_persona2["question_consolidator_llm_id"]).to eq(llm_model.id)
       expect(serializer_persona2["user_id"]).to eq(persona2.user_id)
       expect(serializer_persona2["user"]["id"]).to eq(persona2.user_id)
       expect(serializer_persona2["forced_tool_count"]).to eq(2)
@@ -179,6 +185,7 @@
           allow_chat_channel_mentions: true,
           allow_chat_direct_messages: true,
           default_llm_id: llm_model.id,
+          question_consolidator_llm_id: llm_model.id,
           forced_tool_count: 2,
         }
       end
@@ -190,18 +197,20 @@
                headers: {
                  "CONTENT_TYPE" => "application/json",
                }
+
           expect(response).to be_successful
           persona_json = response.parsed_body["ai_persona"]
 
           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["default_llm"]).to eq("anthropic:claude-2")
+          expect(persona_json["default_llm_id"]).to eq(llm_model.id)
           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)
+          expect(persona_json["question_consolidator_llm_id"]).to eq(llm_model.id)
 
           persona = AiPersona.find(persona_json["id"])
 
@@ -424,7 +433,7 @@
     end
 
     it "ensures question exists" do
-      ai_persona.update!(default_llm: "custom:#{llm.id}")
+      ai_persona.update!(default_llm_id: llm.id)
 
       post "/admin/plugins/discourse-ai/ai-personas/stream-reply.json",
            params: {
@@ -436,7 +445,7 @@
     end
 
     it "ensure persona has a user specified" do
-      ai_persona.update!(default_llm: "custom:#{llm.id}")
+      ai_persona.update!(default_llm_id: llm.id)
 
       post "/admin/plugins/discourse-ai/ai-personas/stream-reply.json",
            params: {
@@ -498,7 +507,7 @@ def validate_streamed_response(raw_http, expected)
       ai_persona.create_user!
       ai_persona.update!(
         allowed_group_ids: [Group::AUTO_GROUPS[:trust_level_0]],
-        default_llm: "custom:#{llm.id}",
+        default_llm_id: llm.id,
         allow_personal_messages: true,
         system_prompt: "you are a helpful bot",
       )