Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/components/ChatBuble.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import AssistantAvatar from './AssistantAvatar.vue';
import DescreteButton from './ButtonComponent.vue';
import UserAvatar from './UserAvatar.vue';
import ReloadIcon from './icons/ReloadIcon.vue';
import CopyIcon from './icons/CopyIcon.vue';
import TooltipComponent from './TooltipComponent.vue';
import { marked } from 'marked';
Expand All @@ -17,9 +16,15 @@ defineProps<{
isUSer: boolean;
isLast: boolean;
shouldDisable: boolean;
rephrase?: () => void;
}>();

const renderer = new marked.Renderer();
const linkRenderer = renderer.link;
renderer.link = (href, title, text) => {
const html = linkRenderer.call(renderer, href, title, text);
return html.replace(/^<a /, '<a target="_blank" rel="nofollow" ');
};

const copyMessage = (msg: string) => {
if (timeOut.value) {
window.clearTimeout(timeOut.value);
Expand All @@ -38,7 +43,7 @@ const copyMessage = (msg: string) => {
<UserAvatar v-if="isUSer" />
<AssistantAvatar v-else />
</div>
<p class="chat-bubble-content" v-html="marked.parse(message)" />
<p class="chat-bubble-content" v-html="marked.parse(message, { renderer })" />
<div class="details">
<DescreteButton
class="detail-button"
Expand All @@ -50,16 +55,6 @@ const copyMessage = (msg: string) => {
<CopyIcon class="icon-action" />
<TooltipComponent class="tltip" :tooltipText="copied ? $t('copied') : $t('copy')" isRight />
</DescreteButton>
<DescreteButton
class="detail-button"
:aria-label="$t('rephrase')"
isDiscreet
v-if="!isUSer && isLast && !shouldDisable"
@click="rephrase && rephrase()"
>
<ReloadIcon class="icon-action" />
<TooltipComponent class="tltip" :tooltipText="$t('rephrase')" isRight />
</DescreteButton>
</div>
</div>
</template>
Expand Down
1 change: 0 additions & 1 deletion src/components/ChatComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const computedStatus = computed(() => store.chatStatus);
v-for="({ content, role }, index) in store.chatMessagesList"
:message="content"
:isUSer="role === 'user'"
:rephrase="store.fetchRephrase"
:isLast="index === store.chatMessagesList.length - 1"
:shouldDisable="computedStatus !== CHAT_STATUS.DONE"
/>
Expand Down
1 change: 0 additions & 1 deletion src/localisation/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ export const en = {
removeAll: 'Clear all',
removeBookmark: 'Remove bookmark',
removeSelection: 'Clear',
rephrase: 'Rephrase',
searchBarPlaceholder: 'Search...',
sdgsAcronym: 'SDGs',
sdgs: {
Expand Down
1 change: 0 additions & 1 deletion src/localisation/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ export const fr = {
removeAll: 'Tout effacer',
removeBookmark: 'Retirer des favoris',
removeSelection: 'Effacer',
rephrase: 'Reformuler',
searchBarPlaceholder: 'Rechercher...',
sdgsAcronym: 'ODD',
sdgs: {
Expand Down
31 changes: 1 addition & 30 deletions src/stores/chat.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia';
import { computed, ref, type ComputedRef, type Ref } from 'vue';
import type { Document, ChatMessage, ChatProcessingMetadata } from '@/types';
import { baseGetAxios, basePostAxios, fetchStream } from '@/utils/fetch';
import { baseGetAxios, fetchStream } from '@/utils/fetch';
import { getQueryParamValue } from '@/utils/urlsUtils';
import { getFromStorage, saveToStorage, clearFromStorage } from '@/utils/storage';
import { extractProcessingMetadata } from '@/utils/chatProcessing';
Expand Down Expand Up @@ -113,10 +113,6 @@ export const useChatStore = defineStore('chat', () => {
() => getQueryParamValue('score') === 'true'
);

const getMessageHistory: ComputedRef<ChatMessage[]> = computed(() => {
return chatMessagesList.value.slice(0, -1);
});

function addToMessageList(message: ChatMessage): void {
if (!message.content.length) {
return;
Expand Down Expand Up @@ -148,30 +144,6 @@ export const useChatStore = defineStore('chat', () => {
}
}

async function fetchRephrase() {
clearProcessingMetadata();
chatStatus.value = CHAT_STATUS.FORMULATING_ANSWER;
// get the content of the message which the role is assistant
const lastAssistantMessage = [...chatMessagesList.value]
.reverse()
.find((msg) => msg.role === 'assistant')?.content;

const bodyContent = {
sources: sourcesList.value,
history: getMessageHistory.value,
query: lastAssistantMessage,
...(storedSubject.value && { subject: storedSubject.value })
};

const respBody = await basePostAxios('/qna/chat/rephrase', bodyContent);

chatMessagesList.value.push({ role: 'assistant', content: respBody.data });
saveToStorage('chat', chatMessagesList.value);

chatStatus.value = CHAT_STATUS.FORMULATED_ANSWER;
chatStatus.value = CHAT_STATUS.DONE;
}

async function getAgentAnswer(userMsg: string) {
clearProcessingMetadata();

Expand Down Expand Up @@ -452,7 +424,6 @@ export const useChatStore = defineStore('chat', () => {
sourcesList,
reformulatedQuery,
onSendMessage,
fetchRephrase,
clearInput,
setReformulatedQuery,
shouldDisplayScore,
Expand Down
Loading