Merge branch 'main' into dev-tool-editor-form-kit

Author: keegangeorge

app/models/reviewable_ai_chat_message.rb

@@ -173,6 +173,7 @@ def build_action(
 #  force_review            :boolean          default(FALSE), not null
 #  reject_reason           :text
 #  potentially_illegal     :boolean          default(FALSE)
+#  type_source             :string           default("unknown"), not null
 #
 # Indexes
 #

app/models/reviewable_ai_post.rb

@@ -230,6 +230,7 @@ def build_action(
 #  force_review            :boolean          default(FALSE), not null
 #  reject_reason           :text
 #  potentially_illegal     :boolean          default(FALSE)
+#  type_source             :string           default("unknown"), not null
 #
 # Indexes
 #

assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-trigger.gjs

@@ -19,12 +19,14 @@ export default class AiSummaryTrigger extends Component {
 
   <template>
     {{#if @outletArgs.topic.summarizable}}
-      <DButton
-        @label="summary.buttons.generate"
-        @icon="discourse-sparkles"
-        @action={{this.openAiSummaryModal}}
-        class="btn-default ai-summarization-button"
-      />
+      <section class="topic-map__additional-contents toggle-summary">
+        <DButton
+          @label="summary.buttons.generate"
+          @icon="discourse-sparkles"
+          @action={{this.openAiSummaryModal}}
+          class="btn-default ai-summarization-button"
+        />
+      </section>
     {{/if}}
   </template>
 }

evals/lib/boot.rb

@@ -24,12 +24,12 @@
   end
 end
 
-discourse_path = File.expand_path(File.join(__dir__, "../../../.."))
+discourse_path = ENV["DISCOURSE_PATH"] || File.expand_path(File.join(__dir__, "../../../.."))
 # rubocop:disable Discourse/NoChdir
 Dir.chdir(discourse_path)
 # rubocop:enable Discourse/NoChdir
 
-require "/home/sam/Source/discourse/config/environment"
+require "#{discourse_path}/config/environment"
 
 ENV["DISCOURSE_AI_NO_DEBUG"] = "1"
 module DiscourseAi::Evals

lib/ai_helper/semantic_categorizer.rb

@@ -5,13 +5,15 @@ class SemanticCategorizer
       def initialize(input, user)
         @user = user
         @text = input[:text]
+        @vector = DiscourseAi::Embeddings::Vector.instance
+        @schema = DiscourseAi::Embeddings::Schema.for(Topic)
       end
 
       def categories
         return [] if @text.blank?
         return [] if !DiscourseAi::Embeddings.enabled?
 
-        candidates = nearest_neighbors(limit: 100)
+        candidates = nearest_neighbors
         return [] if candidates.empty?
 
         candidate_ids = candidates.map(&:first)
@@ -40,6 +42,9 @@ def categories
             }
           end
           .map do |c|
+            # Note: <#> returns the negative inner product since Postgres only supports ASC order index scans on operators
+            c[:score] = (c[:score] + 1).abs if @vector.vdef.pg_function = "<#>"
+
             c[:score] = 1 / (c[:score] + 1) # inverse of the distance
             c
           end
@@ -72,6 +77,9 @@ def tags
           .with_index { |tag_list, index| { tags: tag_list, score: candidates[index].last } }
           .flat_map { |c| c[:tags].map { |t| { name: t, score: c[:score] } } }
           .map do |c|
+            # Note: <#> returns the negative inner product since Postgres only supports ASC order index scans on operators
+            c[:score] = (c[:score] + 1).abs if @vector.vdef.pg_function = "<#>"
+
             c[:score] = 1 / (c[:score] + 1) # inverse of the distance
             c
           end
@@ -91,11 +99,8 @@ def tags
 
       private
 
-      def nearest_neighbors(limit: 100)
-        vector = DiscourseAi::Embeddings::Vector.instance
-        schema = DiscourseAi::Embeddings::Schema.for(Topic)
-
-        raw_vector = vector.vector_from(@text)
+      def nearest_neighbors(limit: 50)
+        raw_vector = @vector.vector_from(@text)
 
         muted_category_ids = nil
         if @user.present?
@@ -106,7 +111,7 @@ def nearest_neighbors(limit: 100)
             ).pluck(:category_id)
         end
 
-        schema
+        @schema
           .asymmetric_similarity_search(raw_vector, limit: limit, offset: 0) do |builder|
             builder.join("topics t on t.id = topic_id")
             unless muted_category_ids.empty?

lib/embeddings/schema.rb

@@ -15,6 +15,8 @@ class Schema
       EMBEDDING_TARGETS = %w[topics posts document_fragments]
       EMBEDDING_TABLES = [TOPICS_TABLE, POSTS_TABLE, RAG_DOCS_TABLE]
 
+      DEFAULT_HNSW_EF_SEARCH = 40
+
       MissingEmbeddingError = Class.new(StandardError)
 
       class << self
@@ -132,6 +134,8 @@ def find_by_target(target)
       end
 
       def asymmetric_similarity_search(embedding, limit:, offset:)
+        before_query = hnsw_search_workaround(limit)
+
         builder = DB.build(<<~SQL)
           WITH candidates AS (
             SELECT
@@ -153,7 +157,7 @@ def asymmetric_similarity_search(embedding, limit:, offset:)
           ORDER BY
             embeddings::halfvec(#{dimensions}) #{pg_function} '[:query_embedding]'::halfvec(#{dimensions})
           LIMIT :limit
-          OFFSET :offset
+          OFFSET :offset;
         SQL
 
         builder.where(
@@ -171,18 +175,24 @@ def asymmetric_similarity_search(embedding, limit:, offset:)
           candidates_limit = limit * 2
         end
 
-        builder.query(
-          query_embedding: embedding,
-          candidates_limit: candidates_limit,
-          limit: limit,
-          offset: offset,
-        )
+        ActiveRecord::Base.transaction do
+          DB.exec(before_query) if before_query.present?
+          builder.query(
+            query_embedding: embedding,
+            candidates_limit: candidates_limit,
+            limit: limit,
+            offset: offset,
+          )
+        end
       rescue PG::Error => e
         Rails.logger.error("Error #{e} querying embeddings for model #{vector_def.display_name}")
         raise MissingEmbeddingError
       end
 
       def symmetric_similarity_search(record)
+        limit = 200
+        before_query = hnsw_search_workaround(limit)
+
         builder = DB.build(<<~SQL)
           WITH le_target AS (
             SELECT
@@ -210,7 +220,7 @@ def symmetric_similarity_search(record)
                   le_target
                 LIMIT 1
               )
-            LIMIT 200
+            LIMIT #{limit}
           ) AS widenet
           ORDER BY
             embeddings::halfvec(#{dimensions}) #{pg_function} (
@@ -220,14 +230,17 @@ def symmetric_similarity_search(record)
                 le_target
               LIMIT 1
             )
-          LIMIT 100;
+          LIMIT #{limit / 2};
         SQL
 
         builder.where("model_id = :vid AND strategy_id = :vsid")
 
         yield(builder) if block_given?
 
-        builder.query(vid: vector_def.id, vsid: vector_def.strategy_id, target_id: record.id)
+        ActiveRecord::Base.transaction do
+          DB.exec(before_query) if before_query.present?
+          builder.query(vid: vector_def.id, vsid: vector_def.strategy_id, target_id: record.id)
+        end
       rescue PG::Error => e
         Rails.logger.error("Error #{e} querying embeddings for model #{vector_def.display_name}")
         raise MissingEmbeddingError
@@ -259,6 +272,13 @@ def store(record, embedding, digest)
 
       private
 
+      def hnsw_search_workaround(limit)
+        threshold = limit * 2
+
+        return "" if threshold < DEFAULT_HNSW_EF_SEARCH
+        "SET LOCAL hnsw.ef_search = #{threshold};"
+      end
+
       delegate :dimensions, :pg_function, to: :vector_def
     end
   end

spec/system/ai_helper/ai_composer_helper_spec.rb

@@ -3,6 +3,7 @@
 RSpec.describe "AI Composer helper", type: :system, js: true do
   fab!(:user) { Fabricate(:admin, refresh_auto_groups: true) }
   fab!(:non_member_group) { Fabricate(:group) }
+  fab!(:embedding_definition)
 
   before do
     Group.find_by(id: Group::AUTO_GROUPS[:admins]).add(user)
@@ -243,7 +244,10 @@ def trigger_composer_helper(content)
   end
 
   context "when suggesting the category with AI category suggester" do
-    before { SiteSetting.ai_embeddings_enabled = true }
+    before do
+      SiteSetting.ai_embeddings_selected_model = embedding_definition.id
+      SiteSetting.ai_embeddings_enabled = true
+    end
 
     it "updates the category with the suggested category" do
       response =
@@ -274,7 +278,10 @@ def trigger_composer_helper(content)
   end
 
   context "when suggesting the tags with AI tag suggester" do
-    before { SiteSetting.ai_embeddings_enabled = true }
+    before do
+      SiteSetting.ai_embeddings_selected_model = embedding_definition.id
+      SiteSetting.ai_embeddings_enabled = true
+    end
 
     it "updates the tag with the suggested tag" do
       response =

spec/system/ai_helper/ai_split_topic_suggestion_spec.rb

@@ -35,6 +35,7 @@
   fab!(:cloud) { Fabricate(:tag) }
   fab!(:feedback) { Fabricate(:tag) }
   fab!(:review) { Fabricate(:tag) }
+  fab!(:embedding_definition)
 
   before do
     Group.find_by(id: Group::AUTO_GROUPS[:admins]).add(user)
@@ -80,7 +81,10 @@ def open_move_topic_modal
     end
 
     context "when suggesting categories with AI category suggester" do
-      before { SiteSetting.ai_embeddings_enabled = true }
+      before do
+        SiteSetting.ai_embeddings_selected_model = embedding_definition.id
+        SiteSetting.ai_embeddings_enabled = true
+      end
 
       skip "TODO: Category suggester only loading one category in test" do
         it "updates the category with the suggested category" do
@@ -108,7 +112,10 @@ def open_move_topic_modal
     end
 
     context "when suggesting tags with AI tag suggester" do
-      before { SiteSetting.ai_embeddings_enabled = true }
+      before do
+        SiteSetting.ai_embeddings_selected_model = embedding_definition.id
+        SiteSetting.ai_embeddings_enabled = true
+      end
 
       it "update the tag with the suggested tag" do
         response =