bad merge, mark

Author: markvanlan

assets/javascripts/discourse/controllers/discourse-ai-bot-conversations.js

@@ -1,7 +1,6 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
-import SimpleTextareaInteractor from "../lib/simple-textarea-interactor";
 
 export default class DiscourseAiBotConversations extends Controller {
   @service aiBotConversationsHiddenSubmit;
@@ -23,7 +22,12 @@ export default class DiscourseAiBotConversations extends Controller {
   }
 
   @action
-  initializeTextarea(element) {
-    this.textareaInteractor = new SimpleTextareaInteractor(element);
+  setTextArea(element) {
+    this.textarea = element;
+  }
+
+  _autoExpandTextarea() {
+    this.textarea.style.height = "auto";
+    this.textarea.style.height = this.textarea.scrollHeight + "px";
   }
 }

assets/javascripts/discourse/lib/simple-textarea-interactor.js

@@ -25,19 +25,27 @@ export default class AiBotConversationsHiddenSubmit extends Service {
     this.composer.close();
 
     if (this.inputValue.length < 10) {
-      // TODO: Translate
-      this.dialog.alert({
-        message: "Message must be longer than 10 characters",
+      return this.dialog.alert({
+        message: i18n(
+          "discourse_ai.ai_bot.conversations.min_input_length_message"
+        ),
         didConfirm: () => this.focusInput(),
         didCancel: () => this.focusInput(),
       });
     }
 
+    // borrowed from ai-bot-helper.js
+    const draftKey = "new_private_message_ai_" + new Date().getTime();
+
+    const personaWithUsername = this.currentUser.ai_enabled_personas.find(
+      (persona) => persona.username
+    );
+
     // this is a total hack, the composer is hidden on the homepage with CSS
     await this.composer.open({
       action: Composer.PRIVATE_MESSAGE,
-      draftKey: "private_message_ai",
-      recipients: this.currentUser.ai_enabled_personas[0].username,
+      draftKey,
+      recipients: personaWithUsername.username,
       topicTitle: i18n("discourse_ai.ai_bot.default_pm_prefix"),
       topicBody: this.inputValue,
       archetypeId: "private_message",

assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.js

@@ -4,7 +4,7 @@
   <h1>{{i18n "discourse_ai.ai_bot.conversations.header"}}</h1>
   <div class="custom-homepage__input-wrapper">
     <textarea
-      {{didInsert this.initializeTextarea}}
+      {{didInsert this.setTextArea}}
       {{on "input" this.updateInputValue}}
       {{on "keydown" this.handleKeyDown}}
       id="custom-homepage-input"
@@ -16,7 +16,7 @@
       @action={{this.aiBotConversationsHiddenSubmit.submitToBot}}
       @icon="paper-plane"
       @title="discourse_ai.ai_bot.conversations.header"
-      class="ai-bot-button btn-primary"
+      class="ai-bot-button btn-primary ai-conversation-submit"
     />
   </div>
   <p class="ai-disclaimer">

assets/javascripts/discourse/templates/discourse-ai-bot-conversations.hbs

@@ -711,6 +711,7 @@ en:
           disclaimer: "Generative AI can make mistakes"
           placeholder: "Ask a question..."
           new: "New Question"
+          min_input_length_message: "Message must be longer than 10 characters"
       sentiments:
         dashboard:
           title: "Sentiment"

config/locales/client.en.yml

@@ -6,40 +6,85 @@
   let(:ai_pm_homepage) { PageObjects::Components::AiPmHomepage.new }
   let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
   let(:header_dropdown) { PageObjects::Components::NavigationMenu::HeaderDropdown.new }
+  let(:dialog) { PageObjects::Components::Dialog.new }
 
-  fab!(:user)
-  fab!(:group)
+  fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
 
+  fab!(:claude_2) do
+    Fabricate(
+      :llm_model,
+      provider: "anthropic",
+      url: "https://api.anthropic.com/v1/messages",
+      name: "claude-2",
+    )
+  end
   fab!(:bot_user) do
-    user = Fabricate(:user)
-    AiPersona.last.update!(user_id: user.id)
-    user
+    toggle_enabled_bots(bots: [claude_2])
+    SiteSetting.ai_bot_enabled = true
+    claude_2.reload.user
+  end
+  fab!(:bot) do
+    persona =
+      AiPersona
+        .find(DiscourseAi::Personas::Persona.system_personas[DiscourseAi::Personas::General])
+        .class_instance
+        .new
+    DiscourseAi::Personas::Bot.as(bot_user, persona: persona)
   end
-  fab!(:llm_model) { Fabricate(:llm_model, enabled_chat_bot: true) }
 
-  fab!(:pm) { Fabricate(:private_message_topic, title: "AI Conversation Test", user: user) }
-  fab!(:reply) do
-    Fabricate(:post, topic: pm, user: user, post_number: 1, raw: "test test test user reply")
+  fab!(:pm) do
+    Fabricate(
+      :private_message_topic,
+      title: "This is my special PM",
+      user: user,
+      topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: user),
+        Fabricate.build(:topic_allowed_user, user: bot_user),
+      ],
+    )
+  end
+  fab!(:first_post) do
+    Fabricate(:post, topic: pm, user: user, post_number: 1, raw: "This is a reply by the user")
   end
-  fab!(:bot_reply) do
-    Fabricate(:post, topic: pm, user: bot_user, post_number: 2, raw: "test test test bot reply")
+  fab!(:second_post) do
+    Fabricate(:post, topic: pm, user: bot_user, post_number: 2, raw: "This is a bot reply")
+  end
+  fab!(:third_post) do
+    Fabricate(
+      :post,
+      topic: pm,
+      user: user,
+      post_number: 3,
+      raw: "This is a second reply by the user",
+    )
   end
   fab!(:topic_user) { Fabricate(:topic_user, topic: pm, user: user) }
   fab!(:topic_bot_user) { Fabricate(:topic_user, topic: pm, user: bot_user) }
 
+  fab!(:persona) do
+    persona =
+      AiPersona.create!(
+        name: "Test Persona",
+        description: "A test persona",
+        allowed_group_ids: [Group::AUTO_GROUPS[:trust_level_0]],
+        enabled: true,
+        system_prompt: "You are a helpful bot",
+      )
+
+    persona.create_user!
+    persona.update!(
+      default_llm_id: claude_2.id,
+      allow_chat_channel_mentions: true,
+      allow_topic_mentions: true,
+    )
+    persona
+  end
+
   before do
     SiteSetting.ai_enable_experimental_bot_ux = true
     SiteSetting.ai_bot_enabled = true
-    toggle_enabled_bots(bots: [llm_model])
-    SiteSetting.ai_bot_allowed_groups = group.id.to_s
-    sign_in(user)
-
-    group.add(user)
-    group.save
-
-    allowed_persona = AiPersona.last
-    allowed_persona.update!(allowed_group_ids: [group.id], enabled: true)
-
+    Jobs.run_immediately!
+    SiteSetting.ai_bot_allowed_groups = "#{Group::AUTO_GROUPS[:trust_level_0]}"
     sign_in(user)
   end
 
@@ -60,6 +105,17 @@
       expect(sidebar).to be_visible
     end
 
+    it "displays error when message is too short" do
+      visit "/"
+      find(".ai-bot-button").click
+
+      ai_pm_homepage.input.fill_in(with: "a")
+      ai_pm_homepage.submit
+      expect(ai_pm_homepage).to have_too_short_dialog
+      dialog.click_yes
+      expect(composer).to be_closed
+    end
+
     it "renders sidebar even when navigation menu is set to header" do
       SiteSetting.navigation_menu = "header dropdown"
       visit "/"
@@ -88,7 +144,42 @@
 
       expect(ai_pm_homepage).to have_homepage
       expect(sidebar).to have_section("custom-messages")
-      expect(sidebar).to have_section_link(pm.title, href: pm.relative_url)
+      expect(sidebar).to have_section_link(pm.title)
+      expect(sidebar).to have_no_css("button.ai-new-question-button")
+    end
+
+    it "navigates to the bot conversation when clicked" do
+      visit "/"
+      find(".ai-bot-button").click
+
+      expect(ai_pm_homepage).to have_homepage
+      sidebar.find(
+        ".sidebar-section[data-section-name='custom-messages'] a.sidebar-section-link",
+      ).click
+      expect(topic_page).to have_topic_title(pm.title)
+    end
+
+    it "displays sidebar and 'new question' on the topic page" do
+      topic_page.visit_topic(pm)
+      expect(sidebar).to be_visible
+      expect(sidebar).to have_css("button.ai-new-question-button")
+    end
+
+    it "redirect to the homepage when 'new question' is clicked" do
+      topic_page.visit_topic(pm)
+      expect(sidebar).to be_visible
+      sidebar.find("button.ai-new-question-button").click
+      expect(ai_pm_homepage).to have_homepage
+    end
+
+    it "can send a new message to the bot" do
+      topic_page.visit_topic(pm)
+      topic_page.click_reply_button
+      expect(composer).to be_opened
+
+      composer.fill_in(with: "Hello bot replying to you")
+      composer.submit
+      expect(page).to have_content("Hello bot replying to you")
     end
   end
 end

spec/system/ai_bot/personal_message_spec.rb

@@ -6,6 +6,18 @@ class AiPmHomepage < PageObjects::Components::Base
       HOMEPAGE_BODY_CLASS = ".discourse-ai-bot-conversations-page"
       HOMEPAGE_WRAPPER_CLASS = ".custom-homepage__content-wrapper"
 
+      def input
+        page.find("#custom-homepage-input")
+      end
+
+      def submit
+        page.find(".ai-conversation-submit").click
+      end
+
+      def has_too_short_dialog?
+        page.find(".dialog-content", text: "Message must be longer than 10 characters")
+      end
+
       def has_homepage?
         page.has_css?("#{HOMEPAGE_BODY_CLASS} #{HOMEPAGE_WRAPPER_CLASS}")
       end