Merge from main

Author: keegangeorge

.discourse-compatibility

@@ -1,3 +1,4 @@
+< 3.5.0.beta2-dev: de8624416a15b3d8e7ad350b083cc1420451ccec
 < 3.5.0.beta1-dev: bdef136080074a993e7c4f5ca562edc31a8ba756
 < 3.4.0.beta4-dev: a53719ab8eb071459f215227421b3ea4987e5f87
 < 3.4.0.beta4-dev: 20612fde52d3f740cad64823ef8aadb0748b567f

assets/javascripts/discourse/admin/models/ai-persona.js

@@ -1,4 +1,3 @@
-import { tracked } from "@glimmer/tracking";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";
 
@@ -63,40 +62,7 @@ const SYSTEM_ATTRIBUTES = [
   "allow_chat_direct_messages",
 ];
 
-class ToolOption {
-  @tracked value = null;
-}
-
 export default class AiPersona extends RestModel {
-  // this code is here to convert the wire schema to easier to work with object
-  // on the wire we pass in/out tools as an Array.
-  // [[ToolName, {option1: value, option2: value}, force], ToolName2, ToolName3]
-  // So we rework this into a "tools" property and nested toolOptions
-  init(properties) {
-    this.forcedTools = [];
-    if (properties.tools) {
-      properties.tools = properties.tools.map((tool) => {
-        if (typeof tool === "string") {
-          return tool;
-        } else {
-          let [toolId, options, force] = tool;
-          for (let optionId in options) {
-            if (!options.hasOwnProperty(optionId)) {
-              continue;
-            }
-            this.getToolOption(toolId, optionId).value = options[optionId];
-          }
-          if (force) {
-            this.forcedTools.push(toolId);
-          }
-          return toolId;
-        }
-      });
-    }
-    super.init(properties);
-    this.tools = properties.tools;
-  }
-
   async createUser() {
     const result = await ajax(
       `/admin/plugins/discourse-ai/ai-personas/${this.id}/create-user.json`,
@@ -109,63 +75,79 @@ export default class AiPersona extends RestModel {
     return this.user;
   }
 
-  getToolOption(toolId, optionId) {
-    this.toolOptions ||= {};
-    this.toolOptions[toolId] ||= {};
-    return (this.toolOptions[toolId][optionId] ||= new ToolOption());
+  flattenedToolStructure(data) {
+    return data.tools.map((tName) => {
+      return [tName, data.toolOptions[tName], data.forcedTools.includes(tName)];
+    });
   }
 
-  populateToolOptions(attrs) {
-    if (!attrs.tools) {
-      return;
-    }
-    let toolsWithOptions = [];
-    attrs.tools.forEach((toolId) => {
-      if (typeof toolId !== "string") {
-        toolId = toolId[0];
-      }
+  // this code is here to convert the wire schema to easier to work with object
+  // on the wire we pass in/out tools as an Array.
+  // [[ToolName, {option1: value, option2: value}, force], ToolName2, ToolName3]
+  // We split it into tools, options and a list of forced ones.
+  populateTools(attrs) {
+    const forcedTools = [];
+    const toolOptions = {};
+
+    const flatTools = attrs.tools?.map((tool) => {
+      if (typeof tool === "string") {
+        return tool;
+      } else {
+        let [toolId, options, force] = tool;
+        const mappedOptions = {};
 
-      let force = this.forcedTools.includes(toolId);
-      if (this.toolOptions && this.toolOptions[toolId]) {
-        let options = this.toolOptions[toolId];
-        let optionsWithValues = {};
-        for (let optionId in options) {
+        for (const optionId in options) {
           if (!options.hasOwnProperty(optionId)) {
             continue;
           }
-          let option = options[optionId];
-          optionsWithValues[optionId] = option.value;
+
+          mappedOptions[optionId] = options[optionId];
         }
-        toolsWithOptions.push([toolId, optionsWithValues, force]);
-      } else {
-        toolsWithOptions.push([toolId, {}, force]);
+
+        if (Object.keys(mappedOptions).length > 0) {
+          toolOptions[toolId] = mappedOptions;
+        }
+
+        if (force) {
+          forcedTools.push(toolId);
+        }
+
+        return toolId;
       }
     });
-    attrs.tools = toolsWithOptions;
+
+    attrs.tools = flatTools;
+    attrs.forcedTools = forcedTools;
+    attrs.toolOptions = toolOptions;
   }
 
   updateProperties() {
-    let attrs = this.system
+    const attrs = this.system
       ? this.getProperties(SYSTEM_ATTRIBUTES)
       : this.getProperties(CREATE_ATTRIBUTES);
     attrs.id = this.id;
-    this.populateToolOptions(attrs);
+
     return attrs;
   }
 
   createProperties() {
-    let attrs = this.getProperties(CREATE_ATTRIBUTES);
-    this.populateToolOptions(attrs);
-    return attrs;
+    return this.getProperties(CREATE_ATTRIBUTES);
   }
 
-  workingCopy() {
-    let attrs = this.getProperties(CREATE_ATTRIBUTES);
-    this.populateToolOptions(attrs);
+  fromPOJO(data) {
+    const dataClone = JSON.parse(JSON.stringify(data));
+
+    const persona = AiPersona.create(dataClone);
+    persona.tools = this.flattenedToolStructure(dataClone);
 
-    const persona = AiPersona.create(attrs);
-    persona.forcedTools = (this.forcedTools || []).slice();
-    persona.forced_tool_count = this.forced_tool_count || -1;
     return persona;
   }
+
+  toPOJO() {
+    const attrs = this.getProperties(CREATE_ATTRIBUTES);
+    this.populateTools(attrs);
+    attrs.forced_tool_count = this.forced_tool_count || -1;
+
+    return attrs;
+  }
 }

assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs

@@ -216,10 +216,15 @@ export default class AdminReportSentimentAnalysis extends Component {
     }
 
     const currentQueryParams = this.router.currentRoute.queryParams;
+
+    const currentFilters = currentQueryParams?.filters
+      ? JSON.parse(currentQueryParams.filters)
+      : {};
+
     this.router.transitionTo(this.router.currentRoute.name, {
       queryParams: {
         ...currentQueryParams,
-        filters: JSON.parse(currentQueryParams.filters), // avoids a double escaping
+        filters: currentFilters, // avoids a double escaping
         selectedChart: data.title,
       },
     });
@@ -265,10 +270,13 @@ export default class AdminReportSentimentAnalysis extends Component {
     this.posts = [];
 
     const currentQueryParams = this.router.currentRoute.queryParams;
+    const currentFilters = currentQueryParams?.filters
+      ? JSON.parse(currentQueryParams.filters)
+      : {};
     this.router.transitionTo(this.router.currentRoute.name, {
       queryParams: {
         ...currentQueryParams,
-        filters: JSON.parse(currentQueryParams.filters), // avoids a double escaping
+        filters: currentFilters, // avoids a double escaping
         selectedChart: null,
       },
     });

assets/javascripts/discourse/components/ai-embedding-editor.gjs

@@ -288,6 +288,11 @@ export default class AiEmbeddingEditor extends Component {
     });
   }
 
+  @action
+  providerKeys(providerParams) {
+    return Object.keys(providerParams);
+  }
+
   <template>
     {{#if this.showPresets}}
       <BackButton
@@ -493,8 +498,8 @@ export default class AiEmbeddingEditor extends Component {
 
         {{! provider-specific content }}
         {{#if this.currentProvider}}
-          {{#if data.provider_params}}
-            <form.Object @name="provider_params" as |object name|>
+          <form.Object @name="provider_params" as |object providerData|>
+            {{#each (this.providerKeys providerData) as |name|}}
               {{#let (get this.providerParams name) as |params|}}
                 {{#if params}}
                   <object.Field
@@ -523,8 +528,8 @@ export default class AiEmbeddingEditor extends Component {
                   </object.Field>
                 {{/if}}
               {{/let}}
-            </form.Object>
-          {{/if}}
+            {{/each}}
+          </form.Object>
         {{/if}}
 
         <form.Actions class="ai-embedding-editor__action_panel">
@@ -550,33 +555,24 @@ export default class AiEmbeddingEditor extends Component {
         </form.Actions>
 
         {{#if this.displayTestResult}}
-          <form.Field
-            @showTitle={{false}}
-            @name="test_results"
-            @title="test_results"
-            @format="full"
-            class="ai-embedding-editor-tests"
-            as |field|
-          >
-            <field.Custom>
-              <ConditionalLoadingSpinner
-                @size="small"
-                @condition={{this.testRunning}}
-              >
-                {{#if this.testResult}}
-                  <div class="ai-embedding-editor-tests__success">
-                    {{icon "check"}}
-                    {{i18n "discourse_ai.embeddings.tests.success"}}
-                  </div>
-                {{else}}
-                  <div class="ai-embedding-editor-tests__failure">
-                    {{icon "xmark"}}
-                    {{this.testErrorMessage}}
-                  </div>
-                {{/if}}
-              </ConditionalLoadingSpinner>
-            </field.Custom>
-          </form.Field>
+          <form.Container @format="full" class="ai-embedding-editor-tests">
+            <ConditionalLoadingSpinner
+              @size="small"
+              @condition={{this.testRunning}}
+            >
+              {{#if this.testResult}}
+                <div class="ai-embedding-editor-tests__success">
+                  {{icon "check"}}
+                  {{i18n "discourse_ai.embeddings.tests.success"}}
+                </div>
+              {{else}}
+                <div class="ai-embedding-editor-tests__failure">
+                  {{icon "xmark"}}
+                  {{this.testErrorMessage}}
+                </div>
+              {{/if}}
+            </ConditionalLoadingSpinner>
+          </form.Container>
         {{/if}}
       </Form>
     {{/if}}

assets/javascripts/discourse/components/ai-forced-tool-strategy-selector.gjs

@@ -172,9 +172,6 @@ export default class AiFullPageSearch extends Component {
     this.AiResults = [];
     this.showingAiResults = false;
     this.args.addSearchResults([], "topic_id");
-    this.appEvents.trigger(AI_RESULTS_TOGGLED, {
-      enabled: false,
-    });
   }
 
   performHyDESearch() {