Merge branch 'main' into feat-tool-name-validation

Author: nvh0412

.discourse-compatibility

@@ -1,3 +1,5 @@
+< 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

.eslintrc.cjs

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

.rubocop.yml

@@ -32,8 +32,7 @@ GEM
     rack (3.1.6)
     rainbow (3.1.1)
     regexp_parser (2.9.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -70,7 +69,6 @@ GEM
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    strscan (3.1.0)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     tzinfo (2.0.6)

Gemfile.lock

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

about.json

@@ -0,0 +1,21 @@
+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-edit.js

@@ -0,0 +1,17 @@
+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-new.js

@@ -0,0 +1,7 @@
+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-embeddings.js

@@ -1,19 +1,19 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
+export default class AdminPluginsShowDiscourseAiLlmsEdit extends DiscourseRoute {
   async model(params) {
     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;
-  },
+  }
 
   setupController(controller, model) {
-    this._super(controller, model);
+    super.setupController(controller, model);
     controller.set(
       "allLlms",
       this.modelFor("adminPlugins.show.discourse-ai-llms")
     );
-  },
-});
+  }
+}

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

@@ -1,18 +1,18 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
-export default DiscourseRoute.extend({
-  queryParams: {
+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) {
-    this._super(controller, model);
+    super.setupController(controller, model);
     controller.set(
       "allLlms",
       this.modelFor("adminPlugins.show.discourse-ai-llms")
@@ -21,5 +21,5 @@ export default DiscourseRoute.extend({
       "llmTemplate",
       this.paramsFor(this.routeName).llmTemplate || null
     );
-  },
-});
+  }
+}