Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/services/discourse_ai/base_translator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def translate
)

structured_output =
DiscourseAi::Completions::Llm.proxy(SiteSetting.ai_helper_model).generate(
DiscourseAi::Completions::Llm.proxy(SiteSetting.ai_translation_model).generate(
prompt,
user: Discourse.system_user,
feature_name: "translator-translate",
Expand Down
2 changes: 1 addition & 1 deletion app/services/discourse_ai/language_detector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def detect
)

structured_output =
DiscourseAi::Completions::Llm.proxy(SiteSetting.ai_helper_model).generate(
DiscourseAi::Completions::Llm.proxy(SiteSetting.ai_translation_model).generate(
prompt,
user: Discourse.system_user,
feature_name: "translator-language-detect",
Expand Down
2 changes: 1 addition & 1 deletion app/services/discourse_translator/provider/discourse_ai.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def self.translate_text!(text, target_locale_sym = I18n.locale)

def self.validate_required_settings!
unless SiteSetting.translator_enabled && SiteSetting.translator_provider == "DiscourseAi" &&
SiteSetting.discourse_ai_enabled && SiteSetting.ai_helper_enabled
SiteSetting.discourse_ai_enabled
raise TranslatorError.new(
I18n.t(
"translator.discourse_ai.ai_helper_required",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,13 @@ def valid_value?(val)

if val == "DiscourseAi"
return false if !defined?(::DiscourseAi)
return false if !SiteSetting.ai_helper_enabled
end

true
end

def error_message
return I18n.t("translator.discourse_ai.not_installed") if !defined?(::DiscourseAi)

if !SiteSetting.ai_helper_enabled
I18n.t("translator.discourse_ai.ai_helper_required", { base_url: Discourse.base_url })
end
I18n.t("translator.discourse_ai.not_installed") if !defined?(::DiscourseAi)
end
end
end
Expand Down
26 changes: 4 additions & 22 deletions spec/lib/translator_selection_validator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,10 @@
end
end

context "when DiscourseAi is defined but ai_helper_enabled is false" do
it "returns false" do
SiteSetting.ai_helper_enabled = false
expect(described_class.new.valid_value?("DiscourseAi")).to eq(false)
end
end

context "when DiscourseAi is defined and ai_helper_enabled is true" do
context "when DiscourseAi is defined" do
it "returns true" do
DiscourseAi::Completions::Llm.with_prepared_responses(["OK"]) do
SiteSetting.ai_helper_model = "custom:#{llm_model.id}"
SiteSetting.ai_helper_enabled = true
SiteSetting.ai_translation_model = "custom:#{llm_model.id}"
end
expect(described_class.new.valid_value?("DiscourseAi")).to eq(true)
end
Expand All @@ -57,20 +49,10 @@
end
end

context "when DiscourseAi is defined but ai_helper_enabled is false" do
it "returns the ai_helper_required error message" do
SiteSetting.ai_helper_enabled = false
expect(described_class.new.error_message).to eq(
I18n.t("translator.discourse_ai.ai_helper_required", { base_url: Discourse.base_url }),
)
end
end

context "when DiscourseAi is defined and ai_helper_enabled is true" do
context "when DiscourseAi is defined" do
it "returns nil" do
DiscourseAi::Completions::Llm.with_prepared_responses(["OK"]) do
SiteSetting.ai_helper_model = "custom:#{llm_model.id}"
SiteSetting.ai_helper_enabled = true
SiteSetting.ai_translation_model = "custom:#{llm_model.id}"
end
expect(described_class.new.error_message).to be_nil
end
Expand Down
5 changes: 2 additions & 3 deletions spec/services/discourse_ai/base_translator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
describe DiscourseAi::BaseTranslator do
before do
Fabricate(:fake_model).tap do |fake_llm|
SiteSetting.public_send("ai_helper_model=", "custom:#{fake_llm.id}")
SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
end
SiteSetting.ai_helper_enabled = true
end

describe ".translate" do
Expand Down Expand Up @@ -38,7 +37,7 @@

allow(DiscourseAi::Completions::Prompt).to receive(:new).and_return(mock_prompt)
allow(DiscourseAi::Completions::Llm).to receive(:proxy).with(
SiteSetting.ai_helper_model,
SiteSetting.ai_translation_model,
).and_return(mock_llm)
allow(mock_llm).to receive(:generate).with(
mock_prompt,
Expand Down
5 changes: 2 additions & 3 deletions spec/services/discourse_ai/language_detector_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
describe DiscourseAi::LanguageDetector do
before do
Fabricate(:fake_model).tap do |fake_llm|
SiteSetting.public_send("ai_helper_model=", "custom:#{fake_llm.id}")
SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
end
SiteSetting.ai_helper_enabled = true
end

describe ".detect" do
Expand Down Expand Up @@ -35,7 +34,7 @@

allow(DiscourseAi::Completions::Prompt).to receive(:new).and_return(mock_prompt)
allow(DiscourseAi::Completions::Llm).to receive(:proxy).with(
SiteSetting.ai_helper_model,
SiteSetting.ai_translation_model,
).and_return(mock_llm)
allow(mock_llm).to receive(:generate).with(
mock_prompt,
Expand Down
3 changes: 1 addition & 2 deletions spec/services/discourse_ai_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@

before do
Fabricate(:fake_model).tap do |fake_llm|
SiteSetting.public_send("ai_helper_model=", "custom:#{fake_llm.id}")
SiteSetting.public_send("ai_translation_model=", "custom:#{fake_llm.id}")
end
SiteSetting.ai_helper_enabled = true
SiteSetting.translator_enabled = true
SiteSetting.translator_provider = "DiscourseAi"
end
Expand Down
Loading