Move code and fix tests

Author: SamSaffron

app/controllers/discourse_ai/admin/ai_llms_controller.rb

@@ -15,7 +15,7 @@ def index
                      each_serializer: LlmModelSerializer,
                      root: false,
                      scope: {
-                       llm_usage: DiscourseAi::Configuration::LlmValidator.global_usage,
+                       llm_usage: DiscourseAi::Configuration::LlmEnumerator.global_usage,
                      },
                    ).as_json,
                  meta: {

app/serializers/llm_model_serializer.rb

@@ -27,7 +27,7 @@ def used_by
         if (scope && scope[:llm_usage])
           scope[:llm_usage]
         else
-          DiscourseAi::Configuration::LlmValidator.global_usage
+          DiscourseAi::Configuration::LlmEnumerator.global_usage
         end
       )
 

lib/configuration/llm_enumerator.rb

@@ -5,6 +5,42 @@
 module DiscourseAi
   module Configuration
     class LlmEnumerator < ::EnumSiteSetting
+      def self.global_usage
+        rval = Hash.new { |h, k| h[k] = [] }
+
+        if SiteSetting.ai_bot_enabled
+          LlmModel
+            .where("enabled_chat_bot = ?", true)
+            .pluck(:id)
+            .each { |llm_id| rval[llm_id] << { type: :ai_bot } }
+
+          AiPersona
+            .where("force_default_llm = ?", true)
+            .pluck(:default_llm, :name, :id)
+            .each do |llm_name, name, id|
+              llm_id = llm_name.split(":").last.to_i
+              rval[llm_id] << { type: :ai_persona, name: name, id: id }
+            end
+        end
+
+        if SiteSetting.ai_helper_enabled
+          model_id = SiteSetting.ai_helper_model.split(":").last.to_i
+          rval[model_id] << { type: :ai_helper }
+        end
+
+        if SiteSetting.ai_summarization_enabled
+          model_id = SiteSetting.ai_summarization_model.split(":").last.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
+          rval[model_id] << { type: :ai_embeddings_semantic_search }
+        end
+
+        rval
+      end
+
       def self.valid_value?(val)
         true
       end

lib/configuration/llm_validator.rb

@@ -3,42 +3,6 @@
 module DiscourseAi
   module Configuration
     class LlmValidator
-      def self.global_usage
-        rval = Hash.new { |h, k| h[k] = [] }
-
-        if SiteSetting.ai_bot_enabled
-          LlmModel
-            .where("enabled_chat_bot = ?", true)
-            .pluck(:id)
-            .each { |llm_id| rval[llm_id] << { type: :ai_bot } }
-
-          AiPersona
-            .where("force_default_llm = ?", true)
-            .pluck(:default_llm, :name, :id)
-            .each do |llm_name, name, id|
-              llm_id = llm_name.split(":").last.to_i
-              rval[llm_id] << { type: :ai_persona, name: name, id: id }
-            end
-        end
-
-        if SiteSetting.ai_helper_enabled
-          model_id = SiteSetting.ai_helper_model.split(":").last.to_i
-          rval[model_id] << { type: :ai_helper }
-        end
-
-        if SiteSetting.ai_summarization_enabled
-          model_id = SiteSetting.ai_summarization_model.split(":").last.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
-          rval[model_id] << { type: :ai_embeddings_semantic_search }
-        end
-
-        rval
-      end
-
       def initialize(opts = {})
         @opts = opts
       end

spec/system/llms/ai_llm_spec.rb

@@ -12,11 +12,8 @@
     visit "/admin/plugins/discourse-ai/ai-llms"
 
     find("[data-llm-id='anthropic-claude-3-haiku'] button").click()
-
     find("input.ai-llm-editor__api-key").fill_in(with: "abcd")
-
-    PageObjects::Components::DToggleSwitch.new(".ai-llm-editor__enabled-chat-bot").toggle
-
+    find(".ai-llm-editor__enabled-chat-bot input").click
     find(".ai-llm-editor__save").click()
 
     expect(page).to have_current_path("/admin/plugins/discourse-ai/ai-llms")
@@ -55,8 +52,7 @@
     find(".select-kit-row[data-name=\"Llama3Tokenizer\"]").click
 
     find(".ai-llm-editor__vision-enabled input").click
-
-    PageObjects::Components::DToggleSwitch.new(".ai-llm-editor__enabled-chat-bot").toggle
+    find(".ai-llm-editor__enabled-chat-bot input").click
 
     find(".ai-llm-editor__save").click()