merge main in

Author: markvanlan

.discourse-compatibility

@@ -1,3 +1,4 @@
+< 3.5.0.beta3-dev: 09a68414804a1447f52e5d60691ba59742cda9ec
 < 3.5.0.beta2-dev: de8624416a15b3d8e7ad350b083cc1420451ccec
 < 3.5.0.beta1-dev: bdef136080074a993e7c4f5ca562edc31a8ba756
 < 3.4.0.beta4-dev: a53719ab8eb071459f215227421b3ea4987e5f87

assets/javascripts/discourse/components/ai-persona-llm-selector.gjs

@@ -148,21 +148,24 @@ export default class AiPersonaLlmSelector extends Component {
     this.setAllowLLMSelector();
 
     if (this.hasLlmSelector) {
-      let llm = this.keyValueStore.getItem(LLM_SELECTOR_KEY);
+      let llmId = this.keyValueStore.getItem(LLM_SELECTOR_KEY);
+      if (llmId) {
+        llmId = parseInt(llmId, 10);
+      }
 
       const llmOption =
-        this.llmOptions.find((innerLlmOption) => innerLlmOption.id === llm) ||
+        this.llmOptions.find((innerLlmOption) => innerLlmOption.id === llmId) ||
         this.llmOptions[0];
 
       if (llmOption) {
-        llm = llmOption.id;
+        llmId = llmOption.id;
       } else {
-        llm = "";
+        llmId = "";
       }
 
-      if (llm) {
+      if (llmId) {
         next(() => {
-          this.currentLlm = llm;
+          this.currentLlm = llmId;
         });
       }
     }

assets/javascripts/discourse/components/post/ai-persona-flair.gjs

@@ -0,0 +1,14 @@
+import Component from "@glimmer/component";
+import { isGPTBot } from "../../lib/ai-bot-helper";
+
+export default class AiPersonaFlair extends Component {
+  static shouldRender(args) {
+    return isGPTBot(args.post.user);
+  }
+
+  <template>
+    <span class="persona-flair">
+      {{@outletArgs.post.topic.ai_persona_name}}
+    </span>
+  </template>
+}

assets/javascripts/discourse/lib/ai-bot-helper.js

@@ -1,11 +1,48 @@
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { getOwnerWithFallback } from "discourse/lib/get-owner";
 import Composer from "discourse/models/composer";
 import { i18n } from "discourse-i18n";
 import ShareFullTopicModal from "../components/modal/share-full-topic-modal";
 
 const MAX_PERSONA_USER_ID = -1200;
 
+let enabledChatBotMap = null;
+
+function ensureBotMap() {
+  if (!enabledChatBotMap) {
+    const currentUser = getOwnerWithFallback(this).lookup(
+      "service:current-user"
+    );
+    enabledChatBotMap = {};
+    currentUser.ai_enabled_chat_bots.forEach((bot) => {
+      enabledChatBotMap[bot.id] = bot;
+    });
+  }
+}
+
+export function isGPTBot(user) {
+  if (!user) {
+    return;
+  }
+
+  ensureBotMap();
+  return !!enabledChatBotMap[user.id];
+}
+
+export function getBotType(user) {
+  if (!user) {
+    return;
+  }
+
+  ensureBotMap();
+  const bot = enabledChatBotMap[user.id];
+  if (!bot) {
+    return;
+  }
+  return bot.is_persona ? "persona" : "llm";
+}
+
 export function isPostFromAiBot(post, currentUser) {
   return (
     post.user_id <= MAX_PERSONA_USER_ID ||

assets/javascripts/initializers/ai-bot-replies.js

@@ -1,20 +1,21 @@
 import { hbs } from "ember-cli-htmlbars";
+import { withSilencedDeprecations } from "discourse/lib/deprecated";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { registerWidgetShim } from "discourse/widgets/render-glimmer";
 import AiBotHeaderIcon from "../discourse/components/ai-bot-header-icon";
+import AiPersonaFlair from "../discourse/components/post/ai-persona-flair";
 import AiCancelStreamingButton from "../discourse/components/post-menu/ai-cancel-streaming-button";
 import AiDebugButton from "../discourse/components/post-menu/ai-debug-button";
 import AiShareButton from "../discourse/components/post-menu/ai-share-button";
-import { showShareConversationModal } from "../discourse/lib/ai-bot-helper";
+import {
+  getBotType,
+  isGPTBot,
+  showShareConversationModal,
+} from "../discourse/lib/ai-bot-helper";
 import { streamPostText } from "../discourse/lib/ai-streamer/progress-handlers";
 
-let enabledChatBotIds = [];
 let allowDebug = false;
 
-function isGPTBot(user) {
-  return user && enabledChatBotIds.includes(user.id);
-}
-
 function attachHeaderIcon(api) {
   api.headerIcons.add("ai", AiBotHeaderIcon);
 }
@@ -53,28 +54,34 @@ function initializeAIBotReplies(api) {
 }
 
 function initializePersonaDecorator(api) {
-  let topicController = null;
+  api.renderAfterWrapperOutlet("post-meta-data-poster-name", AiPersonaFlair);
+
+  withSilencedDeprecations("discourse.post-stream-widget-overrides", () =>
+    initializeWidgetPersonaDecorator(api)
+  );
+}
+
+function initializeWidgetPersonaDecorator(api) {
   api.decorateWidget(`poster-name:after`, (dec) => {
-    if (!isGPTBot(dec.attrs.user)) {
-      return;
+    const botType = getBotType(dec.attrs.user);
+    // we have 2 ways of decorating
+    // 1. if a bot is a LLM we decorate with persona name
+    // 2. if bot is a persona we decorate with LLM name
+    if (botType === "llm") {
+      return dec.widget.attach("persona-flair", {
+        personaName: dec.model?.topic?.ai_persona_name,
+      });
+    } else if (botType === "persona") {
+      return dec.widget.attach("persona-flair", {
+        personaName: dec.model?.llm_name,
+      });
     }
-    // this is hacky and will need to change
-    // trouble is we need to get the model for the topic
-    // and it is not available in the decorator
-    // long term this will not be a problem once we remove widgets and
-    // have a saner structure for our model
-    topicController =
-      topicController || api.container.lookup("controller:topic");
-
-    return dec.widget.attach("persona-flair", {
-      topicController,
-    });
   });
 
   registerWidgetShim(
     "persona-flair",
     "span.persona-flair",
-    hbs`{{@data.topicController.model.ai_persona_name}}`
+    hbs`{{@data.personaName}}`
   );
 }
 
@@ -159,16 +166,16 @@ export default {
     const user = container.lookup("service:current-user");
 
     if (user?.ai_enabled_chat_bots) {
-      enabledChatBotIds = user.ai_enabled_chat_bots.map((bot) => bot.id);
       allowDebug = user.can_debug_ai_bot_conversations;
-      withPluginApi("1.6.0", attachHeaderIcon);
-      withPluginApi("1.34.0", initializeAIBotReplies);
-      withPluginApi("1.6.0", initializePersonaDecorator);
-      withPluginApi("1.34.0", (api) => initializeDebugButton(api, container));
-      withPluginApi("1.34.0", (api) => initializeShareButton(api, container));
-      withPluginApi("1.22.0", (api) =>
-        initializeShareTopicButton(api, container)
-      );
+
+      withPluginApi((api) => {
+        attachHeaderIcon(api);
+        initializeAIBotReplies(api);
+        initializePersonaDecorator(api);
+        initializeDebugButton(api, container);
+        initializeShareButton(api, container);
+        initializeShareTopicButton(api, container);
+      });
     }
   },
 };

assets/stylesheets/modules/ai-bot/common/bot-replies.scss

@@ -78,7 +78,6 @@ article.streaming nav.post-controls .actions button.cancel-streaming {
 .topic-body .persona-flair {
   order: 2;
   font-size: var(--font-down-1);
-  padding-top: 3px;
 }
 
 details.ai-quote {

config/locales/server.en.yml

@@ -113,6 +113,7 @@ en:
     ai_discord_search_mode: "Select the search mode to use for Discord search"
     ai_discord_search_persona: "The persona to use for Discord search."
     ai_discord_allowed_guilds: "Discord guilds (servers) where the bot is allowed to search"
+    ai_enable_experimental_bot_ux: "Enable experimental bot UI that allows for a more dedicated experience"
 
   reviewables:
     reasons:

lib/ai_bot/entry_point.rb

@@ -4,6 +4,7 @@ module DiscourseAi
   module AiBot
     USER_AGENT = "Discourse AI Bot 1.0 (https://www.discourse.org)"
     TOPIC_AI_BOT_PM_FIELD = "is_ai_bot_pm"
+    POST_AI_LLM_NAME_FIELD = "ai_llm_name"
 
     class EntryPoint
       Bot = Struct.new(:id, :name, :llm)
@@ -65,6 +66,10 @@ def self.ai_share_error(topic, guardian)
       end
 
       def inject_into(plugin)
+        # Long term we need a better API here
+        # we only want to load this custom field for bots
+        TopicView.default_post_custom_fields << POST_AI_LLM_NAME_FIELD
+
         plugin.register_topic_custom_field_type(TOPIC_AI_BOT_PM_FIELD, :string)
 
         plugin.on(:topic_created) do |topic|
@@ -139,6 +144,14 @@ def inject_into(plugin)
           end,
         ) { true }
 
+        plugin.add_to_serializer(
+          :post,
+          :llm_name,
+          include_condition: -> do
+            object.topic.private_message? && object.custom_fields[POST_AI_LLM_NAME_FIELD]
+          end,
+        ) { object.custom_fields[POST_AI_LLM_NAME_FIELD] }
+
         plugin.add_to_serializer(
           :current_user,
           :ai_enabled_personas,

lib/ai_bot/playground.rb

@@ -458,6 +458,9 @@ def reply_to(
               skip_jobs: true,
               post_type: post_type,
               skip_guardian: true,
+              custom_fields: {
+                DiscourseAi::AiBot::POST_AI_LLM_NAME_FIELD => bot.llm.llm_model.name,
+              },
             )
 
           publish_update(reply_post, { raw: reply_post.cooked })

lib/inference/open_ai_image_generator.rb

@@ -4,6 +4,7 @@ module ::DiscourseAi
   module Inference
     class OpenAiImageGenerator
       TIMEOUT = 60
+      MAX_IMAGE_SIZE = 20_971_520 # 20MB (technically 25 is supported by API)
 
       def self.create_uploads!(
         prompts,