fix more specs

Author: SamSaffron

app/models/ai_persona.rb

@@ -165,7 +165,7 @@ def class_instance
       vision_enabled
       vision_max_pixels
       rag_conversation_chunks
-      question_consolidator_llm
+      question_consolidator_llm_id
       allow_chat_channel_mentions
       allow_chat_direct_messages
       allow_topic_mentions

lib/ai_bot/bot.rb

@@ -246,7 +246,7 @@ def self.guess_model(bot_user)
 
         return if associated_llm.nil? # Might be a persona user. Handled by constructor.
 
-        "custom:#{associated_llm.id}"
+        associated_llm
       end
 
       def build_placeholder(summary, details, custom_raw: nil)

lib/ai_bot/personas/persona.rb

@@ -173,9 +173,11 @@ def craft_prompt(context, llm: nil)
           TEXT
 
           question_consolidator_llm = llm
-          if self.class.question_consolidator_llm.present?
-            question_consolidator_llm =
-              DiscourseAi::Completions::Llm.proxy(self.class.question_consolidator_llm)
+          if self.class.question_consolidator_llm_id.present?
+            question_consolidator_llm ||=
+              DiscourseAi::Completions::Llm.proxy(
+                LlmModel.find_by(id: self.class.question_consolidator_llm_id),
+              )
           end
 
           if context[:custom_instructions].present?

spec/jobs/regular/digest_rag_upload_spec.rb

@@ -2,8 +2,7 @@
 
 RSpec.describe Jobs::DigestRagUpload do
   fab!(:persona) { Fabricate(:ai_persona) }
-  fab!(:upload)
-
+  fab!(:upload) { Fabricate(:upload, extension: "txt") }
   let(:document_file) { StringIO.new("some text" * 200) }
 
   fab!(:cloudflare_embedding_def)

spec/lib/modules/ai_bot/personas/persona_spec.rb

@@ -8,7 +8,6 @@ def tools
       DiscourseAi::AiBot::Tools::Image,
     ]
   end
-
   def system_prompt
     <<~PROMPT
       {site_url}
@@ -337,7 +336,7 @@ def system_prompt
             name: "custom",
             rag_conversation_chunks: 3,
             allowed_group_ids: [Group::AUTO_GROUPS[:trust_level_0]],
-            question_consolidator_llm: "custom:#{llm_model.id}",
+            question_consolidator_llm_id: llm_model.id,
           )
 
         UploadReference.ensure_exist!(target: custom_ai_persona, upload_ids: [upload.id])

spec/lib/modules/ai_bot/playground_spec.rb

@@ -661,7 +661,7 @@
       expect(last_post.user_id).to eq(persona.user_id)
 
       # tether llm, so it can no longer be switched
-      persona.update!(force_default_llm: true, default_llm: "custom:#{claude_2.id}")
+      persona.update!(force_default_llm: true, default_llm_id: claude_2.id)
 
       DiscourseAi::Completions::Llm.with_prepared_responses(["Hi from bot one"], llm: claude_2) do
         create_post(
@@ -762,7 +762,7 @@
 
       DiscourseAi::Completions::Llm.with_prepared_responses(
         ["Yes I can", "Magic Title"],
-        llm: "custom:#{gpt_35_turbo.id}",
+        llm: gpt_35_turbo,
       ) do
         messages =
           MessageBus.track_publish do
@@ -799,10 +799,7 @@
       )
 
       # replies as correct persona if replying direct to persona
-      DiscourseAi::Completions::Llm.with_prepared_responses(
-        ["Another reply"],
-        llm: "custom:#{gpt_35_turbo.id}",
-      ) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(["Another reply"], llm: gpt_35_turbo) do
         create_post(
           raw: "Please ignore this bot, I am replying to a user",
           topic: post.topic,