From 4ba9167ccd1e0d3a6b6f5e1041c552328cca211f Mon Sep 17 00:00:00 2001 From: Keegan George Date: Fri, 20 Dec 2024 22:20:49 -0800 Subject: [PATCH 1/3] FIX: Custom prefix causing allowed seeded LLMs not to be shown --- lib/configuration/llm_enumerator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configuration/llm_enumerator.rb b/lib/configuration/llm_enumerator.rb index 02a266fca..30a8b6948 100644 --- a/lib/configuration/llm_enumerator.rb +++ b/lib/configuration/llm_enumerator.rb @@ -59,7 +59,7 @@ def self.values(allowed_seeded_llms: nil) if allowed_seeded_llms.is_a?(Array) values = values.filter do |value_h| - value_h[:value] > 0 || allowed_seeded_llms.include?("custom:#{value_h[:value]}") + value_h[:value] > 0 || allowed_seeded_llms.include?("#{value_h[:value]}") end end From 2c40fa5d67e8f092ca1e06a72b709ca6256bc8c0 Mon Sep 17 00:00:00 2001 From: Keegan George Date: Fri, 20 Dec 2024 22:37:03 -0800 Subject: [PATCH 2/3] DEV: update spec --- spec/requests/admin/ai_spam_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/requests/admin/ai_spam_controller_spec.rb b/spec/requests/admin/ai_spam_controller_spec.rb index e0fb0bdfc..306068a6d 100644 --- a/spec/requests/admin/ai_spam_controller_spec.rb +++ b/spec/requests/admin/ai_spam_controller_spec.rb @@ -193,7 +193,7 @@ it "correctly filters seeded llms" do SiteSetting.ai_spam_detection_enabled = true - seeded_llm = Fabricate(:llm_model, id: -1, name: "seeded") + seeded_llm = Fabricate(:seeded_model) get "/admin/plugins/discourse-ai/ai-spam.json" expect(response.status).to eq(200) @@ -202,7 +202,7 @@ # only includes fabricated model expect(json["available_llms"].length).to eq(1) - SiteSetting.ai_spam_detection_model_allowed_seeded_models = seeded_llm.identifier + SiteSetting.ai_spam_detection_model_allowed_seeded_models = [seeded_llm.id.to_s] get "/admin/plugins/discourse-ai/ai-spam.json" expect(response.status).to eq(200) From 6af007ad515de537d5d6e0d031c96fbc31835d6e Mon Sep 17 00:00:00 2001 From: Keegan George Date: Fri, 20 Dec 2024 22:39:10 -0800 Subject: [PATCH 3/3] not `_map` so should be string not array --- spec/requests/admin/ai_spam_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/admin/ai_spam_controller_spec.rb b/spec/requests/admin/ai_spam_controller_spec.rb index 306068a6d..42f511870 100644 --- a/spec/requests/admin/ai_spam_controller_spec.rb +++ b/spec/requests/admin/ai_spam_controller_spec.rb @@ -202,7 +202,7 @@ # only includes fabricated model expect(json["available_llms"].length).to eq(1) - SiteSetting.ai_spam_detection_model_allowed_seeded_models = [seeded_llm.id.to_s] + SiteSetting.ai_spam_detection_model_allowed_seeded_models = seeded_llm.id.to_s get "/admin/plugins/discourse-ai/ai-spam.json" expect(response.status).to eq(200)