({
- columnId: 'value',
+ columnId: "value",
compare: (a: Claim, b: Claim) => {
return a.value.localeCompare(b.value);
},
renderHeaderCell: () => {
- return 'Value';
+ return "Value";
},
renderCell: item => {
- return item.value
- },
+ return item.value;
+ }
})
- ]
+ ];
return (
- item.name}
- >
+ item.name}>
-
- {({ renderHeaderCell }) => {renderHeaderCell()}}
-
+ {({ renderHeaderCell }) => {renderHeaderCell()}}
>
- {({ item, rowId }) => (
- key={rowId}>
- {({ renderCell }) => {renderCell(item)}}
-
- )}
+ {({ item, rowId }) => key={rowId}>{({ renderCell }) => {renderCell(item)}}}
- )
+ );
};
diff --git a/app/frontend/src/components/TokenClaimsDisplay/index.tsx b/app/frontend/src/components/TokenClaimsDisplay/index.tsx
index 52c4634..baec9b5 100644
--- a/app/frontend/src/components/TokenClaimsDisplay/index.tsx
+++ b/app/frontend/src/components/TokenClaimsDisplay/index.tsx
@@ -1 +1 @@
-export * from './TokenClaimsDisplay'
\ No newline at end of file
+export * from "./TokenClaimsDisplay";
diff --git a/app/frontend/src/components/UserChatMessage/UserChatMessage.module.css b/app/frontend/src/components/UserChatMessage/UserChatMessage.module.css
index c80bea6..591f314 100644
--- a/app/frontend/src/components/UserChatMessage/UserChatMessage.module.css
+++ b/app/frontend/src/components/UserChatMessage/UserChatMessage.module.css
@@ -10,6 +10,8 @@
padding: 20px;
background: #e8ebfa;
border-radius: 8px;
- box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.14), 0px 0px 2px rgba(0, 0, 0, 0.12);
+ box-shadow:
+ 0px 2px 4px rgba(0, 0, 0, 0.14),
+ 0px 0px 2px rgba(0, 0, 0, 0.12);
outline: transparent solid 1px;
}
diff --git a/app/frontend/src/index.css b/app/frontend/src/index.css
index 2efb29b..44e9bf2 100644
--- a/app/frontend/src/index.css
+++ b/app/frontend/src/index.css
@@ -12,7 +12,17 @@ body {
html {
background: #f2f2f2;
- font-family: "Segoe UI", -apple-system, BlinkMacSystemFont, "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+ font-family:
+ "Segoe UI",
+ -apple-system,
+ BlinkMacSystemFont,
+ "Roboto",
+ "Oxygen",
+ "Ubuntu",
+ "Cantarell",
+ "Fira Sans",
+ "Droid Sans",
+ "Helvetica Neue",
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
diff --git a/app/frontend/src/index.tsx b/app/frontend/src/index.tsx
index 47b0689..d0c06c3 100644
--- a/app/frontend/src/index.tsx
+++ b/app/frontend/src/index.tsx
@@ -2,9 +2,9 @@ import React from "react";
import ReactDOM from "react-dom/client";
import { createHashRouter, RouterProvider } from "react-router-dom";
import { initializeIcons } from "@fluentui/react";
-import { MsalProvider } from '@azure/msal-react';
-import { PublicClientApplication, EventType, AccountInfo } from '@azure/msal-browser';
-import { msalConfig, useLogin } from './authConfig';
+import { MsalProvider } from "@azure/msal-react";
+import { PublicClientApplication, EventType, AccountInfo } from "@azure/msal-browser";
+import { msalConfig, useLogin } from "./authConfig";
import "./index.css";
@@ -22,7 +22,7 @@ if (useLogin) {
}
// Listen for sign-in event and set active account
- msalInstance.addEventCallback((event) => {
+ msalInstance.addEventCallback(event => {
if (event.eventType === EventType.LOGIN_SUCCESS && event.payload) {
const account = event.payload as AccountInfo;
msalInstance.setActiveAccount(account);
@@ -33,9 +33,9 @@ if (useLogin) {
- )
+ );
} else {
- layout =
+ layout = ;
}
initializeIcons();
diff --git a/app/frontend/src/pages/chat/Chat.tsx b/app/frontend/src/pages/chat/Chat.tsx
index bc86f7f..66fa3a7 100644
--- a/app/frontend/src/pages/chat/Chat.tsx
+++ b/app/frontend/src/pages/chat/Chat.tsx
@@ -5,15 +5,7 @@ import readNDJSONStream from "ndjson-readablestream";
import styles from "./Chat.module.css";
-import {
- chatApi,
- RetrievalMode,
- ChatAppResponse,
- ChatAppResponseOrError,
- ChatAppRequest,
- ResponseMessage,
- Approaches
-} from "../../api";
+import { chatApi, RetrievalMode, ChatAppResponse, ChatAppResponseOrError, ChatAppRequest, ResponseMessage, Approaches } from "../../api";
import { Answer, AnswerError, AnswerLoading } from "../../components/Answer";
import { QuestionInput } from "../../components/QuestionInput";
import { ExampleList } from "../../components/Example";
@@ -31,7 +23,6 @@ const Chat = () => {
const [retrieveCount, setRetrieveCount] = useState(3);
const [retrievalMode, setRetrievalMode] = useState(RetrievalMode.Hybrid);
const [useSemanticRanker, setUseSemanticRanker] = useState(true);
- // TODO enable streaming
const [shouldStream, setShouldStream] = useState(true);
const [useSemanticCaptions, setUseSemanticCaptions] = useState(false);
const [excludeCategory, setExcludeCategory] = useState("");
@@ -61,12 +52,9 @@ const Chat = () => {
return new Promise(resolve => {
setTimeout(() => {
answer += newContent;
- const latestResponse: ChatAppResponse = { ...askResponse,
- choices: [{ ...askResponse.choices[0],
- message: { content: answer,
- role: askResponse.choices[0].message.role
- } }
- ]
+ const latestResponse: ChatAppResponse = {
+ ...askResponse,
+ choices: [{ ...askResponse.choices[0], message: { content: answer, role: askResponse.choices[0].message.role } }]
};
setStreamedAnswers([...answers, [question, latestResponse]]);
resolve(null);
@@ -88,12 +76,9 @@ const Chat = () => {
} finally {
setIsStreaming(false);
}
- const fullResponse: ChatAppResponse = { ...askResponse,
- choices: [{ ...askResponse.choices[0],
- message: { content: answer,
- role: askResponse.choices[0].message.role
- } }
- ]
+ const fullResponse: ChatAppResponse = {
+ ...askResponse,
+ choices: [{ ...askResponse.choices[0], message: { content: answer, role: askResponse.choices[0].message.role } }]
};
return fullResponse;
};
@@ -111,10 +96,10 @@ const Chat = () => {
const token = client ? await getToken(client) : undefined;
try {
- const messages: ResponseMessage[] = answers.flatMap(a => ([
+ const messages: ResponseMessage[] = answers.flatMap(a => [
{ content: a[0], role: "user" },
- { content: a[1].choices[0].message.content, role: "bot" }
- ]));
+ { content: a[1].choices[0].message.content, role: "assistant" }
+ ]);
const request: ChatAppRequest = {
messages: [...messages, { content: question, role: "user" }],
@@ -133,6 +118,8 @@ const Chat = () => {
}
},
approach: Approaches.JAVA_OPENAI_SDK,
+ // ChatAppProtocol: Client must pass on any session state received from the server
+ session_state: answers.length ? answers[answers.length - 1][1].choices[0].session_state : null
};
const response = await chatApi(request, token?.accessToken);
diff --git a/app/frontend/src/pages/layout/Layout.tsx b/app/frontend/src/pages/layout/Layout.tsx
index 4ab2da0..943f602 100644
--- a/app/frontend/src/pages/layout/Layout.tsx
+++ b/app/frontend/src/pages/layout/Layout.tsx
@@ -4,9 +4,9 @@ import github from "../../assets/github.svg";
import styles from "./Layout.module.css";
-import { useLogin } from "../../authConfig"
+import { useLogin } from "../../authConfig";
-import { LoginButton } from "../../components/LoginButton"
+import { LoginButton } from "../../components/LoginButton";
const Layout = () => {
return (
@@ -43,7 +43,7 @@ const Layout = () => {
Azure OpenAI + Cognitive Search
- {useLogin && }
+ {useLogin && }
diff --git a/app/frontend/src/pages/oneshot/OneShot.tsx b/app/frontend/src/pages/oneshot/OneShot.tsx
index 5831ce9..b773a77 100644
--- a/app/frontend/src/pages/oneshot/OneShot.tsx
+++ b/app/frontend/src/pages/oneshot/OneShot.tsx
@@ -3,7 +3,7 @@ import { Checkbox, ChoiceGroup, IChoiceGroupOption, Panel, DefaultButton, Spinne
import styles from "./OneShot.module.css";
-import {askApi, Approaches, ChatAppResponse, RetrievalMode, SKMode, ChatAppRequest} from "../../api";
+import {askApi, Approaches, ChatAppResponse, RetrievalMode, SKMode } from "../../api";
import { Answer, AnswerError } from "../../components/Answer";
import { QuestionInput } from "../../components/QuestionInput";
import { ExampleList } from "../../components/Example";
@@ -37,7 +37,7 @@ export function Component(): JSX.Element {
const [activeCitation, setActiveCitation] = useState();
const [activeAnalysisPanelTab, setActiveAnalysisPanelTab] = useState(undefined);
- const client = useLogin ? useMsal().instance : undefined
+ const client = useLogin ? useMsal().instance : undefined;
const makeApiRequest = async (question: string) => {
lastQuestionRef.current = question;
@@ -47,7 +47,7 @@ export function Component(): JSX.Element {
setActiveCitation(undefined);
setActiveAnalysisPanelTab(undefined);
- const token = client ? await getToken(client) : undefined
+ const token = client ? await getToken(client) : undefined;
try {
const request: ChatAppRequest = {
@@ -72,7 +72,9 @@ export function Component(): JSX.Element {
semantic_kernel_mode: skMode
}
},
- approach: approach
+ approach: approach,
+ // ChatAppProtocol: Client must pass on any session state received from the server
+ session_state: answer ? answer.choices[0].session_state : null
};
const result = await askApi(request, token?.accessToken);
setAnswer(result);
@@ -302,7 +304,7 @@ export function Component(): JSX.Element {
onChange={onUseOidSecurityFilterChange}
/>
)}
- {useLogin && (
+ {useLogin && (
)}
- { useLogin && }
+
+ {useLogin && }
);
From 17678c21ed89d6e7ccb8e9010ba2b8d424d211cb Mon Sep 17 00:00:00 2001
From: John Oliver <1615532+johnoliver@users.noreply.github.com>
Date: Thu, 26 Oct 2023 14:00:58 +0100
Subject: [PATCH 2/2] Fix build
---
app/frontend/src/pages/oneshot/OneShot.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/frontend/src/pages/oneshot/OneShot.tsx b/app/frontend/src/pages/oneshot/OneShot.tsx
index b773a77..1a25ddf 100644
--- a/app/frontend/src/pages/oneshot/OneShot.tsx
+++ b/app/frontend/src/pages/oneshot/OneShot.tsx
@@ -3,7 +3,7 @@ import { Checkbox, ChoiceGroup, IChoiceGroupOption, Panel, DefaultButton, Spinne
import styles from "./OneShot.module.css";
-import {askApi, Approaches, ChatAppResponse, RetrievalMode, SKMode } from "../../api";
+import { askApi, Approaches, ChatAppResponse, RetrievalMode, SKMode, ChatAppRequest } from "../../api";
import { Answer, AnswerError } from "../../components/Answer";
import { QuestionInput } from "../../components/QuestionInput";
import { ExampleList } from "../../components/Example";