WIP: Settings areas

keegangeorge · keegangeorge · commit 5e0bed17fd07 · 2025-04-07T15:57:34.000-07:00
diff --git a/app/controllers/discourse_ai/admin/ai_features_controller.rb b/app/controllers/discourse_ai/admin/ai_features_controller.rb
@@ -6,12 +6,12 @@ class AiFeaturesController < ::Admin::AdminController
       requires_plugin ::DiscourseAi::PLUGIN_NAME
 
       def index
-        render json: persona_backed_features
+        render json: serialize_features(DiscourseAi::Features.features)
       end
 
       def edit
         raise Discourse::InvalidParameters.new(:id) if params[:id].blank?
-        render json: find_feature_by_id(params[:id].to_i)
+        render json: serialize_feature(DiscourseAi::Features.find_feature_by_id(params[:id].to_i))
       end
 
       def update
@@ -22,103 +22,32 @@ def update
         end
         raise Discourse::InvalidParameters.new(:enabled) if params[:ai_feature][:enabled].nil?
 
-        feature = find_feature_by_id(params[:id].to_i)
+        feature = DiscourseAi::Features.find_feature_by_id(params[:id].to_i)
         enable_value = params[:ai_feature][:enabled]
         persona_id = params[:ai_feature][:persona_id]
 
         SiteSetting.set_and_log(feature[:enable_setting][:name], enable_value, guardian.user)
         SiteSetting.set_and_log(feature[:persona_setting][:name], persona_id, guardian.user)
 
-        render json: find_feature_by_id(params[:id].to_i)
+        render json: serialize_feature(DiscourseAi::Features.find_feature_by_id(params[:id].to_i))
       end
 
       private
 
-      # Eventually we may move this all to an active record model
-      # but for now we are just using a hash
-      # to store the features and their corresponding settings
-      def feature_config
-        [
-          {
-            id: 1,
-            name_key: "discourse_ai.features.summarization.name",
-            description_key: "discourse_ai.features.summarization.description",
-            persona_setting_name: "ai_summarization_persona",
-            enable_setting_name: "ai_summarization_enabled",
-            additional_settings: %w[
-              ai_summary_backfill_topic_max_age_days
-              ai_summary_backfill_maximum_topics_per_hour
-              ai_summary_backfill_minimum_word_count
-              ai_pm_summarization_allowed_groups
-            ],
-          },
-          {
-            id: 2,
-            name_key: "discourse_ai.features.gists.name",
-            description_key: "discourse_ai.features.gists.description",
-            persona_setting_name: "ai_summary_gists_persona",
-            enable_setting_name: "ai_summary_gists_enabled",
-          },
-          {
-            id: 3,
-            name_key: "discourse_ai.features.discoveries.name",
-            description_key: "discourse_ai.features.discoveries.description",
-            persona_setting_name: "ai_bot_discover_persona",
-            enable_setting_name: "ai_bot_enabled",
-          },
-          {
-            id: 4,
-            name_key: "discourse_ai.features.discord_search.name",
-            description_key: "discourse_ai.features.discord_search.description",
-            persona_setting_name: "ai_discord_search_persona",
-            enable_setting_name: "ai_discord_search_enabled",
-            additional_settings: %w[
-              ai_discord_app_id
-              ai_discord_app_public_key
-              ai_discord_search_mode
-              ai_discord_allowed_guilds
-            ],
-          },
-        ]
+      def serialize_features(features)
+        features.map { |feature| feature.merge(persona: serialize_persona(feature[:persona])) }
       end
 
-      def persona_backed_features
-        feature_config.map do |feature|
-          {
-            id: feature[:id],
-            name: I18n.t(feature[:name_key]),
-            description: I18n.t(feature[:description_key]),
-            persona:
-              serialize_data(
-                AiPersona.find_by(id: SiteSetting.get(feature[:persona_setting_name])),
-                AiFeaturesPersonaSerializer,
-                root: false,
-              ),
-            persona_setting: {
-              name: feature[:persona_setting_name],
-              value: SiteSetting.get(feature[:persona_setting_name]),
-              type: SiteSetting.type_supervisor.get_type(feature[:persona_setting_name]),
-            },
-            enable_setting: {
-              name: feature[:enable_setting_name],
-              value: SiteSetting.get(feature[:enable_setting_name]),
-              type: SiteSetting.type_supervisor.get_type(feature[:enable_setting_name]),
-            },
-            additional_settings:
-              (feature[:additional_settings] || []).map do |setting_name|
-                {
-                  name: setting_name,
-                  value: SiteSetting.get(setting_name),
-                  type: SiteSetting.type_supervisor.get_type(setting_name),
-                }
-              end,
-          }
-        end
+      def serialize_feature(feature)
+        return nil if feature.blank?
+
+        feature.merge(persona: serialize_persona(feature[:persona]))
       end
 
-      def find_feature_by_id(id)
-        lookup = persona_backed_features.index_by { |feature| feature[:id] }
-        lookup[id]
+      def serialize_persona(persona)
+        return nil if persona.blank?
+
+        serialize_data(persona, AiFeaturesPersonaSerializer, root: false)
       end
     end
   end
diff --git a/assets/javascripts/discourse/admin/models/ai-feature.js b/assets/javascripts/discourse/admin/models/ai-feature.js
@@ -5,6 +5,7 @@ export default class AiFeature extends RestModel {
     return this.getProperties(
       "id",
       "name",
+      "ref",
       "description",
       "enable_setting",
       "persona",
diff --git a/assets/javascripts/discourse/components/ai-feature-editor.gjs b/assets/javascripts/discourse/components/ai-feature-editor.gjs
@@ -3,25 +3,36 @@ import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
-import { eq } from "truth-helpers";
+import { eq, gt } from "truth-helpers";
 import BackButton from "discourse/components/back-button";
 import Form from "discourse/components/form";
+import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import getURL from "discourse/lib/get-url";
 import discourseLater from "discourse/lib/later";
 import { i18n } from "discourse-i18n";
+import SiteSettingComponent from "admin/components/site-setting";
+import SiteSetting from "admin/models/site-setting";
 
 export default class AiFeatureEditor extends Component {
   @service toasts;
   @service currentUser;
   @service router;
 
+  @tracked settings = null;
+  @tracked isLoading = false;
   @tracked isSaving = false;
 
+  constructor() {
+    super(...arguments);
+    this.#loadSettings();
+  }
+
   get formData() {
     return {
       enabled: this.args.model.enable_setting?.value,
       persona_id: this.args.model.persona?.id,
+      additional_settings: this.args.model.additional_settings,
     };
   }
 
@@ -62,6 +73,33 @@ export default class AiFeatureEditor extends Component {
     });
   }
 
+  async #loadSettings() {
+    this.isLoading = true;
+
+    try {
+      const result = await ajax("/admin/config/site_settings.json", {
+        data: {
+          filter_area: `ai-features/${this.args.model.ref}`,
+          plugin: "discourse-ai",
+          category: "discourse_ai",
+        },
+      });
+
+      const settings = result.site_settings;
+      const settingsMap = settings.map((setting) =>
+        SiteSetting.create(setting)
+      );
+      this.settings = settingsMap;
+
+      console.log(this.settings);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.warn(`Failed to load settings with error: ${error}`);
+    } finally {
+      this.isLoading = false;
+    }
+  }
+
   <template>
     <BackButton
       @route="adminPlugins.show.discourse-ai-features"
@@ -111,12 +149,23 @@ export default class AiFeatureEditor extends Component {
         </field.Select>
       </form.Field>
 
+      <form.Section
+        @title={{i18n "discourse_ai.features.editor.advanced_settings"}}
+      />
+
       <form.Actions>
         <form.Submit
           @label="discourse_ai.features.editor.save"
           @disabled={{this.isSaving}}
         />
       </form.Actions>
     </Form>
+    {{#unless this.isLoading}}
+      {{#each this.settings as |setting|}}
+        {{#if setting}}
+          <SiteSettingComponent @setting={{setting}} />
+        {{/if}}
+      {{/each}}
+    {{/unless}}
   </template>
 }
diff --git a/config/settings.yml b/config/settings.yml
@@ -347,32 +347,32 @@ discourse_ai:
   ai_discord_search_enabled:
     default: false
     client: true
-    hidden: true
+    area: "ai-features/discord_search"
   ai_discord_app_id:
     default: ""
     client: false
-    hidden: true
+    area: "ai-features/discord_search"
   ai_discord_app_public_key:
     default: ""
     client: false
-    hidden: true
+    area: "ai-features/discord_search"
   ai_discord_search_mode:
     default: "search"
     type: enum
     choices:
       - search
       - persona
-    hidden: true
+    area: "ai-features/discord_search"
   ai_discord_search_persona:
     default: ""
     type: enum
     enum: "DiscourseAi::Configuration::PersonaEnumerator"
-    hidden: true
+    area: "ai-features/discord_search"
   ai_discord_allowed_guilds:
     type: list
     list_type: compact
     default: ""
-    hidden: true
+    area: "ai-features/discord_search"
 
   ai_spam_detection_enabled:
     default: false
diff --git a/lib/features.rb b/lib/features.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Features
+    def self.feature_config
+      [
+        {
+          id: 1,
+          name_ref: "summarization",
+          name_key: "discourse_ai.features.summarization.name",
+          description_key: "discourse_ai.features.summarization.description",
+          persona_setting_name: "ai_summarization_persona",
+          enable_setting_name: "ai_summarization_enabled",
+        },
+        {
+          id: 2,
+          name_ref: "gists",
+          name_key: "discourse_ai.features.gists.name",
+          description_key: "discourse_ai.features.gists.description",
+          persona_setting_name: "ai_summary_gists_persona",
+          enable_setting_name: "ai_summary_gists_enabled",
+        },
+        {
+          id: 3,
+          name_ref: "discoveries",
+          name_key: "discourse_ai.features.discoveries.name",
+          description_key: "discourse_ai.features.discoveries.description",
+          persona_setting_name: "ai_bot_discover_persona",
+          enable_setting_name: "ai_bot_enabled",
+        },
+        {
+          id: 4,
+          name_ref: "discord_search",
+          name_key: "discourse_ai.features.discord_search.name",
+          description_key: "discourse_ai.features.discord_search.description",
+          persona_setting_name: "ai_discord_search_persona",
+          enable_setting_name: "ai_discord_search_enabled",
+        },
+      ]
+    end
+
+    def self.features
+      feature_config.map do |feature|
+        {
+          id: feature[:id],
+          ref: feature[:name_ref],
+          name: I18n.t(feature[:name_key]),
+          description: I18n.t(feature[:description_key]),
+          persona: AiPersona.find_by(id: SiteSetting.get(feature[:persona_setting_name])),
+          persona_setting: {
+            name: feature[:persona_setting_name],
+            value: SiteSetting.get(feature[:persona_setting_name]),
+            type: SiteSetting.type_supervisor.get_type(feature[:persona_setting_name]),
+          },
+          enable_setting: {
+            name: feature[:enable_setting_name],
+            value: SiteSetting.get(feature[:enable_setting_name]),
+            type: SiteSetting.type_supervisor.get_type(feature[:enable_setting_name]),
+          },
+          additional_settings:
+            (feature[:additional_settings] || []).map do |setting_name|
+              {
+                name: setting_name,
+                value: SiteSetting.get(setting_name),
+                type: SiteSetting.type_supervisor.get_type(setting_name),
+              }
+            end,
+        }
+      end
+    end
+
+    def self.find_feature_by_id(id)
+      lookup = features.index_by { |f| f[:id] }
+      lookup[id]
+    end
+
+    def self.find_feature_by_ref(name_ref)
+      lookup = features.index_by { |f| f[:ref] }
+      lookup[name_ref]
+    end
+
+    def self.find_feature_id_by_ref(name_ref)
+      find_feature_by_ref(name_ref)&.dig(:id)
+    end
+
+    def self.feature_area(name_ref)
+      name_ref = name_ref.to_s if name_ref.is_a?(Symbol)
+      find_feature_by_ref(name_ref) || raise(ArgumentError, "Feature not found: #{name_ref}")
+      "ai-features/#{name_ref}"
+    end
+  end
+end
diff --git a/plugin.rb b/plugin.rb
@@ -70,6 +70,11 @@ def self.public_asset_path(name)
 Rails.autoloaders.main.push_dir(File.join(__dir__, "lib"), namespace: ::DiscourseAi)
 
 require_relative "lib/engine"
+require_relative "lib/features"
+
+DiscourseAi::Features.feature_config.each do |feature|
+  register_site_setting_area("ai-features/#{feature[:name_ref]}")
+end
 
 after_initialize do
   if defined?(Rack::MiniProfiler)
