Fix lib directory

DEV: Update engine config to match skeleton
- adds `lib/` autoloading (and removes the plugin.rb workaround) - adds eager loading of scheduled jobs in development (otherwise they don't work at all)
2024-05-02 19:19:09 +01:00 · 2024-05-02 18:53:22 +01:00
1189 changed files with 2240578 additions and 104071 deletions
@@ -1,14 +1,7 @@
-< 3.5.0.beta7-dev: cd14b0c0bee0cf63c59b64b6f7213e31a37f11a7
+< 3.3.0.beta1-dev: a65c4076a63104b61d213534db7f89aa3c8acd9e
-< 3.5.0.beta6-dev: 3e74eea1e5e3143888d67a8d8a11206df214dc24
+< 3.2.0.beta5-dev: c70f43f130fb98e4a1adb1afd9b621aaa49088e3
-< 3.5.0.beta3-dev: 09a68414804a1447f52e5d60691ba59742cda9ec
+< 3.2.0.beta4-dev: 493b48477a9288f2f1b6f021954088705a6673d6
-< 3.5.0.beta2-dev: de8624416a15b3d8e7ad350b083cc1420451ccec
+< 3.2.0.beta2-dev: 3bced1c6f525553fe2b5b79d29bd66c1cf2a47d5
 < 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
 < 3.3.0.beta2-dev: 61890b667c06299841ae88946f84a112f00060e1
 < 3.3.0.beta1-dev: d94234d89f50733678a5c62809445198a9fda74b
 3.2.999: d94234d89f50733678a5c62809445198a9fda74b
 3.1.999: c0415bb7eb878b1b7abf112d65cba981030df8df
 < 3.2.0.beta1-dev: 3e7c99de894b03e9161d9481da118fe893991a1d
 3.1.0.beta3: 057fbe1ce6
@@ -0,0 +1 @@
 module.exports = require("@discourse/lint-configs/eslint");
@@ -1,9 +1,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
 public/ai-share/highlight.min.js
@@ -1,2 +0,0 @@
 engine-strict = true
 auto-install-peers = false
@@ -2,6 +2,3 @@ inherit_gem:
  rubocop-discourse: stree-compat.yml
 RSpec/NamedSubject:
  Enabled: false
 Style/GlobalVars:
  AllowedVariables: [$prometheus_client]
@@ -1,93 +1,70 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (8.0.2)
+    activesupport (7.1.3.2)
      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)
    base64 (0.2.0)
-    benchmark (0.4.0)
+    bigdecimal (3.1.6)
-    bigdecimal (3.1.9)
+    concurrent-ruby (1.2.3)
-    concurrent-ruby (1.3.5)
+    connection_pool (2.4.1)
    connection_pool (2.5.0)
    drb (2.2.1)
-    i18n (1.14.7)
+    i18n (1.14.1)
      concurrent-ruby (~> 1.0)
-    json (2.10.2)
+    json (2.7.1)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.3)
-    lint_roller (1.1.0)
+    minitest (5.22.2)
-    logger (1.6.6)
+    mutex_m (0.2.0)
-    minitest (5.25.5)
+    parallel (1.24.0)
-    parallel (1.26.3)
+    parser (3.3.0.5)
    parser (3.3.7.1)
      ast (~> 2.4.1)
      racc
    prettier_print (1.2.1)
-    racc (1.8.1)
+    racc (1.7.3)
    rack (3.1.16)
    rainbow (3.1.1)
-    regexp_parser (2.10.0)
+    regexp_parser (2.9.0)
-    rubocop (1.74.0)
+    rexml (3.2.6)
    rubocop (1.61.0)
      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.38.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
      rubocop-ast (>= 1.30.0, < 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.38.1)
+    rubocop-ast (1.31.1)
-      parser (>= 3.3.1.0)
+      parser (>= 3.3.0.4)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (2.20.0)
-      lint_roller (~> 1.1)
+      rubocop (~> 1.41)
-      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-discourse (3.7.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-rspec (>= 2.25.0)
-      rubocop-rails (>= 2.30.3)
+    rubocop-factory_bot (2.25.1)
-      rubocop-rspec (>= 3.0.1)
+      rubocop (~> 1.41)
-      rubocop-rspec_rails (>= 2.31.0)
+    rubocop-rspec (2.27.1)
-    rubocop-factory_bot (2.27.1)
+      rubocop (~> 1.40)
-      lint_roller (~> 1.1)
+      rubocop-capybara (~> 2.17)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-factory_bot (~> 2.22)
    rubocop-rails (2.30.3)
      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)
    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
@@ -97,4 +74,4 @@ DEPENDENCIES
  syntax_tree
 BUNDLED WITH
-   2.6.6
+   2.5.4
@@ -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
@@ -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
@@ -1,8 +0,0 @@
 {
  "tests": {
    "requiredPlugins": [
      "https://github.com/discourse/discourse-prometheus",
      "https://github.com/discourse/discourse-solved.git"
    ]
  }
 }
@@ -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")
    );
  }
 }
@@ -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")
    );
  }
 }
@@ -1,7 +0,0 @@
 import DiscourseRoute from "discourse/routes/discourse";
 export default class DiscourseAiAiEmbeddingsRoute extends DiscourseRoute {
  model() {
    return this.store.findAll("ai-embedding");
  }
 }
@@ -1,35 +0,0 @@
 import { action } from "@ember/object";
 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;
  }
  @action
  willTransition() {
    // site settings may amend if a feature is enabled or disabled, so refresh the model
    // even on back button
    this.router.refresh("adminPlugins.show.discourse-ai-features");
  }
 }
@@ -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");
  }
 }
@@ -1,28 +0,0 @@
 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 record = allLlms.findBy("id", id);
    record.provider_params = record.provider_params || {};
    return record;
  }
  setupController(controller, model) {
    super.setupController(controller, model);
    controller.set(
      "allLlms",
      this.modelFor("adminPlugins.show.discourse-ai-llms")
    );
  }
 }
@@ -1,25 +0,0 @@
 import DiscourseRoute from "discourse/routes/discourse";
 export default class AdminPluginsShowDiscourseAiLlmsNew extends DiscourseRoute {
  queryParams = {
    llmTemplate: { refreshModel: true },
  };
  async model() {
    const record = this.store.createRecord("ai-llm");
    record.provider_params = {};
    return record;
  }
  setupController(controller, model) {
    super.setupController(controller, model);
    controller.set(
      "allLlms",
      this.modelFor("adminPlugins.show.discourse-ai-llms")
    );
    controller.set(
      "llmTemplate",
      this.paramsFor(this.routeName).llmTemplate || null
    );
  }
 }
@@ -1,7 +0,0 @@
 import DiscourseRoute from "discourse/routes/discourse";
 export default class DiscourseAiAiLlmsRoute extends DiscourseRoute {
  model() {
    return this.store.findAll("ai-llm");
  }
 }
@@ -1,7 +1,7 @@
 import { AUTO_GROUPS } from "discourse/lib/constants";
 import DiscourseRoute from "discourse/routes/discourse";
-export default class AdminPluginsShowDiscourseAiPersonasNew extends DiscourseRoute {
+export default DiscourseRoute.extend({
  async model() {
    const record = this.store.createRecord("ai-persona");
    record.set("allowed_group_ids", [AUTO_GROUPS.trust_level_0.id]);
@@ -10,16 +10,14 @@ export default class AdminPluginsShowDiscourseAiPersonasNew extends DiscourseRou
    record.set("rag_chunk_tokens", 374);
    record.set("rag_chunk_overlap_tokens", 10);
    record.set("rag_conversation_chunks", 10);
    record.set("allow_personal_messages", true);
    record.set("tool_details", false);
    return record;
-  }
+  },
  setupController(controller, model) {
-    super.setupController(controller, model);
+    this._super(controller, model);
    controller.set(
      "allPersonas",
      this.modelFor("adminPlugins.show.discourse-ai-personas")
    );
-  }
+  },
-}
+});
@@ -1,19 +1,19 @@
 import DiscourseRoute from "discourse/routes/discourse";
-export default class AdminPluginsShowDiscourseAiPersonasEdit extends DiscourseRoute {
+export default DiscourseRoute.extend({
  async model(params) {
    const allPersonas = this.modelFor(
      "adminPlugins.show.discourse-ai-personas"
    );
    const id = parseInt(params.id, 10);
    return allPersonas.findBy("id", id);
-  }
+  },
  setupController(controller, model) {
-    super.setupController(controller, model);
+    this._super(controller, model);
    controller.set(
      "allPersonas",
      this.modelFor("adminPlugins.show.discourse-ai-personas")
    );
-  }
+  },
-}
+});
@@ -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");
  }
 }
@@ -1,20 +0,0 @@
 import DiscourseRoute from "discourse/routes/discourse";
 export default class DiscourseAiToolsEditRoute extends DiscourseRoute {
  async model(params) {
    const allTools = this.modelFor("adminPlugins.show.discourse-ai-tools");
    const id = parseInt(params.id, 10);
    return allTools.find((tool) => tool.id === id);
  }
  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);
  }
 }
@@ -1,21 +0,0 @@
 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");
  }
  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);
  }
 }
@@ -1,10 +0,0 @@
 import { service } from "@ember/service";
 import DiscourseRoute from "discourse/routes/discourse";
 export default class DiscourseAiToolsRoute extends DiscourseRoute {
  @service store;
  model() {
    return this.store.findAll("ai-tool");
  }
 }
@@ -1,11 +0,0 @@
 import { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 export default class DiscourseAiUsageRoute extends DiscourseRoute {
  @service store;
  model() {
    return ajax("/admin/plugins/discourse-ai/ai-usage.json");
  }
 }
@@ -1,4 +0,0 @@
 <AiEmbeddingsListEditor
  @embeddings={{this.allEmbeddings}}
  @currentEmbedding={{this.model}}
 />
@@ -1 +0,0 @@
 <AiEmbeddingsListEditor @embeddings={{this.model}} />
@@ -1,4 +0,0 @@
 <AiEmbeddingsListEditor
  @embeddings={{this.allEmbeddings}}
  @currentEmbedding={{this.model}}
 />
@@ -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>
 );
@@ -1 +0,0 @@
 <AiFeatures @features={{this.model}} />
@@ -1 +0,0 @@
 <AiLlmsListEditor @llms={{this.allLlms}} @currentLlm={{this.model}} />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Taylor	aee2081356	Fix lib directory	2024-05-02 19:19:09 +01:00
David Taylor	e6bfec5bdb	DEV: Update engine config to match skeleton - adds `lib/` autoloading (and removes the plugin.rb workaround) - adds eager loading of scheduled jobs in development (otherwise they don't work at all)	2024-05-02 18:53:22 +01:00
		`@@ -0,0 +1 @@`
							`module.exports = require("@discourse/lint-configs/eslint");`
		`@@ -1,2 +0,0 @@`
			`engine-strict = true`
			`auto-install-peers = false`
		`@@ -1 +0,0 @@`
			`<AiEmbeddingsListEditor @embeddings={{this.model}} />`
		`@@ -1 +0,0 @@`
			`<AiLlmsListEditor @llms={{this.allLlms}} @currentLlm={{this.model}} />`