diff --git a/assets/javascripts/discourse/lib/ai-streamer.js b/assets/javascripts/discourse/lib/ai-streamer.js index 494788c5..d6d06af6 100644 --- a/assets/javascripts/discourse/lib/ai-streamer.js +++ b/assets/javascripts/discourse/lib/ai-streamer.js @@ -134,63 +134,6 @@ class PostUpdater extends StreamUpdater { } } -export class SummaryUpdater extends StreamUpdater { - constructor(topicSummary, componentContext) { - super(); - this.topicSummary = topicSummary; - this.componentContext = componentContext; - - if (this.topicSummary) { - this.summaryBox = document.querySelector("article.ai-summary-box"); - } - } - - get element() { - return this.summaryBox; - } - - set streaming(value) { - if (this.element) { - if (value) { - this.element.classList.add("streaming"); - } else { - this.element.classList.remove("streaming"); - } - } - } - - async setRaw(value, done) { - this.componentContext.oldRaw = value; - const cooked = await cook(value); - - // resets animation - this.element.classList.remove("streaming"); - void this.element.offsetWidth; - this.element.classList.add("streaming"); - - const cookedElement = document.createElement("div"); - cookedElement.innerHTML = cooked; - - if (!done) { - addProgressDot(cookedElement); - } - await this.setCooked(cookedElement.innerHTML); - - if (done) { - this.componentContext.finalSummary = cooked; - } - } - - async setCooked(value) { - const cookedContainer = this.element.querySelector(".generated-summary"); - cookedContainer.innerHTML = value; - } - - get raw() { - return this.componentContext.oldRaw || ""; - } -} - export async function applyProgress(status, updater) { status.startTime = status.startTime || Date.now(); @@ -205,6 +148,7 @@ export async function applyProgress(status, updater) { } const oldRaw = updater.raw; + if (status.raw === oldRaw && !status.done) { const hasProgressDot = updater.element.querySelector(".progress-dot"); if (hasProgressDot) { @@ -269,22 +213,6 @@ async function handleProgress(postStream) { return keepPolling; } -export function streamSummaryText(topicSummary, context) { - const summaryUpdater = new SummaryUpdater(topicSummary, context); - - if (!progressTimer) { - progressTimer = later(async () => { - await applyProgress(topicSummary, summaryUpdater); - - progressTimer = null; - - if (!topicSummary.done) { - await applyProgress(topicSummary, summaryUpdater); - } - }, PROGRESS_INTERVAL); - } -} - function ensureProgress(postStream) { if (!progressTimer) { progressTimer = later(async () => { diff --git a/assets/stylesheets/common/streaming.scss b/assets/stylesheets/common/streaming.scss deleted file mode 100644 index 9608749a..00000000 --- a/assets/stylesheets/common/streaming.scss +++ /dev/null @@ -1,31 +0,0 @@ -@keyframes flashing { - 0%, - 100% { - opacity: 0; - } - 50% { - opacity: 1; - } -} - -article.streaming .cooked { - .progress-dot::after { - content: "\25CF"; - font-family: Söhne Circle, system-ui, -apple-system, Segoe UI, Roboto, - Ubuntu, Cantarell, Noto Sans, sans-serif; - line-height: normal; - margin-left: 0.25rem; - vertical-align: baseline; - animation: flashing 1.5s 3s infinite; - display: inline-block; - font-size: 1rem; - color: var(--tertiary-medium); - } - - > .progress-dot:only-child::after { - // if the progress dot is the only content - // we are likely waiting longer for a response - // so it can start animating instantly - animation: flashing 1.5s infinite; - } -} diff --git a/assets/stylesheets/modules/ai-bot/common/bot-replies.scss b/assets/stylesheets/modules/ai-bot/common/bot-replies.scss index e2a2518a..aa404fe3 100644 --- a/assets/stylesheets/modules/ai-bot/common/bot-replies.scss +++ b/assets/stylesheets/modules/ai-bot/common/bot-replies.scss @@ -51,6 +51,38 @@ article.streaming nav.post-controls .actions button.cancel-streaming { display: inline-block; } +@keyframes flashing { + 0%, + 100% { + opacity: 0; + } + 50% { + opacity: 1; + } +} + +article.streaming .cooked { + .progress-dot::after { + content: "\25CF"; + font-family: Söhne Circle, system-ui, -apple-system, Segoe UI, Roboto, + Ubuntu, Cantarell, Noto Sans, sans-serif; + line-height: normal; + margin-left: 0.25rem; + vertical-align: baseline; + animation: flashing 1.5s 3s infinite; + display: inline-block; + font-size: 1rem; + color: var(--tertiary-medium); + } + + > .progress-dot:only-child::after { + // if the progress dot is the only content + // we are likely waiting longer for a response + // so it can start animating instantly + animation: flashing 1.5s infinite; + } +} + .ai-bot-available-bot-options { padding: 0.5em; diff --git a/plugin.rb b/plugin.rb index a221f9db..501a0304 100644 --- a/plugin.rb +++ b/plugin.rb @@ -13,8 +13,6 @@ gem "tiktoken_ruby", "0.0.9" enabled_site_setting :discourse_ai_enabled -register_asset "stylesheets/common/streaming.scss" - register_asset "stylesheets/modules/ai-helper/common/ai-helper.scss" register_asset "stylesheets/modules/ai-helper/mobile/ai-helper.scss", :mobile diff --git a/test/javascripts/acceptance/topic-summary-test.js b/test/javascripts/acceptance/topic-summary-test.js index 8a915b95..b051471a 100644 --- a/test/javascripts/acceptance/topic-summary-test.js +++ b/test/javascripts/acceptance/topic-summary-test.js @@ -1,5 +1,5 @@ import { click, visit } from "@ember/test-helpers"; -import { skip } from "qunit"; +import { test } from "qunit"; import topicFixtures from "discourse/tests/fixtures/topic"; import { acceptance, @@ -30,7 +30,7 @@ acceptance("Topic - Summary", function (needs) { updateCurrentUser({ id: currentUserId }); }); - skip("displays streamed summary", async function (assert) { + test("displays streamed summary", async function (assert) { await visit("/t/-/1"); const partialSummary = "This a"; @@ -67,7 +67,7 @@ acceptance("Topic - Summary", function (needs) { .exists("summary metadata exists"); }); - skip("clicking summary links", async function (assert) { + test("clicking summary links", async function (assert) { await visit("/t/-/1"); const partialSummary = "In this post,"; @@ -125,7 +125,7 @@ acceptance("Topic - Summary - Anon", function (needs) { }); }); - skip("displays cached summary immediately", async function (assert) { + test("displays cached summary immediately", async function (assert) { await visit("/t/-/1"); await click(".ai-topic-summarization");