Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(generatedAnswer): map state with answer api client #4681

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Draft

fix(generatedAnswer): map state with answer api client #4681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 17 additions & 4 deletions packages/headless/src/api/knowledge/stream-answer-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import {
EventSourceMessage,
fetchEventSource,
} from '@microsoft/fetch-event-source';
import {createSelector} from '@reduxjs/toolkit';
import {createSelector, ThunkDispatch, UnknownAction} from '@reduxjs/toolkit';
import {
setAnswerContentFormat,
updateCitations,
updateMessage,
} from '../../features/generated-answer/generated-answer-actions.js';
import {logGeneratedAnswerStreamEnd} from '../../features/generated-answer/generated-answer-analytics-actions.js';
import {selectFieldsToIncludeInCitation} from '../../features/generated-answer/generated-answer-selectors.js';
import {GeneratedContentFormat} from '../../features/generated-answer/generated-response-format.js';
import {maximumNumberOfResultsFromIndex} from '../../features/pagination/pagination-constants.js';
Expand Down Expand Up @@ -118,7 +124,8 @@ const handleError = (

const updateCacheWithEvent = (
event: EventSourceMessage,
draft: GeneratedAnswerStream
draft: GeneratedAnswerStream,
dispatch: ThunkDispatch<StateNeededByAnswerAPI, unknown, UnknownAction>
) => {
const message: Required<MessageType> = JSON.parse(event.data);
if (message.finishReason === 'ERROR' && message.errorMessage) {
Expand All @@ -133,21 +140,27 @@ const updateCacheWithEvent = (
case 'genqa.headerMessageType':
if (parsedPayload.contentFormat) {
handleHeaderMessage(draft, parsedPayload);
dispatch(setAnswerContentFormat(parsedPayload.contentFormat));
}
break;
case 'genqa.messageType':
if (parsedPayload.textDelta) {
handleMessage(draft, parsedPayload);
dispatch(updateMessage({textDelta: parsedPayload.textDelta}));
}
break;
case 'genqa.citationsType':
if (parsedPayload.citations) {
handleCitations(draft, parsedPayload);
dispatch(updateCitations({citations: parsedPayload.citations}));
}
break;
case 'genqa.endOfStreamType':
if (draft.answer?.length || parsedPayload.answerGenerated) {
handleEndOfStream(draft, parsedPayload);
dispatch(
logGeneratedAnswerStreamEnd(parsedPayload.answerGenerated ?? false)
);
}
break;
}
Expand All @@ -170,7 +183,7 @@ export const answerApi = answerSlice.injectEndpoints({
}),
async onCacheEntryAdded(
args,
{getState, cacheDataLoaded, updateCachedData}
{getState, cacheDataLoaded, updateCachedData, dispatch}
) {
await cacheDataLoaded;
/**
Expand Down Expand Up @@ -209,7 +222,7 @@ export const answerApi = answerSlice.injectEndpoints({
},
onmessage: (event) => {
updateCachedData((draft) => {
updateCacheWithEvent(event, draft);
updateCacheWithEvent(event, draft, dispatch);
});
},
onerror: (error) => {
Expand Down
Loading