Skip to content

A platform for community discussion. Free, open, simple.

FIX: Don't blow up on a prompt that references a deleted upload (#43007)

Régis Hanol3eb9c7672a01
diff --git a/plugins/discourse-ai/lib/completions/upload_encoder.rb b/plugins/discourse-ai/lib/completions/upload_encoder.rb
index 59d182915ab..e9d8d49a2a4 100644
--- a/plugins/discourse-ai/lib/completions/upload_encoder.rb
+++ b/plugins/discourse-ai/lib/completions/upload_encoder.rb
@@ -20,8 +20,10 @@ module DiscourseAi
)
uploads = []
allowed_attachment_types = normalize_attachment_types(allowed_attachment_types)
+ uploads_by_id = Upload.where(id: upload_ids).index_by(&:id)
+
upload_ids.each do |upload_id|
- upload = Upload.find(upload_id)
+ upload = uploads_by_id[upload_id]
next if upload.blank?
extension = upload.extension&.downcase
diff --git a/plugins/discourse-ai/spec/lib/completions/upload_encoder_spec.rb b/plugins/discourse-ai/spec/lib/completions/upload_encoder_spec.rb
index 17e65be5afe..9085ba750e4 100644
--- a/plugins/discourse-ai/spec/lib/completions/upload_encoder_spec.rb
+++ b/plugins/discourse-ai/spec/lib/completions/upload_encoder_spec.rb
@@ -135,6 +135,12 @@ RSpec.describe DiscourseAi::Completions::UploadEncoder do
expect(encoded[0][:mime_type]).to eq("image/jpeg")
end
+ it "does not raise when an upload no longer exists" do
+ missing_id = Upload.maximum(:id).to_i + 1
+
+ expect(described_class.encode(upload_ids: [missing_id], max_pixels: 1_048_576)).to be_empty
+ end
+
describe ".doc, .docx, .xls, and .xlsx uploads" do
before { SiteSetting.authorized_extensions = "*" }