A platform for community discussion. Free, open, simple.
FIX: Use search blurbs in `DiscourseAi::Utils::Search` (#39952)
Alan Guo Xiang Tanb25324192f95
diff --git a/plugins/discourse-ai/lib/utils/search.rb b/plugins/discourse-ai/lib/utils/search.rbindex 346b865b3fe..72249b7fdea 100644--- a/plugins/discourse-ai/lib/utils/search.rb+++ b/plugins/discourse-ai/lib/utils/search.rb@@ -76,6 +76,7 @@ module DiscourseAiposts = results&.posts || []posts = posts[0..results_limit.to_i - 1]+ regular_search_result_post_ids = posts.map(&:id).to_setif should_try_semantic_searchsemantic_search = DiscourseAi::Embeddings::SemanticSearch.new(guardian)@@ -123,18 +124,26 @@ module DiscourseAielsehidden_tags = DiscourseTagging.hidden_tag_names if SiteSetting.tagging_enabledformat_results(posts, args: search_args, result_style: result_style) do |post|- format_row(topic: post.topic, post:, hidden_tags:)+ format_row(+ topic: post.topic,+ post:,+ hidden_tags:,+ excerpt:+ if search_query.present? && regular_search_result_post_ids.include?(post.id)+ results.blurb(post, scope: guardian)+ end,+ )endendend- def self.format_row(topic:, post: nil, hidden_tags: nil)+ def self.format_row(topic:, post: nil, hidden_tags: nil, excerpt: nil)row = {title: topic.title,# this is deliberate, we don't want to repeat https://example.com/ in every result, but we need subfolderurl: post ? post.relative_url : topic.relative_url,username: post ? post.user&.username : topic.user&.username,- excerpt: post ? post.excerpt : topic.excerpt,+ excerpt: excerpt.presence || (post ? post.excerpt : topic.excerpt),created: post ? post.created_at : topic.created_at,category: category_breadcrumb(topic.category),likes: post ? post.like_count : topic.like_count,diff --git a/plugins/discourse-ai/spec/lib/utils/search_spec.rb b/plugins/discourse-ai/spec/lib/utils/search_spec.rbindex 534f2171387..3cfccaa0d98 100644--- a/plugins/discourse-ai/spec/lib/utils/search_spec.rb+++ b/plugins/discourse-ai/spec/lib/utils/search_spec.rb@@ -65,6 +65,30 @@ RSpec.describe DiscourseAi::Utils::Search doexpect(results[:instruction]).to eq("nothing was found, expand your search")end+ it "returns a matched-term blurb for detailed results" do+ raw = <<~TEXT+ Intro text that should not be enough.++ #{"filler " * 80}++ The needlephrase instructions are the relevant answer.+ TEXT++ post = Fabricate(:post, raw:)+ SearchIndexer.index(post, force: true)++ results =+ described_class.perform_search(+ search_query: "needlephrase",+ current_user: admin,+ result_style: :detailed,+ )++ excerpt = results[:rows].first[:excerpt].to_s.squish++ expect(excerpt).to include("needlephrase")+ end+it "returns private results when user has access" doprivate_post = Fabricate(:post, topic: Fabricate(:topic, category: private_category))