DEV: Update modifyClass calls

- Update `controller:topic` modification to native class syntax
- Remove search-result-entry modification in favour of plugin-outlet-based solution

.discourse-compatibility

@@ -1,10 +1,3 @@
-< 3.5.0.beta7-dev: cd14b0c0bee0cf63c59b64b6f7213e31a37f11a7
-< 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
 < 3.4.0.beta3-dev: decf1bb49d737ea15308400f22f89d1d1e71d13d
 < 3.4.0.beta1-dev: 9d887ad4ace8e33c3fe7dbb39237e882c08b4f0b
 < 3.3.0.beta5-dev: 4d8090002f6dcd8e34d41033606bf131fa221475

.gitignore

@@ -2,9 +2,3 @@ node_modules
 /gems
 /auto_generated
 .env
-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

.rubocop.yml

@@ -2,6 +2,3 @@ inherit_gem:
   rubocop-discourse: stree-compat.yml
 RSpec/NamedSubject:
   Enabled: false
-
-Style/GlobalVars:
-  AllowedVariables: [$prometheus_client]

Gemfile.lock

@@ -1,95 +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)
+      mutex_m
-      tzinfo (~> 2.0, >= 2.0.5)
+      tzinfo (~> 2.0)
-      uri (>= 0.13.1)
+    ast (2.4.2)
-    ast (2.4.3)
+    base64 (0.2.0)
-    base64 (0.3.0)
+    bigdecimal (3.1.8)
-    benchmark (0.4.1)
+    concurrent-ruby (1.3.3)
-    bigdecimal (3.2.2)
+    connection_pool (2.4.1)
-    concurrent-ruby (1.3.5)
+    drb (2.2.1)
-    connection_pool (2.5.3)
+    i18n (1.14.5)
-    drb (2.2.3)
-    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
+    json (2.7.2)
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.3)
-    lint_roller (1.1.0)
+    minitest (5.24.1)
-    logger (1.7.0)
+    mutex_m (0.2.0)
-    minitest (5.25.5)
+    parallel (1.25.1)
-    parallel (1.27.0)
+    parser (3.3.3.0)
-    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    prism (1.4.0)
+    racc (1.8.0)
-    racc (1.8.1)
+    rack (3.1.6)
-    rack (3.1.16)
     rainbow (3.1.1)
-    regexp_parser (2.10.0)
+    regexp_parser (2.9.2)
-    rubocop (1.77.0)
+    rexml (3.3.9)
+    rubocop (1.64.1)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
+      language_server-protocol (>= 3.17.0)
-      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
+      regexp_parser (>= 1.8, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.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)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.31.3)
-      parser (>= 3.3.7.2)
+      parser (>= 3.3.1.0)
-      prism (~> 1.4)
+    rubocop-capybara (2.21.0)
-    rubocop-capybara (2.22.1)
+      rubocop (~> 1.41)
-      lint_roller (~> 1.1)
+    rubocop-discourse (3.8.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-discourse (3.12.1)
       activesupport (>= 6.1)
-      lint_roller (>= 1.1.0)
+      rubocop (>= 1.59.0)
-      rubocop (>= 1.73.2)
+      rubocop-capybara (>= 2.0.0)
-      rubocop-capybara (>= 2.22.0)
+      rubocop-factory_bot (>= 2.0.0)
-      rubocop-factory_bot (>= 2.27.0)
+      rubocop-rails (>= 2.25.0)
-      rubocop-rails (>= 2.30.3)
       rubocop-rspec (>= 3.0.1)
-      rubocop-rspec_rails (>= 2.31.0)
+      rubocop-rspec_rails (>= 2.30.0)
-    rubocop-factory_bot (2.27.1)
+    rubocop-factory_bot (2.26.1)
-      lint_roller (~> 1.1)
+      rubocop (~> 1.61)
-      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.25.1)
-    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.6.0)
+    rubocop-rspec (3.0.2)
-      lint_roller (~> 1.1)
+      rubocop (~> 1.61)
-      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.30.0)
-    rubocop-rspec_rails (2.31.0)
+      rubocop (~> 1.61)
-      lint_roller (~> 1.1)
+      rubocop-rspec (~> 3, >= 3.0.1)
-      rubocop (~> 1.72, >= 1.72.1)
-      rubocop-rspec (~> 3.5)
     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-display_width (2.5.0)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
 
 PLATFORMS
   ruby
@@ -99,4 +83,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.6.6
+   2.5.10

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Civilized Discourse Construction Kit, Inc.
+Copyright (c) 2021 Civilized Discourse Construction Kit
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,27 +3,3 @@
 **Plugin Summary**
 
 For more information, please see: https://meta.discourse.org/t/discourse-ai/259214?u=falco
-
-### Evals
-
-The directory `evals` contains AI evals for the Discourse AI plugin. 
-You may create a local config by copying `config/eval-llms.yml` to `config/eval-llms.local.yml` and modifying the values.
-
-To run them use: 
-
-cd evals
-./run --help
-
-```
-Usage: evals/run [options]
-    -e, --eval NAME                  Name of the evaluation to run
-        --list-models                List models
-    -m, --model NAME                 Model to evaluate (will eval all models if not specified)
-    -l, --list                       List evals
-```
-
-To run evals you will need to configure API keys in your environment:
-
-OPENAI_API_KEY=your_openai_api_key
-ANTHROPIC_API_KEY=your_anthropic_api_key
-GEMINI_API_KEY=your_gemini_api_key

about.json

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

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

@@ -1,21 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class AdminPluginsShowDiscourseAiEmbeddingsEdit extends DiscourseRoute {
-  async model(params) {
-    const allEmbeddings = this.modelFor(
-      "adminPlugins.show.discourse-ai-embeddings"
-    );
-    const id = parseInt(params.id, 10);
-    const record = allEmbeddings.findBy("id", id);
-    record.provider_params = record.provider_params || {};
-    return record;
-  }
-
-  setupController(controller, model) {
-    super.setupController(controller, model);
-    controller.set(
-      "allEmbeddings",
-      this.modelFor("adminPlugins.show.discourse-ai-embeddings")
-    );
-  }
-}

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

@@ -1,17 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class AdminPluginsShowDiscourseAiEmbeddingsNew extends DiscourseRoute {
-  async model() {
-    const record = this.store.createRecord("ai-embedding");
-    record.provider_params = {};
-    return record;
-  }
-
-  setupController(controller, model) {
-    super.setupController(controller, model);
-    controller.set(
-      "allEmbeddings",
-      this.modelFor("adminPlugins.show.discourse-ai-embeddings")
-    );
-  }
-}

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

@@ -1,7 +0,0 @@
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class DiscourseAiAiEmbeddingsRoute extends DiscourseRoute {
-  model() {
-    return this.store.findAll("ai-embedding");
-  }
-}

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-show.js

@@ -1,18 +1,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default class AdminPluginsShowDiscourseAiLlmsEdit extends DiscourseRoute {
+export default class AdminPluginsShowDiscourseAiLlmsShow 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-personas-show.js

@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default class AdminPluginsShowDiscourseAiPersonasEdit extends DiscourseRoute {
+export default class AdminPluginsShowDiscourseAiPersonasShow extends DiscourseRoute {
   async model(params) {
     const allPersonas = this.modelFor(
       "adminPlugins.show.discourse-ai-personas"

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

@@ -1,11 +0,0 @@
-import { service } from "@ember/service";
-import { ajax } from "discourse/lib/ajax";
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class DiscourseAiSpamRoute extends DiscourseRoute {
-  @service store;
-
-  model() {
-    return ajax("/admin/plugins/discourse-ai/ai-spam.json");
-  }
-}

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,8 @@ 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/routes/admin-plugins-show-discourse-ai-tools-show.js

@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default class DiscourseAiToolsEditRoute extends DiscourseRoute {
+export default class DiscourseAiToolsShowRoute extends DiscourseRoute {
   async model(params) {
     const allTools = this.modelFor("adminPlugins.show.discourse-ai-tools");
     const id = parseInt(params.id, 10);
@@ -14,7 +14,5 @@ export default class DiscourseAiToolsEditRoute extends DiscourseRoute {
 
     controller.set("allTools", toolsModel);
     controller.set("presets", toolsModel.resultSetMeta.presets);
-    controller.set("llms", toolsModel.resultSetMeta.llms);
-    controller.set("settings", toolsModel.resultSetMeta.settings);
   }
 }

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

@@ -1,11 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiEmbeddingsListEditor from "../../../../../discourse/components/ai-embeddings-list-editor";
-
-export default RouteTemplate(
-  <template>
-    <AiEmbeddingsListEditor
-      @embeddings={{@controller.allEmbeddings}}
-      @currentEmbedding={{@controller.model}}
-    />
-  </template>
-);

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/index.gjs

@@ -1,8 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiEmbeddingsListEditor from "../../../../../discourse/components/ai-embeddings-list-editor";
-
-export default RouteTemplate(
-  <template>
-    <AiEmbeddingsListEditor @embeddings={{@controller.model}} />
-  </template>
-);

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-embeddings/new.gjs

@@ -1,11 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiEmbeddingsListEditor from "../../../../../discourse/components/ai-embeddings-list-editor";
-
-export default RouteTemplate(
-  <template>
-    <AiEmbeddingsListEditor
-      @embeddings={{@controller.allEmbeddings}}
-      @currentEmbedding={{@controller.model}}
-    />
-  </template>
-);

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.gjs

@@ -1,6 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiFeatures from "../../../../../discourse/components/ai-features";
-
-export default RouteTemplate(
-  <template><AiFeatures @features={{@controller.model}} /></template>
-);

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

@@ -1,11 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiLlmsListEditor from "../../../../../discourse/components/ai-llms-list-editor";
-
-export default RouteTemplate(
-  <template>
-    <AiLlmsListEditor
-      @llms={{@controller.allLlms}}
-      @currentLlm={{@controller.model}}
-    />
-  </template>
-);

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/index.gjs

@@ -1,6 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiLlmsListEditor from "../../../../../discourse/components/ai-llms-list-editor";
-
-export default RouteTemplate(
-  <template><AiLlmsListEditor @llms={{@controller.model}} /></template>
-);

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

@@ -0,0 +1 @@
+<AiLlmsListEditor @llms={{this.model}} />

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-llms/new.gjs

@@ -1,12 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiLlmsListEditor from "../../../../../discourse/components/ai-llms-list-editor";
-
-export default RouteTemplate(
-  <template>
-    <AiLlmsListEditor
-      @llms={{@controller.allLlms}}
-      @currentLlm={{@controller.model}}
-      @llmTemplate={{@controller.llmTemplate}}
-    />
-  </template>
-);

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

@@ -0,0 +1,5 @@
+<AiLlmsListEditor
+  @llms={{this.allLlms}}
+  @currentLlm={{this.model}}
+  @llmTemplate={{this.llmTemplate}}
+/>

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

@@ -0,0 +1 @@
+<AiLlmsListEditor @llms={{this.allLlms}} @currentLlm={{this.model}} />

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

@@ -1,11 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiPersonaListEditor from "../../../../../discourse/components/ai-persona-list-editor";
-
-export default RouteTemplate(
-  <template>
-    <AiPersonaListEditor
-      @personas={{@controller.allPersonas}}
-      @currentPersona={{@controller.model}}
-    />
-  </template>
-);

admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-personas/index.gjs

@@ -1,6 +0,0 @@
-import RouteTemplate from "ember-route-template";
-import AiPersonaListEditor from "../../../../../discourse/components/ai-persona-list-editor";
-
-export default RouteTemplate(
-  <template><AiPersonaListEditor @personas={{@controller.model}} /></template>
-);