move llm to id column - work in progress

Author: SamSaffron

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -32,9 +32,12 @@ def index
             }
           end
         llms =
-          DiscourseAi::Configuration::LlmEnumerator
-            .values(allowed_seeded_llms: SiteSetting.ai_bot_allowed_seeded_models)
-            .map { |hash| { id: hash[:value], name: hash[:name] } }
+          LlmModel
+            .pluck(:display_name, :id, :vision_enabled)
+            .map do |name, id, vision|
+              next if id < 0 && SiteSetting.ai_bot_allowed_seeded_models_map.exclude?(id.to_s)
+              { id: id, name: name, vision: vision }
+            end
         render json: { ai_personas: ai_personas, meta: { tools: tools, llms: llms } }
       end
 

app/models/ai_persona.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class AiPersona < ActiveRecord::Base
-  # TODO remove this line 01-1-2025
-  self.ignored_columns = %i[commands allow_chat mentionable]
+  # TODO remove this line 01-10-2025
+  self.ignored_columns = %i[default_llm question_consolidator_llm]
 
   # places a hard limit, so per site we cache a maximum of 500 classes
   MAX_PERSONAS_PER_SITE = 500
@@ -12,7 +12,7 @@ class AiPersona < ActiveRecord::Base
   validates :system_prompt, presence: true, length: { maximum: 10_000_000 }
   validate :system_persona_unchangeable, on: :update, if: :system
   validate :chat_preconditions
-  validate :allowed_seeded_model, if: :default_llm
+  validate :allowed_seeded_model, if: :default_llm_id
   validates :max_context_posts, numericality: { greater_than: 0 }, allow_nil: true
   # leaves some room for growth but sets a maximum to avoid memory issues
   # we may want to revisit this in the future
@@ -30,6 +30,9 @@ class AiPersona < ActiveRecord::Base
   belongs_to :created_by, class_name: "User"
   belongs_to :user
 
+  belongs_to :default_llm, class_name: "LlmModel"
+  belongs_to :question_consolidator_llm, class_name: "LlmModel"
+
   has_many :upload_references, as: :target, dependent: :destroy
   has_many :uploads, through: :upload_references
 
@@ -62,7 +65,7 @@ def self.persona_users(user: nil)
             user_id: persona.user_id,
             username: persona.user.username_lower,
             allowed_group_ids: persona.allowed_group_ids,
-            default_llm: persona.default_llm,
+            default_llm_id: persona.default_llm_id,
             force_default_llm: persona.force_default_llm,
             allow_chat_channel_mentions: persona.allow_chat_channel_mentions,
             allow_chat_direct_messages: persona.allow_chat_direct_messages,
@@ -157,7 +160,7 @@ def class_instance
       user_id
       system
       mentionable
-      default_llm
+      default_llm_id
       max_context_posts
       vision_enabled
       vision_max_pixels
@@ -302,7 +305,7 @@ def chat_preconditions
     if (
          allow_chat_channel_mentions || allow_chat_direct_messages || allow_topic_mentions ||
            force_default_llm
-       ) && !default_llm
+       ) && !default_llm_id
       errors.add(:default_llm, I18n.t("discourse_ai.ai_bot.personas.default_llm_required"))
     end
   end
@@ -332,13 +335,12 @@ def ensure_not_system
   end
 
   def allowed_seeded_model
-    return if default_llm.blank?
+    return if default_llm_id.blank?
 
-    llm = LlmModel.find_by(id: default_llm.split(":").last.to_i)
-    return if llm.nil?
-    return if !llm.seeded?
+    return if default_llm.nil?
+    return if !default_llm.seeded?
 
-    return if SiteSetting.ai_bot_allowed_seeded_models.include?(llm.id.to_s)
+    return if SiteSetting.ai_bot_allowed_seeded_models_map.include?(default_llm.id.to_s)
 
     errors.add(:default_llm, I18n.t("discourse_ai.llm.configuration.invalid_seeded_model"))
   end
@@ -348,37 +350,39 @@ def allowed_seeded_model
 #
 # Table name: ai_personas
 #
-#  id                          :bigint           not null, primary key
-#  name                        :string(100)      not null
-#  description                 :string(2000)     not null
-#  system_prompt               :string(10000000) not null
-#  allowed_group_ids           :integer          default([]), not null, is an Array
-#  created_by_id               :integer
-#  enabled                     :boolean          default(TRUE), not null
-#  created_at                  :datetime         not null
-#  updated_at                  :datetime         not null
-#  system                      :boolean          default(FALSE), not null
-#  priority                    :boolean          default(FALSE), not null
-#  temperature                 :float
-#  top_p                       :float
-#  user_id                     :integer
-#  default_llm                 :text
-#  max_context_posts           :integer
-#  vision_enabled              :boolean          default(FALSE), not null
-#  vision_max_pixels           :integer          default(1048576), not null
-#  rag_chunk_tokens            :integer          default(374), not null
-#  rag_chunk_overlap_tokens    :integer          default(10), not null
-#  rag_conversation_chunks     :integer          default(10), not null
-#  question_consolidator_llm   :text
-#  tool_details                :boolean          default(TRUE), not null
-#  tools                       :json             not null
-#  forced_tool_count           :integer          default(-1), not null
-#  allow_chat_channel_mentions :boolean          default(FALSE), not null
-#  allow_chat_direct_messages  :boolean          default(FALSE), not null
-#  allow_topic_mentions        :boolean          default(FALSE), not null
-#  allow_personal_messages     :boolean          default(TRUE), not null
-#  force_default_llm           :boolean          default(FALSE), not null
-#  rag_llm_model_id            :bigint
+#  id                           :bigint           not null, primary key
+#  name                         :string(100)      not null
+#  description                  :string(2000)     not null
+#  system_prompt                :string(10000000) not null
+#  allowed_group_ids            :integer          default([]), not null, is an Array
+#  created_by_id                :integer
+#  enabled                      :boolean          default(TRUE), not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  system                       :boolean          default(FALSE), not null
+#  priority                     :boolean          default(FALSE), not null
+#  temperature                  :float
+#  top_p                        :float
+#  user_id                      :integer
+#  max_context_posts            :integer
+#  max_post_context_tokens      :integer
+#  max_context_tokens           :integer
+#  vision_enabled               :boolean          default(FALSE), not null
+#  vision_max_pixels            :integer          default(1048576), not null
+#  rag_chunk_tokens             :integer          default(374), not null
+#  rag_chunk_overlap_tokens     :integer          default(10), not null
+#  rag_conversation_chunks      :integer          default(10), not null
+#  tool_details                 :boolean          default(TRUE), not null
+#  tools                        :json             not null
+#  forced_tool_count            :integer          default(-1), not null
+#  allow_chat_channel_mentions  :boolean          default(FALSE), not null
+#  allow_chat_direct_messages   :boolean          default(FALSE), not null
+#  allow_topic_mentions         :boolean          default(FALSE), not null
+#  allow_personal_messages      :boolean          default(TRUE), not null
+#  force_default_llm            :boolean          default(FALSE), not null
+#  rag_llm_model_id             :bigint
+#  default_llm_id               :bigint
+#  question_consolidator_llm_id :bigint
 #
 # Indexes
 #

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

@@ -598,7 +598,10 @@ export default class PersonaEditor extends Component {
             @onRemove={{this.removeUpload}}
           />
         </div>
-        <RagOptions @model={{this.editingModel}}>
+        <RagOptions
+          @model={{this.editingModel}}
+          @llms={{@personas.resultSetMeta.llms}}
+        >
           <div class="control-group">
             <label>{{i18n
                 "discourse_ai.ai_persona.rag_conversation_chunks"

assets/javascripts/discourse/components/rag-options.gjs

@@ -5,6 +5,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import DTooltip from "discourse/components/d-tooltip";
 import { i18n } from "discourse-i18n";
+import AiLlmSelector from "./ai-llm-selector";
 
 export default class RagOptions extends Component {
   @tracked showIndexingOptions = false;
@@ -22,6 +23,10 @@ export default class RagOptions extends Component {
       : i18n("discourse_ai.rag.options.show_indexing_options");
   }
 
+  get visionLlms() {
+    return this.args.llms.filter((llm) => llm.vision);
+  }
+
   <template>
     {{#if @model.rag_uploads}}
       <a
@@ -64,6 +69,18 @@ export default class RagOptions extends Component {
           }}
         />
       </div>
+      <div class="control-group">
+        <label>{{i18n "discourse_ai.rag.options.rag_llm_model"}}</label>
+        <AiLlmSelector
+          class="ai-persona-editor__llms"
+          @value={{this.visionLlmId}}
+          @llms={{this.visionLlms}}
+        />
+        <DTooltip
+          @icon="circle-question"
+          @content={{i18n "discourse_ai.rag.options.rag_llm_model_help"}}
+        />
+      </div>
       {{yield}}
     {{/if}}
   </template>

config/locales/client.en.yml

@@ -274,6 +274,8 @@ en:
           rag_chunk_tokens_help: "The number of tokens to use for each chunk in the RAG model. Increase to increase the amount of context the AI can use. (changing will re-index all uploads)"
           rag_chunk_overlap_tokens: "Upload chunk overlap tokens"
           rag_chunk_overlap_tokens_help: "The number of tokens to overlap between chunks in the RAG model. (changing will re-index all uploads)"
+          rag_llm_model: "Indexing Language Model"
+          rag_llm_model_help: "The language model used for OCR during indexing of PDFs and images."
           show_indexing_options: "Show upload options"
           hide_indexing_options: "Hide upload options"
         uploads:

db/migrate/20250210032345_migrate_persona_to_llm_model_id.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+class MigratePersonaToLlmModelId < ActiveRecord::Migration[7.2]
+  def up
+    add_column :ai_personas, :default_llm_id, :bigint
+    add_column :ai_personas, :question_consolidator_llm_id, :bigint
+    # personas are seeded, we do not mark stuff as readonline
+
+    execute <<~SQL
+      UPDATE ai_personas
+        set
+          default_llm_id = (select id from llm_models where ('custom:' || id) = default_llm),
+          question_consolidator_llm_id = (select id from llm_models where ('custom:' || id) = question_consolidator_llm)
+      SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

db/post_migrate/20250210032351_post_migrate_persona_to_llm_model_id.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+class PostMigratePersonaToLlmModelId < ActiveRecord::Migration[7.2]
+  def up
+    remove_column :ai_personas, :default_llm
+    remove_column :ai_personas, :question_consolidator_llm
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

spec/models/ai_persona_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 RSpec.describe AiPersona do
+  fab!(:llm_model)
+  fab!(:seeded_llm_model) { Fabricate(:llm_model, id: -1) }
+
   it "validates context settings" do
     persona =
       AiPersona.new(
@@ -118,7 +121,7 @@
     forum_helper = AiPersona.find_by(name: "Forum Helper")
     forum_helper.update!(
       user_id: 1,
-      default_llm: "anthropic:claude-2",
+      default_llm_id: llm_model.id,
       max_context_posts: 3,
       allow_topic_mentions: true,
       allow_personal_messages: true,
@@ -133,7 +136,7 @@
     # tl 0 by default
     expect(klass.allowed_group_ids).to eq([10])
     expect(klass.user_id).to eq(1)
-    expect(klass.default_llm).to eq("anthropic:claude-2")
+    expect(klass.default_llm_id).to eq(llm_model.id)
     expect(klass.max_context_posts).to eq(3)
     expect(klass.allow_topic_mentions).to eq(true)
     expect(klass.allow_personal_messages).to eq(true)
@@ -149,7 +152,7 @@
         system_prompt: "test",
         tools: [],
         allowed_group_ids: [],
-        default_llm: "anthropic:claude-2",
+        default_llm_id: llm_model.id,
         max_context_posts: 3,
         allow_topic_mentions: true,
         allow_personal_messages: true,
@@ -164,7 +167,7 @@
     expect(klass.system).to eq(false)
     expect(klass.allowed_group_ids).to eq([])
     expect(klass.user_id).to eq(1)
-    expect(klass.default_llm).to eq("anthropic:claude-2")
+    expect(klass.default_llm_id).to eq(llm_model.id)
     expect(klass.max_context_posts).to eq(3)
     expect(klass.allow_topic_mentions).to eq(true)
     expect(klass.allow_personal_messages).to eq(true)
@@ -227,10 +230,9 @@
         system_prompt: "test",
         tools: [],
         allowed_group_ids: [],
-        default_llm: "seeded_model:-1",
+        default_llm_id: seeded_llm_model.id,
       )
 
-    llm_model = Fabricate(:llm_model, id: -1)
     SiteSetting.ai_bot_allowed_seeded_models = ""
 
     expect(persona.valid?).to eq(false)

spec/requests/admin/ai_personas_controller_spec.rb

@@ -4,6 +4,7 @@
   fab!(:admin)
   fab!(:ai_persona)
   fab!(:embedding_definition)
+  fab!(:llm_model)
 
   before do
     sign_in(admin)
@@ -44,7 +45,7 @@
           allow_personal_messages: true,
           allow_chat_channel_mentions: true,
           allow_chat_direct_messages: true,
-          default_llm: "anthropic:claude-2",
+          default_llm_id: llm_model.id,
           forced_tool_count: 2,
         )
       persona2.create_user!
@@ -178,7 +179,7 @@
           allow_personal_messages: true,
           allow_chat_channel_mentions: true,
           allow_chat_direct_messages: true,
-          default_llm: "anthropic:claude-2",
+          default_llm_id: llm_model.id,
           forced_tool_count: 2,
         }
       end