DEV: update enumerator

Author: keegangeorge

config/locales/client.en.yml

@@ -567,7 +567,7 @@ en:
           max_usages_required: "Must be set if max tokens is not set"
         usage:
           ai_bot: "AI bot"
-          ai_helper: "Helper"
+          ai_helper: "Helper (%{persona})"
           ai_helper_image_caption: "Image caption"
           ai_persona: "Persona (%{persona})"
           ai_summarization: "Summarize"

config/settings.yml

@@ -272,7 +272,6 @@ discourse_ai:
     type: enum
     allow_any: false
     enum: "DiscourseAi::Configuration::LlmEnumerator"
-    validator: "DiscourseAi::Configuration::LlmValidator"
     area: "ai-features/embeddings"
   ai_embeddings_semantic_search_hyde_model_allowed_seeded_models:
     default: ""
@@ -328,7 +327,6 @@ discourse_ai:
     allow_any: false
     type: enum
     enum: "DiscourseAi::Configuration::LlmEnumerator"
-    validator: "DiscourseAi::Configuration::LlmValidator"
     hidden: true
   ai_summarization_persona:
     default: "-11"
@@ -495,7 +493,6 @@ discourse_ai:
     type: enum
     allow_any: false
     enum: "DiscourseAi::Configuration::LlmEnumerator"
-    validator: "DiscourseAi::Configuration::LlmValidator"
     area: "ai-features/translation"
   ai_translation_locale_detector_persona:
     default: "-27"

lib/configuration/llm_enumerator.rb

@@ -5,7 +5,6 @@
 module DiscourseAi
   module Configuration
     class LlmEnumerator < ::EnumSiteSetting
-      # TODO: global_usage is no longer accurate, it should be removed/updated
       def self.global_usage
         rval = Hash.new { |h, k| h[k] = [] }
 
@@ -23,24 +22,53 @@ def self.global_usage
           .each { |llm_id, name, id| rval[llm_id] << { type: :ai_persona, name: name, id: id } }
 
         if SiteSetting.ai_helper_enabled
-          model_id = SiteSetting.ai_helper_model.split(":").last.to_i
-          rval[model_id] << { type: :ai_helper } if model_id != 0
+          {
+            "#{I18n.t("js.discourse_ai.features.ai_helper.proofread")}" =>
+              SiteSetting.ai_helper_proofreader_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.title_suggestions")}" =>
+              SiteSetting.ai_helper_title_suggestions_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.explain")}" =>
+              SiteSetting.ai_helper_explain_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.illustrate_post")}" =>
+              SiteSetting.ai_helper_post_illustrator_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.smart_dates")}" =>
+              SiteSetting.ai_helper_smart_dates_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.translator")}" =>
+              SiteSetting.ai_helper_translator_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.markdown_tables")}" =>
+              SiteSetting.ai_helper_markdown_tables_persona,
+            "#{I18n.t("js.discourse_ai.features.ai_helper.custom_prompt")}" =>
+              SiteSetting.ai_helper_custom_prompt_persona,
+          }.each do |helper_type, persona_id|
+            next if persona_id.blank?
+
+            persona = AiPersona.find_by(id: persona_id)
+            next if persona.blank? || persona.default_llm_id.blank?
+
+            model_id = persona.default_llm_id || SiteSetting.ai_default_llm_model.to_i
+            rval[model_id] << { type: :ai_helper, name: helper_type }
+          end
         end
 
-        if SiteSetting.ai_helper_image_caption_model
-          model_id = SiteSetting.ai_helper_image_caption_model.split(":").last.to_i
-          rval[model_id] << { type: :ai_helper_image_caption } if model_id != 0
+        if SiteSetting.ai_helper_enabled_features.split("|").include?("image_caption")
+          image_caption_persona = AiPersona.find_by(id: SiteSetting.ai_helper_image_caption_persona)
+          model_id = image_caption_persona.default_llm_id || SiteSetting.ai_default_llm_model.to_i
+
+          rval[model_id] << { type: :ai_helper_image_caption }
         end
 
         if SiteSetting.ai_summarization_enabled
           summarization_persona = AiPersona.find_by(id: SiteSetting.ai_summarization_persona)
-          model_id = summarization_persona.default_llm_id || LlmModel.last&.id
+          model_id = summarization_persona.default_llm_id || SiteSetting.ai_default_llm_model.to_i
 
           rval[model_id] << { type: :ai_summarization }
         end
 
         if SiteSetting.ai_embeddings_semantic_search_enabled
-          model_id = SiteSetting.ai_embeddings_semantic_search_hyde_model.split(":").last.to_i
+          search_persona =
+            AiPersona.find_by(id: SiteSetting.ai_embeddings_semantic_search_hyde_persona)
+          model_id = search_persona.default_llm_id || SiteSetting.ai_default_llm_model.to_i
+
           rval[model_id] << { type: :ai_embeddings_semantic_search }
         end
 

lib/configuration/llm_validator.rb

@@ -35,9 +35,11 @@ def run_test(val)
       end
 
       def modules_using(llm_model)
-        choose_llm_settings = modules_and_choose_llm_settings.values
+        in_use_llms = AiPersona.where.not(default_llm_id: nil).pluck(:default_llm_id)
+        default_llm = SiteSetting.ai_default_llm_model.presence&.to_i
 
-        choose_llm_settings.select { |s| SiteSetting.public_send(s) == "custom:#{llm_model.id}" }
+        combined_llms = (in_use_llms + [default_llm]).compact.uniq
+        combined_llms
       end
 
       def error_message

spec/configuration/llm_enumerator_spec.rb

@@ -41,7 +41,7 @@
 
   describe "#global_usage" do
     it "returns a hash of Llm models in use globally" do
-      SiteSetting.ai_helper_model = "custom:#{fake_model.id}"
+      assign_fake_provider_to(:ai_default_llm_model)
       SiteSetting.ai_helper_enabled = true
       expect(described_class.global_usage).to eq(fake_model.id => [{ type: :ai_helper }])
     end

spec/jobs/regular/detect_translate_post_spec.rb

@@ -7,10 +7,8 @@
   let(:locales) { %w[en ja] }
 
   before do
+    assign_fake_provider_to(:ai_default_llm_model)
     SiteSetting.discourse_ai_enabled = true
-    Fabricate(:fake_model).tap do |fake_llm|
-      SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
-    end
     SiteSetting.ai_translation_enabled = true
     SiteSetting.content_localization_supported_locales = locales.join("|")
   end

spec/jobs/regular/detect_translate_topic_spec.rb

@@ -7,10 +7,8 @@
   let(:locales) { %w[en ja] }
 
   before do
+    assign_fake_provider_to(:ai_default_llm_model)
     SiteSetting.discourse_ai_enabled = true
-    Fabricate(:fake_model).tap do |fake_llm|
-      SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
-    end
     SiteSetting.ai_translation_enabled = true
     SiteSetting.content_localization_supported_locales = locales.join("|")
   end

spec/jobs/regular/localize_categories_spec.rb

@@ -10,10 +10,8 @@ def localize_all_categories(*locales)
   end
 
   before do
+    assign_fake_provider_to(:ai_default_llm_model)
     SiteSetting.discourse_ai_enabled = true
-    Fabricate(:fake_model).tap do |fake_llm|
-      SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
-    end
     SiteSetting.ai_translation_enabled = true
     SiteSetting.content_localization_supported_locales = "pt_BR|zh_CN"
 

spec/jobs/regular/localize_posts_spec.rb

@@ -7,10 +7,8 @@
   let(:locales) { %w[en ja de] }
 
   before do
+    assign_fake_provider_to(:ai_default_llm_model)
     SiteSetting.discourse_ai_enabled = true
-    Fabricate(:fake_model).tap do |fake_llm|
-      SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
-    end
     SiteSetting.ai_translation_enabled = true
     SiteSetting.content_localization_supported_locales = locales.join("|")
     SiteSetting.ai_translation_backfill_hourly_rate = 100

spec/jobs/regular/localize_topics_spec.rb

@@ -7,10 +7,8 @@
   let(:locales) { %w[en ja de] }
 
   before do
+    assign_fake_provider_to(:ai_default_llm_model)
     SiteSetting.discourse_ai_enabled = true
-    Fabricate(:fake_model).tap do |fake_llm|
-      SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
-    end
     SiteSetting.ai_translation_enabled = true
     SiteSetting.content_localization_supported_locales = locales.join("|")
     SiteSetting.ai_translation_backfill_hourly_rate = 100