FIX: prevents double escaping of filters

We were passing: `{"category": 4}` which was then escape by Ember, basically causing a double Json stringify and preventing code to work down the road.

.discourse-compatibility

@@ -1,6 +1,3 @@
-< 3.5.0.beta6-dev: 3e74eea1e5e3143888d67a8d8a11206df214dc24
-< 3.5.0.beta3-dev: 09a68414804a1447f52e5d60691ba59742cda9ec
-< 3.5.0.beta2-dev: de8624416a15b3d8e7ad350b083cc1420451ccec
 < 3.5.0.beta1-dev: bdef136080074a993e7c4f5ca562edc31a8ba756
 < 3.4.0.beta4-dev: a53719ab8eb071459f215227421b3ea4987e5f87
 < 3.4.0.beta4-dev: 20612fde52d3f740cad64823ef8aadb0748b567f

.gitignore

@@ -5,6 +5,3 @@ node_modules
 evals/log
 evals/cases
 config/eval-llms.local.yml
-# this gets rid of search results from ag, ripgrep, etc
-tokenizers/
-public/ai-share/highlight.min.js

Gemfile.lock

@@ -1,93 +1,79 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (7.1.3.4)
       base64
-      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
+      mutex_m
+      tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     drb (2.2.1)
-    i18n (1.14.7)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
-    lint_roller (1.1.0)
-    logger (1.6.6)
-    minitest (5.25.5)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    racc (1.8.1)
-    rack (3.1.14)
+    racc (1.8.0)
+    rack (3.1.10)
     rainbow (3.1.1)
-    regexp_parser (2.10.0)
-    rubocop (1.74.0)
+    regexp_parser (2.9.2)
+    rexml (3.3.9)
+    rubocop (1.64.1)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.22.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-discourse (3.12.1)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-discourse (3.8.1)
       activesupport (>= 6.1)
-      lint_roller (>= 1.1.0)
-      rubocop (>= 1.73.2)
-      rubocop-capybara (>= 2.22.0)
-      rubocop-factory_bot (>= 2.27.0)
-      rubocop-rails (>= 2.30.3)
+      rubocop (>= 1.59.0)
+      rubocop-capybara (>= 2.0.0)
+      rubocop-factory_bot (>= 2.0.0)
+      rubocop-rails (>= 2.25.0)
       rubocop-rspec (>= 3.0.1)
-      rubocop-rspec_rails (>= 2.31.0)
-    rubocop-factory_bot (2.27.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.30.3)
+      rubocop-rspec_rails (>= 2.30.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.72.1, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.5.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.31.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-      rubocop-rspec (~> 3.5)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.0.2)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -97,4 +83,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.6.6
+   2.5.10

about.json

@@ -1,8 +1,7 @@
 {
   "tests": {
     "requiredPlugins": [
-      "https://github.com/discourse/discourse-prometheus",
-      "https://github.com/discourse/discourse-solved.git"
+      "https://github.com/discourse/discourse-prometheus"
     ]
   }
 }

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-features-edit.js

@@ -1,27 +0,0 @@
-import { ajax } from "discourse/lib/ajax";
-import DiscourseRoute from "discourse/routes/discourse";
-import SiteSetting from "admin/models/site-setting";
-
-export default class AdminPluginsShowDiscourseAiFeaturesEdit extends DiscourseRoute {
-  async model(params) {
-    const allFeatures = this.modelFor(
-      "adminPlugins.show.discourse-ai-features"
-    );
-    const id = parseInt(params.id, 10);
-    const currentFeature = allFeatures.find((feature) => feature.id === id);
-
-    const { site_settings } = await ajax("/admin/config/site_settings.json", {
-      data: {
-        filter_area: `ai-features/${currentFeature.module_name}`,
-        plugin: "discourse-ai",
-        category: "discourse_ai",
-      },
-    });
-
-    currentFeature.feature_settings = site_settings.map((setting) =>
-      SiteSetting.create(setting)
-    );
-
-    return currentFeature;
-  }
-}

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-features.js

@@ -1,10 +0,0 @@
-import { service } from "@ember/service";
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class AdminPluginsShowDiscourseAiFeatures extends DiscourseRoute {
-  @service store;
-
-  async model() {
-    return this.store.findAll("ai-feature");
-  }
-}

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js

@@ -2,17 +2,8 @@ import DiscourseRoute from "discourse/routes/discourse";
 
 export default class AdminPluginsShowDiscourseAiLlmsEdit extends DiscourseRoute {
   async model(params) {
-    const id = parseInt(params.id, 10);
-
-    if (id < 0) {
-      // You shouldn't be able to access the edit page
-      // if the model is seeded
-      return this.router.transitionTo(
-        "adminPlugins.show.discourse-ai-llms.index"
-      );
-    }
-
     const allLlms = this.modelFor("adminPlugins.show.discourse-ai-llms");
+    const id = parseInt(params.id, 10);
     const record = allLlms.findBy("id", id);
     record.provider_params = record.provider_params || {};
     return record;

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-tools-new.js

@@ -1,10 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class DiscourseAiToolsNewRoute extends DiscourseRoute {
-  beforeModel(transition) {
-    this.preset = transition.to.queryParams.presetId || "empty_tool";
-  }
-
   async model() {
     return this.store.createRecord("ai-tool");
   }
@@ -12,10 +8,10 @@ export default class DiscourseAiToolsNewRoute extends DiscourseRoute {
   setupController(controller) {
     super.setupController(...arguments);
     const toolsModel = this.modelFor("adminPlugins.show.discourse-ai-tools");
+
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
     controller.set("llms", toolsModel.resultSetMeta.llms);
     controller.set("settings", toolsModel.resultSetMeta.settings);
-    controller.set("selectedPreset", this.preset);
   }
 }

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs

@@ -1,24 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import BackButton from "discourse/components/back-button";
-import SiteSettingComponent from "admin/components/site-setting";
-
-export default RouteTemplate(
-  <template>
-    <BackButton
-      @route="adminPlugins.show.discourse-ai-features"
-      @label="discourse_ai.features.back"
-    />
-    <section class="ai-feature-editor__header">
-      <h2>{{@model.name}}</h2>
-      <p>{{@model.description}}</p>
-    </section>
-
-    <section class="ai-feature-editor">
-      {{#each @model.feature_settings as |setting|}}
-        <div>
-          <SiteSettingComponent @setting={{setting}} />
-        </div>
-      {{/each}}
-    </section>
-  </template>
-);

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/index.hbs

@@ -1 +0,0 @@
-<AiFeatures @features={{this.model}} />

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-tools/new.hbs

@@ -5,6 +5,5 @@
     @presets={{this.presets}}
     @llms={{this.llms}}
     @settings={{this.settings}}
-    @selectedPreset={{this.selectedPreset}}
   />
 </section>

app/controllers/discourse_ai/admin/ai_embeddings_controller.rb

@@ -40,7 +40,6 @@ module DiscourseAi
         embedding_def = EmbeddingDefinition.new(ai_embeddings_params)
 
         if embedding_def.save
-          log_ai_embedding_creation(embedding_def)
           render json: AiEmbeddingDefinitionSerializer.new(embedding_def), status: :created
         else
           render_json_error embedding_def
@@ -56,10 +55,7 @@ module DiscourseAi
           )
         end
 
-        initial_attributes = embedding_def.attributes.dup
-
         if embedding_def.update(ai_embeddings_params.except(:dimensions))
-          log_ai_embedding_update(embedding_def, initial_attributes)
           render json: AiEmbeddingDefinitionSerializer.new(embedding_def)
         else
           render_json_error embedding_def
@@ -79,16 +75,7 @@ module DiscourseAi
           return render_json_error(I18n.t("discourse_ai.embeddings.delete_failed"), status: 409)
         end
 
-        embedding_details = {
-          embedding_id: embedding_def.id,
-          display_name: embedding_def.display_name,
-          provider: embedding_def.provider,
-          dimensions: embedding_def.dimensions,
-          subject: embedding_def.display_name,
-        }
-
         if embedding_def.destroy
-          log_ai_embedding_deletion(embedding_details)
           head :no_content
         else
           render_json_error embedding_def
@@ -141,60 +128,6 @@ module DiscourseAi
 
         permitted
       end
-
-      def ai_embeddings_logger_fields
-        {
-          display_name: {
-          },
-          provider: {
-          },
-          dimensions: {
-          },
-          url: {
-          },
-          tokenizer_class: {
-          },
-          max_sequence_length: {
-          },
-          embed_prompt: {
-            type: :large_text,
-          },
-          search_prompt: {
-            type: :large_text,
-          },
-          matryoshka_dimensions: {
-          },
-          api_key: {
-            type: :sensitive,
-          },
-          # JSON fields should be tracked as simple changes
-          json_fields: [:provider_params],
-        }
-      end
-
-      def log_ai_embedding_creation(embedding_def)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { embedding_id: embedding_def.id, subject: embedding_def.display_name }
-        logger.log_creation("embedding", embedding_def, ai_embeddings_logger_fields, entity_details)
-      end
-
-      def log_ai_embedding_update(embedding_def, initial_attributes)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { embedding_id: embedding_def.id, subject: embedding_def.display_name }
-
-        logger.log_update(
-          "embedding",
-          embedding_def,
-          initial_attributes,
-          ai_embeddings_logger_fields,
-          entity_details,
-        )
-      end
-
-      def log_ai_embedding_deletion(embedding_details)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        logger.log_deletion("embedding", embedding_details)
-      end
     end
   end
 end

app/controllers/discourse_ai/admin/ai_features_controller.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module DiscourseAi
-  module Admin
-    class AiFeaturesController < ::Admin::AdminController
-      requires_plugin ::DiscourseAi::PLUGIN_NAME
-
-      def index
-        render json: serialize_modules(DiscourseAi::Configuration::Module.all)
-      end
-
-      def edit
-        raise Discourse::InvalidParameters.new(:id) if params[:id].blank?
-
-        a_module = DiscourseAi::Configuration::Module.find_by(id: params[:id].to_i)
-
-        render json: serialize_module(a_module)
-      end
-
-      private
-
-      def serialize_modules(modules)
-        modules.map { |a_module| serialize_module(a_module) }
-      end
-
-      def serialize_module(a_module)
-        return nil if a_module.blank?
-
-        {
-          id: a_module.id,
-          module_name: a_module.name,
-          module_enabled: a_module.enabled?,
-          features: a_module.features.map { |f| serialize_feature(f) },
-        }
-      end
-
-      def serialize_feature(feature)
-        {
-          name: feature.name,
-          persona: serialize_persona(persona_id_obj_hash[feature.persona_id]),
-          enabled: feature.enabled?,
-        }
-      end
-
-      def serialize_persona(persona)
-        return nil if persona.blank?
-
-        serialize_data(persona, AiFeaturesPersonaSerializer, root: false)
-      end
-
-      private
-
-      def persona_id_obj_hash
-        @persona_id_obj_hash ||=
-          begin
-            setting_names = DiscourseAi::Configuration::Feature.all_persona_setting_names
-            ids = setting_names.map { |sn| SiteSetting.public_send(sn) }
-
-            AiPersona.where(id: ids).index_by(&:id)
-          end
-      end
-    end
-  end
-end

app/controllers/discourse_ai/admin/ai_llms_controller.rb

@@ -47,7 +47,6 @@ module DiscourseAi
 
         if llm_model.save
           llm_model.toggle_companion_user
-          log_llm_model_creation(llm_model)
           render json: LlmModelSerializer.new(llm_model), status: :created
         else
           render_json_error llm_model
@@ -57,10 +56,6 @@ module DiscourseAi
       def update
         llm_model = LlmModel.find(params[:id])
 
-        # Capture initial state for logging
-        initial_attributes = llm_model.attributes.dup
-        initial_quotas = llm_model.llm_quotas.map(&:attributes)
-
         if params[:ai_llm].key?(:llm_quotas)
           if quota_params
             existing_quota_group_ids = llm_model.llm_quotas.pluck(:group_id)
@@ -86,7 +81,6 @@ module DiscourseAi
 
         if llm_model.update(ai_llm_params(updating: llm_model))
           llm_model.toggle_companion_user
-          log_llm_model_update(llm_model, initial_attributes, initial_quotas)
           render json: LlmModelSerializer.new(llm_model)
         else
           render_json_error llm_model
@@ -115,20 +109,11 @@ module DiscourseAi
           )
         end
 
-        # Capture model details for logging before destruction
-        model_details = {
-          model_id: llm_model.id,
-          display_name: llm_model.display_name,
-          name: llm_model.name,
-          provider: llm_model.provider,
-        }
-
         # Clean up companion users
         llm_model.enabled_chat_bot = false
         llm_model.toggle_companion_user
 
         if llm_model.destroy
-          log_llm_model_deletion(model_details)
           head :no_content
         else
           render_json_error llm_model
@@ -172,13 +157,9 @@ module DiscourseAi
             :provider,
             :tokenizer,
             :max_prompt_tokens,
-            :max_output_tokens,
             :api_key,
             :enabled_chat_bot,
             :vision_enabled,
-            :input_cost,
-            :cached_input_cost,
-            :output_cost,
           )
 
         provider = updating ? updating.provider : permitted[:provider]
@@ -205,89 +186,6 @@ module DiscourseAi
 
         permitted
       end
-
-      def ai_llm_logger_fields
-        {
-          display_name: {
-          },
-          name: {
-          },
-          provider: {
-          },
-          tokenizer: {
-          },
-          url: {
-          },
-          max_prompt_tokens: {
-          },
-          max_output_tokens: {
-          },
-          enabled_chat_bot: {
-          },
-          vision_enabled: {
-          },
-          api_key: {
-            type: :sensitive,
-          },
-          input_cost: {
-          },
-          output_cost: {
-          },
-          # JSON fields should be tracked as simple changes
-          json_fields: [:provider_params],
-        }
-      end
-
-      def log_llm_model_creation(llm_model)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { model_id: llm_model.id, subject: llm_model.display_name }
-
-        # Add quota information as a special case
-        if llm_model.llm_quotas.any?
-          entity_details[:quotas] = llm_model
-            .llm_quotas
-            .map do |quota|
-              "Group #{quota.group_id}: #{quota.max_tokens} tokens, #{quota.max_usages} usages, #{quota.duration_seconds}s"
-            end
-            .join("; ")
-        end
-
-        logger.log_creation("llm_model", llm_model, ai_llm_logger_fields, entity_details)
-      end
-
-      def log_llm_model_update(llm_model, initial_attributes, initial_quotas)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { model_id: llm_model.id, subject: llm_model.display_name }
-
-        # Track quota changes separately as they're a special case
-        current_quotas = llm_model.llm_quotas.reload.map(&:attributes)
-        if initial_quotas != current_quotas
-          initial_quota_summary =
-            initial_quotas
-              .map { |q| "Group #{q["group_id"]}: #{q["max_tokens"]} tokens" }
-              .join("; ")
-          current_quota_summary =
-            current_quotas
-              .map { |q| "Group #{q["group_id"]}: #{q["max_tokens"]} tokens" }
-              .join("; ")
-          entity_details[:quotas_changed] = true
-          entity_details[:quotas] = "#{initial_quota_summary} → #{current_quota_summary}"
-        end
-
-        logger.log_update(
-          "llm_model",
-          llm_model,
-          initial_attributes,
-          ai_llm_logger_fields,
-          entity_details,
-        )
-      end
-
-      def log_llm_model_deletion(model_details)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        model_details[:subject] = model_details[:display_name]
-        logger.log_deletion("llm_model", model_details)
-      end
     end
   end
 end

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -9,16 +9,15 @@ module DiscourseAi
 
       def index
         ai_personas =
-          AiPersona
-            .ordered
-            .includes(:user, :uploads)
-            .map { |persona| LocalizedAiPersonaSerializer.new(persona, root: false) }
-
+          AiPersona.ordered.map do |persona|
+            # we use a special serializer here cause names and descriptions are
+            # localized for system personas
+            LocalizedAiPersonaSerializer.new(persona, root: false)
+          end
         tools =
-          DiscourseAi::Personas::Persona.all_available_tools.map do |tool|
+          DiscourseAi::AiBot::Personas::Persona.all_available_tools.map do |tool|
             AiToolSerializer.new(tool, root: false)
           end
-
         AiTool
           .where(enabled: true)
           .each do |tool|
@@ -32,12 +31,10 @@ module DiscourseAi
                 ),
             }
           end
-
         llms =
           DiscourseAi::Configuration::LlmEnumerator.values_for_serialization(
             allowed_seeded_llm_ids: SiteSetting.ai_bot_allowed_seeded_models_map,
           )
-
         render json: {
                  ai_personas: ai_personas,
                  meta: {
@@ -61,7 +58,6 @@ module DiscourseAi
         ai_persona = AiPersona.new(ai_persona_params.except(:rag_uploads))
         if ai_persona.save
           RagDocumentFragment.link_target_and_uploads(ai_persona, attached_upload_ids)
-          log_ai_persona_creation(ai_persona)
 
           render json: {
                    ai_persona: LocalizedAiPersonaSerializer.new(ai_persona, root: false),
@@ -78,11 +74,8 @@ module DiscourseAi
       end
 
       def update
-        initial_attributes = @ai_persona.attributes.dup
-
         if @ai_persona.update(ai_persona_params.except(:rag_uploads))
           RagDocumentFragment.update_target_uploads(@ai_persona, attached_upload_ids)
-          log_ai_persona_update(@ai_persona, initial_attributes)
 
           render json: LocalizedAiPersonaSerializer.new(@ai_persona, root: false)
         else
@@ -91,14 +84,7 @@ module DiscourseAi
       end
 
       def destroy
-        persona_details = {
-          persona_id: @ai_persona.id,
-          name: @ai_persona.name,
-          description: @ai_persona.description,
-        }
-
         if @ai_persona.destroy
-          log_ai_persona_deletion(persona_details)
           head :no_content
         else
           render_json_error @ai_persona
@@ -235,14 +221,6 @@ module DiscourseAi
           permitted[:tools] = permit_tools(tools)
         end
 
-        if response_format = params.dig(:ai_persona, :response_format)
-          permitted[:response_format] = permit_response_format(response_format)
-        end
-
-        if examples = params.dig(:ai_persona, :examples)
-          permitted[:examples] = permit_examples(examples)
-        end
-
         permitted
       end
 
@@ -257,110 +235,6 @@ module DiscourseAi
           [tool, options, !!force_tool]
         end
       end
-
-      def permit_response_format(response_format)
-        return [] if !response_format.is_a?(Array)
-
-        response_format.map do |element|
-          if element && element.is_a?(ActionController::Parameters)
-            element.permit!
-          else
-            false
-          end
-        end
-      end
-
-      def permit_examples(examples)
-        return [] if !examples.is_a?(Array)
-
-        examples.map { |example_arr| example_arr.take(2).map(&:to_s) }
-      end
-
-      def ai_persona_logger_fields
-        {
-          name: {
-          },
-          description: {
-          },
-          enabled: {
-          },
-          priority: {
-          },
-          system_prompt: {
-            type: :large_text,
-          },
-          default_llm_id: {
-          },
-          temperature: {
-          },
-          top_p: {
-          },
-          user_id: {
-          },
-          max_context_posts: {
-          },
-          vision_enabled: {
-          },
-          vision_max_pixels: {
-          },
-          rag_chunk_tokens: {
-          },
-          rag_chunk_overlap_tokens: {
-          },
-          rag_conversation_chunks: {
-          },
-          rag_llm_model_id: {
-          },
-          question_consolidator_llm_id: {
-          },
-          allow_chat_channel_mentions: {
-          },
-          allow_chat_direct_messages: {
-          },
-          allow_topic_mentions: {
-          },
-          allow_personal_messages: {
-          },
-          tool_details: {
-            type: :large_text,
-          },
-          forced_tool_count: {
-          },
-          force_default_llm: {
-          },
-          # JSON fields
-          json_fields: %i[tools response_format examples allowed_group_ids],
-        }
-      end
-
-      def log_ai_persona_creation(ai_persona)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { persona_id: ai_persona.id, subject: ai_persona.name }
-        entity_details[:tools_count] = (ai_persona.tools || []).size
-
-        logger.log_creation("persona", ai_persona, ai_persona_logger_fields, entity_details)
-      end
-
-      def log_ai_persona_update(ai_persona, initial_attributes)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { persona_id: ai_persona.id, subject: ai_persona.name }
-        entity_details[:tools_count] = ai_persona.tools.size if ai_persona.tools.present?
-
-        logger.log_update(
-          "persona",
-          ai_persona,
-          initial_attributes,
-          ai_persona_logger_fields,
-          entity_details,
-        )
-      end
-
-      def log_ai_persona_deletion(persona_details)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        persona_details[:subject] = persona_details[:name]
-
-        logger.log_deletion("persona", persona_details)
-      end
     end
   end
 end

app/controllers/discourse_ai/admin/ai_spam_controller.rb

@@ -10,10 +10,6 @@ module DiscourseAi
       end
 
       def update
-        initial_settings = AiModerationSetting.spam
-        initial_custom_instructions = initial_settings&.data&.dig("custom_instructions")
-        initial_llm_model_id = initial_settings&.llm_model_id
-
         updated_params = {}
         if allowed_params.key?(:llm_model_id)
           llm_model_id = updated_params[:llm_model_id] = allowed_params[:llm_model_id]
@@ -40,8 +36,6 @@ module DiscourseAi
           else
             AiModerationSetting.create!(updated_params.merge(setting_type: :spam))
           end
-
-          log_ai_spam_update(initial_llm_model_id, initial_custom_instructions, allowed_params)
         end
 
         is_enabled = ActiveModel::Type::Boolean.new.cast(allowed_params[:is_enabled])
@@ -56,7 +50,7 @@ module DiscourseAi
             )
           end
 
-          SiteSetting.set_and_log("ai_spam_detection_enabled", is_enabled, current_user)
+          SiteSetting.ai_spam_detection_enabled = is_enabled
         end
 
         render json: AiSpamSerializer.new(spam_config, root: false)
@@ -119,30 +113,6 @@ module DiscourseAi
 
       private
 
-      def log_ai_spam_update(initial_llm_model_id, initial_custom_instructions, params)
-        changes_to_log = {}
-
-        if params.key?(:llm_model_id) && initial_llm_model_id.to_s != params[:llm_model_id].to_s
-          old_model_name =
-            LlmModel.find_by(id: initial_llm_model_id)&.display_name || initial_llm_model_id
-          new_model_name =
-            LlmModel.find_by(id: params[:llm_model_id])&.display_name || params[:llm_model_id]
-
-          changes_to_log[:llm_model_id] = "#{old_model_name} → #{new_model_name}"
-        end
-
-        if params.key?(:custom_instructions) &&
-             initial_custom_instructions != params[:custom_instructions]
-          changes_to_log[:custom_instructions] = params[:custom_instructions]
-        end
-
-        if changes_to_log.present?
-          changes_to_log[:subject] = I18n.t("discourse_ai.spam_detection.logging_subject")
-          logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-          logger.log_custom("update_ai_spam_settings", changes_to_log)
-        end
-      end
-
       def allowed_params
         params.permit(:is_enabled, :llm_model_id, :custom_instructions)
       end

app/controllers/discourse_ai/admin/ai_tools_controller.rb

@@ -25,7 +25,6 @@ module DiscourseAi
 
         if ai_tool.save
           RagDocumentFragment.link_target_and_uploads(ai_tool, attached_upload_ids)
-          log_ai_tool_creation(ai_tool)
           render_serialized(ai_tool, AiCustomToolSerializer, status: :created)
         else
           render_json_error ai_tool
@@ -33,11 +32,8 @@ module DiscourseAi
       end
 
       def update
-        initial_attributes = @ai_tool.attributes.dup
-
         if @ai_tool.update(ai_tool_params)
           RagDocumentFragment.update_target_uploads(@ai_tool, attached_upload_ids)
-          log_ai_tool_update(@ai_tool, initial_attributes)
           render_serialized(@ai_tool, AiCustomToolSerializer)
         else
           render_json_error @ai_tool
@@ -45,15 +41,7 @@ module DiscourseAi
       end
 
       def destroy
-        tool_logger_details = {
-          tool_id: @ai_tool.id,
-          name: @ai_tool.name,
-          tool_name: @ai_tool.tool_name,
-          subject: @ai_tool.name,
-        }
-
         if @ai_tool.destroy
-          log_ai_tool_deletion(tool_logger_details)
           head :no_content
         else
           render_json_error @ai_tool
@@ -67,7 +55,7 @@ module DiscourseAi
         # we need an llm so we have a tokenizer
         # but will do without if none is available
         llm = LlmModel.first&.to_llm
-        runner = @ai_tool.runner(parameters, llm: llm, bot_user: current_user)
+        runner = @ai_tool.runner(parameters, llm: llm, bot_user: current_user, context: {})
         result = runner.invoke
 
         if result.is_a?(Hash) && result[:error]
@@ -108,60 +96,6 @@ module DiscourseAi
           )
           .except(:rag_uploads)
       end
-
-      def ai_tool_logger_fields
-        {
-          name: {
-          },
-          tool_name: {
-          },
-          description: {
-          },
-          summary: {
-          },
-          enabled: {
-          },
-          rag_chunk_tokens: {
-          },
-          rag_chunk_overlap_tokens: {
-          },
-          rag_llm_model_id: {
-          },
-          script: {
-            type: :large_text,
-          },
-          parameters: {
-            type: :large_text,
-          },
-        }
-      end
-
-      def log_ai_tool_creation(ai_tool)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-
-        entity_details = { tool_id: ai_tool.id, subject: ai_tool.name }
-        entity_details[:parameter_count] = ai_tool.parameters.size if ai_tool.parameters.present?
-
-        logger.log_creation("tool", ai_tool, ai_tool_logger_fields, entity_details)
-      end
-
-      def log_ai_tool_update(ai_tool, initial_attributes)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        entity_details = { tool_id: ai_tool.id, subject: ai_tool.name }
-
-        logger.log_update(
-          "tool",
-          ai_tool,
-          initial_attributes,
-          ai_tool_logger_fields,
-          entity_details,
-        )
-      end
-
-      def log_ai_tool_deletion(tool_details)
-        logger = DiscourseAi::Utils::AiStaffActionLogger.new(current_user)
-        logger.log_deletion("tool", tool_details)
-      end
     end
   end
 end

app/controllers/discourse_ai/ai_bot/artifact_key_values_controller.rb

@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-module DiscourseAi
-  module AiBot
-    class ArtifactKeyValuesController < ::ApplicationController
-      requires_plugin DiscourseAi::PLUGIN_NAME
-      before_action :ensure_logged_in, only: %i[set destroy]
-      before_action :find_artifact
-
-      PER_PAGE_MAX = 100
-
-      def index
-        page = index_params[:page].to_i
-        page = 1 if page < 1
-        per_page = index_params[:per_page].to_i
-        per_page = PER_PAGE_MAX if per_page < 1 || per_page > PER_PAGE_MAX
-
-        query = build_index_query
-
-        total_count = query.count
-        key_values =
-          query
-            .includes(:user)
-            .order(:user_id, :key, :created_at)
-            .offset((page - 1) * per_page)
-            .limit(per_page + 1)
-
-        has_more = key_values.length > per_page
-        key_values = key_values.first(per_page) if has_more
-
-        render json: {
-                 key_values:
-                   ActiveModel::ArraySerializer.new(
-                     key_values,
-                     each_serializer: AiArtifactKeyValueSerializer,
-                     keys_only: params[:keys_only] == "true",
-                   ).as_json,
-                 has_more: has_more,
-                 total_count: total_count,
-                 users:
-                   key_values
-                     .map { |kv| kv.user }
-                     .uniq
-                     .map { |u| BasicUserSerializer.new(u, root: nil).as_json },
-               }
-      end
-
-      def destroy
-        if params[:key].blank?
-          render json: { error: "Key parameter is required" }, status: :bad_request
-          return
-        end
-
-        key_value = @artifact.key_values.find_by(user_id: current_user.id, key: params[:key])
-
-        if key_value.nil?
-          render json: { error: "Key not found" }, status: :not_found
-        elsif key_value.destroy
-          head :ok
-        else
-          render json: { errors: key_value.errors.full_messages }, status: :unprocessable_entity
-        end
-      end
-
-      def set
-        key_value =
-          @artifact.key_values.find_or_initialize_by(
-            user: current_user,
-            key: key_value_params[:key],
-          )
-
-        key_value.assign_attributes(key_value_params.except(:key))
-
-        if key_value.save
-          render json: AiArtifactKeyValueSerializer.new(key_value).as_json
-        else
-          render json: { errors: key_value.errors.full_messages }, status: :unprocessable_entity
-        end
-      end
-
-      private
-
-      def key_value_params
-        params.permit(:key, :value, :public)
-      end
-
-      def index_params
-        @index_params ||= params.permit(:page, :per_page, :key, :keys_only, :all_users)
-      end
-
-      def build_index_query
-        query = @artifact.key_values
-
-        query =
-          if current_user&.admin?
-            query
-          elsif current_user
-            query.where("user_id = ? OR public = true", current_user.id)
-          else
-            query.where(public: true)
-          end
-
-        query = query.where("key = ?", index_params[:key]) if index_params[:key].present?
-
-        if index_params[:all_users].to_s != "true"
-          if current_user
-            query = query.where(user_id: current_user.id)
-          else
-            query = query.where("1 = 0")
-          end
-        end
-
-        query
-      end
-
-      def find_artifact
-        @artifact = AiArtifact.find_by(id: params[:artifact_id])
-        raise Discourse::NotFound if !@artifact
-        raise Discourse::NotFound if [email protected]? && guardian.anonymous?
-        raise Discourse::NotFound if [email protected]? && !guardian.can_see?(@artifact.post)
-      end
-    end
-  end
-end

app/controllers/discourse_ai/ai_bot/bot_controller.rb

@@ -47,9 +47,9 @@ module DiscourseAi
 
       def discover
         ai_persona =
-          AiPersona
-            .all_personas(enabled_only: false)
-            .find { |persona| persona.id == SiteSetting.ai_bot_discover_persona.to_i }
+          AiPersona.all_personas.find do |persona|
+            persona.id == SiteSetting.ai_bot_discover_persona.to_i
+          end
 
         if ai_persona.nil? || !current_user.in_any_groups?(ai_persona.allowed_group_ids.to_a)
           raise Discourse::InvalidAccess.new
@@ -69,40 +69,6 @@ module DiscourseAi
 
         render json: {}, status: 200
       end
-
-      def discover_continue_convo
-        raise Discourse::InvalidParameters.new("user_id") if !params[:user_id]
-        raise Discourse::InvalidParameters.new("query") if !params[:query]
-        raise Discourse::InvalidParameters.new("context") if !params[:context]
-
-        user = User.find(params[:user_id])
-
-        bot_user_id = AiPersona.find_by(id: SiteSetting.ai_bot_discover_persona).user_id
-        bot_username = User.find_by(id: bot_user_id).username
-
-        query = params[:query]
-        context = "[quote]\n#{params[:context]}\n[/quote]"
-
-        post =
-          PostCreator.create!(
-            user,
-            title:
-              I18n.t("discourse_ai.ai_bot.discoveries.continue_conversation.title", query: query),
-            raw:
-              I18n.t(
-                "discourse_ai.ai_bot.discoveries.continue_conversation.raw",
-                query: query,
-                context: context,
-              ),
-            archetype: Archetype.private_message,
-            target_usernames: bot_username,
-            skip_validations: true,
-          )
-
-        render json: success_json.merge(topic_id: post.topic_id)
-      rescue StandardError => e
-        render json: failed_json.merge(errors: [e.message]), status: 422
-      end
     end
   end
 end

app/controllers/discourse_ai/ai_bot/conversations_controller.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module DiscourseAi
-  module AiBot
-    class ConversationsController < ::ApplicationController
-      requires_plugin ::DiscourseAi::PLUGIN_NAME
-      requires_login
-
-      def index
-        page = params[:page].to_i
-        per_page = params[:per_page]&.to_i || 40
-
-        base_query =
-          Topic
-            .private_messages_for_user(current_user)
-            .where(user: current_user) # Only show PMs where the current user is the author
-            .joins(
-              "INNER JOIN topic_custom_fields tcf ON tcf.topic_id = topics.id
-                   AND tcf.name = '#{DiscourseAi::AiBot::TOPIC_AI_BOT_PM_FIELD}'
-                   AND tcf.value = 't'",
-            )
-            .distinct
-
-        total = base_query.count
-        pms = base_query.order(last_posted_at: :desc).offset(page * per_page).limit(per_page)
-
-        render json: {
-                 conversations: serialize_data(pms, ListableTopicSerializer),
-                 meta: {
-                   total: total,
-                   page: page,
-                   per_page: per_page,
-                   has_more: total > (page + 1) * per_page,
-                 },
-               }
-      end
-    end
-  end
-end

app/controllers/discourse_ai/ai_bot/shared_ai_conversations_controller.rb

@@ -8,7 +8,7 @@ module DiscourseAi
       before_action :require_site_settings!
 
       skip_before_action :preload_json, :check_xhr, only: %i[show asset]
-      skip_before_action :redirect_to_login_if_required, :verify_authenticity_token, only: %i[asset]
+      skip_before_action :verify_authenticity_token, only: ["asset"]
 
       def create
         ensure_allowed_create!

app/controllers/discourse_ai/ai_helper/assistant_controller.rb

@@ -25,24 +25,25 @@ module DiscourseAi
         input = get_text_param!
         force_default_locale = params[:force_default_locale] || false
 
-        raise Discourse::InvalidParameters.new(:mode) if params[:mode].blank?
+        prompt = CompletionPrompt.find_by(id: params[:mode])
 
-        if params[:mode] == DiscourseAi::AiHelper::Assistant::CUSTOM_PROMPT
+        raise Discourse::InvalidParameters.new(:mode) if !prompt || !prompt.enabled?
+
+        if prompt.id == CompletionPrompt::CUSTOM_PROMPT
           raise Discourse::InvalidParameters.new(:custom_prompt) if params[:custom_prompt].blank?
+
+          prompt.custom_instruction = params[:custom_prompt]
         end
 
-        if params[:mode] == DiscourseAi::AiHelper::Assistant::ILLUSTRATE_POST
-          return suggest_thumbnails(input)
-        end
+        return suggest_thumbnails(input) if prompt.id == CompletionPrompt::ILLUSTRATE_POST
 
         hijack do
           render json:
                    DiscourseAi::AiHelper::Assistant.new.generate_and_send_prompt(
-                     params[:mode],
+                     prompt,
                      input,
                      current_user,
-                     force_default_locale: force_default_locale,
-                     custom_prompt: params[:custom_prompt],
+                     force_default_locale,
                    ),
                  status: 200
         end
@@ -52,17 +53,15 @@ module DiscourseAi
       end
 
       def suggest_title
-        if params[:topic_id]
-          topic = Topic.find_by(id: params[:topic_id])
-          input = DiscourseAi::Summarization::Strategies::TopicSummary.new(topic).targets_data
-        else
-          input = get_text_param!
-        end
+        input = get_text_param!
+
+        prompt = CompletionPrompt.enabled_by_name("generate_titles")
+        raise Discourse::InvalidParameters.new(:mode) if !prompt
 
         hijack do
           render json:
                    DiscourseAi::AiHelper::Assistant.new.generate_and_send_prompt(
-                     DiscourseAi::AiHelper::Assistant::GENERATE_TITLES,
+                     prompt,
                      input,
                      current_user,
                    ),
@@ -74,26 +73,22 @@ module DiscourseAi
       end
 
       def suggest_category
-        if params[:topic_id]
-          opts = { topic_id: params[:topic_id] }
-        else
-          input = get_text_param!
-          opts = { text: input }
-        end
+        input = get_text_param!
+        input_hash = { text: input }
 
-        render json: DiscourseAi::AiHelper::SemanticCategorizer.new(current_user, opts).categories,
+        render json:
+                 DiscourseAi::AiHelper::SemanticCategorizer.new(
+                   input_hash,
+                   current_user,
+                 ).categories,
                status: 200
       end
 
       def suggest_tags
-        if params[:topic_id]
-          opts = { topic_id: params[:topic_id] }
-        else
-          input = get_text_param!
-          opts = { text: input }
-        end
+        input = get_text_param!
+        input_hash = { text: input }
 
-        render json: DiscourseAi::AiHelper::SemanticCategorizer.new(current_user, opts).tags,
+        render json: DiscourseAi::AiHelper::SemanticCategorizer.new(input_hash, current_user).tags,
                status: 200
       end
 
@@ -106,50 +101,26 @@ module DiscourseAi
       end
 
       def stream_suggestion
+        post_id = get_post_param!
         text = get_text_param!
+        post = Post.includes(:topic).find_by(id: post_id)
+        prompt = CompletionPrompt.find_by(id: params[:mode])
 
-        location = params[:location]
-        raise Discourse::InvalidParameters.new(:location) if !location
+        raise Discourse::InvalidParameters.new(:mode) if !prompt || !prompt.enabled?
+        raise Discourse::InvalidParameters.new(:post_id) unless post
 
-        raise Discourse::InvalidParameters.new(:mode) if params[:mode].blank?
-        if params[:mode] == DiscourseAi::AiHelper::Assistant::ILLUSTRATE_POST
-          return suggest_thumbnails(input)
-        end
-
-        if params[:mode] == DiscourseAi::AiHelper::Assistant::CUSTOM_PROMPT
+        if prompt.id == CompletionPrompt::CUSTOM_PROMPT
           raise Discourse::InvalidParameters.new(:custom_prompt) if params[:custom_prompt].blank?
         end
 
-        # to stream we must have an appropriate client_id
-        # otherwise we may end up streaming the data to the wrong client
-        raise Discourse::InvalidParameters.new(:client_id) if params[:client_id].blank?
-
-        if location == "composer"
-          Jobs.enqueue(
-            :stream_composer_helper,
-            user_id: current_user.id,
-            text: text,
-            prompt: params[:mode],
-            custom_prompt: params[:custom_prompt],
-            force_default_locale: params[:force_default_locale] || false,
-            client_id: params[:client_id],
-          )
-        else
-          post_id = get_post_param!
-          post = Post.includes(:topic).find_by(id: post_id)
-
-          raise Discourse::InvalidParameters.new(:post_id) unless post
-
-          Jobs.enqueue(
-            :stream_post_helper,
-            post_id: post.id,
-            user_id: current_user.id,
-            text: text,
-            prompt: params[:mode],
-            custom_prompt: params[:custom_prompt],
-            client_id: params[:client_id],
-          )
-        end
+        Jobs.enqueue(
+          :stream_post_helper,
+          post_id: post.id,
+          user_id: current_user.id,
+          text: text,
+          prompt: prompt.name,
+          custom_prompt: params[:custom_prompt],
+        )
 
         render json: { success: true }, status: 200
       rescue DiscourseAi::Completions::Endpoints::Base::CompletionFailed

app/controllers/discourse_ai/embeddings/embeddings_controller.rb

@@ -46,19 +46,11 @@ module DiscourseAi
         end
 
         hijack do
-          begin
-            semantic_search
-              .search_for_topics(query, _page = 1, hyde: !skip_hyde)
-              .each { |topic_post| grouped_results.add(topic_post) }
+          semantic_search
+            .search_for_topics(query, _page = 1, hyde: !skip_hyde)
+            .each { |topic_post| grouped_results.add(topic_post) }
 
-            render_serialized(
-              grouped_results,
-              GroupedSearchResultSerializer,
-              result: grouped_results,
-            )
-          rescue Discourse::InvalidAccess
-            render_json_error(I18n.t("invalid_access"), status: 403)
-          end
+          render_serialized(grouped_results, GroupedSearchResultSerializer, result: grouped_results)
         end
       end
 

app/controllers/discourse_ai/sentiment/sentiment_controller.rb

@@ -46,6 +46,10 @@ module DiscourseAi
             u.name,
             u.uploaded_avatar_id,
             c.id AS category_id,
+            c.name AS category_name,
+            c.color AS category_color,
+            c.slug AS category_slug,
+            c.description AS category_description,
             (CASE 
               WHEN (cr.classification::jsonb->'positive')::float > :threshold THEN 'positive'
               WHEN (cr.classification::jsonb->'negative')::float > :threshold THEN 'negative'

app/jobs/regular/create_ai_chat_reply.rb

@@ -12,11 +12,11 @@ module ::Jobs
       return if message.blank?
 
       personaClass =
-        DiscourseAi::Personas::Persona.find_by(id: args[:persona_id], user: message.user)
+        DiscourseAi::AiBot::Personas::Persona.find_by(id: args[:persona_id], user: message.user)
       return if personaClass.blank?
 
       user = User.find_by(id: personaClass.user_id)
-      bot = DiscourseAi::Personas::Bot.as(user, persona: personaClass.new)
+      bot = DiscourseAi::AiBot::Bot.as(user, persona: personaClass.new)
 
       DiscourseAi::AiBot::Playground.new(bot).reply_to_chat_message(
         message,

app/jobs/regular/create_ai_reply.rb

@@ -10,13 +10,13 @@ module ::Jobs
       persona_id = args[:persona_id]
 
       begin
-        persona = DiscourseAi::Personas::Persona.find_by(user: post.user, id: persona_id)
-        raise DiscourseAi::Personas::Bot::BOT_NOT_FOUND if persona.nil?
+        persona = DiscourseAi::AiBot::Personas::Persona.find_by(user: post.user, id: persona_id)
+        raise DiscourseAi::AiBot::Bot::BOT_NOT_FOUND if persona.nil?
 
-        bot = DiscourseAi::Personas::Bot.as(bot_user, persona: persona.new)
+        bot = DiscourseAi::AiBot::Bot.as(bot_user, persona: persona.new)
 
-        DiscourseAi::AiBot::Playground.new(bot).reply_to(post, feature_name: "bot")
-      rescue DiscourseAi::Personas::Bot::BOT_NOT_FOUND
+        DiscourseAi::AiBot::Playground.new(bot).reply_to(post)
+      rescue DiscourseAi::AiBot::Bot::BOT_NOT_FOUND
         Rails.logger.warn(
           "Bot not found for post #{post.id} - perhaps persona was deleted or bot was disabled",
         )

app/jobs/regular/detect_translate_post.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DetectTranslatePost < ::Jobs::Base
-    sidekiq_options retry: false
-
-    def execute(args)
-      return if !SiteSetting.discourse_ai_enabled
-      return if !SiteSetting.ai_translation_enabled
-      return if args[:post_id].blank?
-
-      post = Post.find_by(id: args[:post_id])
-      return if post.blank? || post.raw.blank? || post.deleted_at.present? || post.user_id <= 0
-
-      topic = post.topic
-      return if topic.blank?
-
-      if SiteSetting.ai_translation_backfill_limit_to_public_content
-        return if topic.category&.read_restricted? || topic.archetype == Archetype.private_message
-      else
-        if topic.archetype == Archetype.private_message &&
-             !TopicAllowedGroup.exists?(topic_id: topic.id)
-          return
-        end
-      end
-
-      # the user may fill locale in manually
-      if (detected_locale = post.locale).blank?
-        begin
-          detected_locale = DiscourseAi::Translation::PostLocaleDetector.detect_locale(post)
-        rescue FinalDestination::SSRFDetector::LookupFailedError
-          # this job is non-critical
-          # the backfill job will handle failures
-          return
-        end
-      end
-
-      locales = SiteSetting.experimental_content_localization_supported_locales.split("|")
-      return if locales.blank?
-
-      locales.each do |locale|
-        next if locale == detected_locale
-        next if post.post_localizations.exists?(locale:)
-
-        begin
-          DiscourseAi::Translation::PostLocalizer.localize(post, locale)
-        rescue FinalDestination::SSRFDetector::LookupFailedError
-          # do nothing, there are too many sporadic lookup failures
-        rescue => e
-          DiscourseAi::Translation::VerboseLogger.log(
-            "Failed to translate post #{post.id} to #{locale}: #{e.message}",
-          )
-        end
-      end
-
-      MessageBus.publish("/topic/#{post.topic_id}", type: :localized, id: post.id)
-    end
-  end
-end

app/jobs/regular/detect_translate_topic.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class DetectTranslateTopic < ::Jobs::Base
-    sidekiq_options retry: false
-
-    def execute(args)
-      return if !SiteSetting.discourse_ai_enabled
-      return if !SiteSetting.ai_translation_enabled
-      return if args[:topic_id].blank?
-
-      topic = Topic.find_by(id: args[:topic_id])
-      if topic.blank? || topic.title.blank? || topic.deleted_at.present? || topic.user_id <= 0
-        return
-      end
-
-      if SiteSetting.ai_translation_backfill_limit_to_public_content
-        return if topic.category&.read_restricted? || topic.archetype == Archetype.private_message
-      else
-        if topic.archetype == Archetype.private_message &&
-             !TopicAllowedGroup.exists?(topic_id: topic.id)
-          return
-        end
-      end
-
-      if (detected_locale = topic.locale).blank?
-        begin
-          detected_locale = DiscourseAi::Translation::TopicLocaleDetector.detect_locale(topic)
-        rescue FinalDestination::SSRFDetector::LookupFailedError
-          # this job is non-critical
-          # the backfill job will handle failures
-          return
-        end
-      end
-
-      locales = SiteSetting.experimental_content_localization_supported_locales.split("|")
-      return if locales.blank?
-
-      locales.each do |locale|
-        next if locale == detected_locale
-        next if topic.topic_localizations.exists?(locale:)
-
-        begin
-          DiscourseAi::Translation::TopicLocalizer.localize(topic, locale)
-        rescue FinalDestination::SSRFDetector::LookupFailedError
-          # do nothing, there are too many sporadic lookup failures
-        rescue => e
-          DiscourseAi::Translation::VerboseLogger.log(
-            "Failed to translate topic #{topic.id} to #{locale}: #{e.message}",
-          )
-        end
-      end
-
-      MessageBus.publish("/topic/#{topic.id}", type: :localized, id: 1)
-    end
-  end
-end

app/jobs/regular/generate_inferred_concepts.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class GenerateInferredConcepts < ::Jobs::Base
-    sidekiq_options queue: "low"
-
-    # Process items to generate new concepts
-    #
-    # @param args [Hash] Contains job arguments
-    # @option args [String] :item_type Required - Type of items to process ('topics' or 'posts')
-    # @option args [Array<Integer>] :item_ids Required - List of item IDs to process
-    # @option args [Integer] :batch_size (100) Number of items to process in each batch
-    # @option args [Boolean] :match_only (false) Only match against existing concepts without generating new ones
-    def execute(args = {})
-      return if args[:item_ids].blank? || args[:item_type].blank?
-
-      if %w[topics posts].exclude?(args[:item_type])
-        Rails.logger.error("Invalid item_type for GenerateInferredConcepts: #{args[:item_type]}")
-        return
-      end
-
-      # Process items in smaller batches to avoid memory issues
-      batch_size = args[:batch_size] || 100
-
-      # Get the list of item IDs
-      item_ids = args[:item_ids]
-      match_only = args[:match_only] || false
-
-      # Process items in batches
-      item_ids.each_slice(batch_size) do |batch_item_ids|
-        process_batch(batch_item_ids, args[:item_type], match_only)
-      end
-    end
-
-    private
-
-    def process_batch(item_ids, item_type, match_only)
-      klass = item_type.singularize.classify.constantize
-      items = klass.where(id: item_ids)
-      manager = DiscourseAi::InferredConcepts::Manager.new
-
-      items.each do |item|
-        begin
-          process_item(item, item_type, match_only, manager)
-        rescue => e
-          Rails.logger.error(
-            "Error generating concepts from #{item_type.singularize} #{item.id}: #{e.message}\n#{e.backtrace.join("\n")}",
-          )
-        end
-      end
-    end
-
-    def process_item(item, item_type, match_only, manager)
-      # Use the Manager method that handles both identifying and creating concepts
-      if match_only
-        if item_type == "topics"
-          manager.match_topic_to_concepts(item)
-        else # posts
-          manager.match_post_to_concepts(item)
-        end
-      else
-        if item_type == "topics"
-          manager.generate_concepts_from_topic(item)
-        else # posts
-          manager.generate_concepts_from_post(item)
-        end
-      end
-    end
-  end
-end