port to new microsoft ai chat protocol

Azure-Samples · Jul 24, 2024 · f704d8b · f704d8b
1 parent 5038dde
commit f704d8b
Show file tree

Hide file tree

Showing 13 changed files with 285 additions and 204 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,8 +20,8 @@
         "@fluentui/react-components": "^9.37.3",
         "@fluentui/react-icons": "^2.0.221",
         "@react-spring/web": "^9.7.3",
+        "@microsoft/ai-chat-protocol": "1.0.0-beta.20240610.1",
         "dompurify": "^3.0.6",
-        "ndjson-readablestream": "^1.2.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",

diff --git a/frontend/src/api/api.ts b/frontend/src/api/api.ts
diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
@@ -1,2 +1 @@
-export * from "./api";
 export * from "./models";
diff --git a/frontend/src/api/models.ts b/frontend/src/api/models.ts
@@ -1,3 +1,5 @@
+import { AIChatCompletion, AIChatCompletionDelta, AIChatCompletionOperationOptions } from "@microsoft/ai-chat-protocol";
+
 export const enum RetrievalMode {
     Hybrid = "rag",
     Vectors = "vector",
@@ -11,11 +13,14 @@ export type ChatAppRequestOverrides = {
     score_threshold?: number;
 };
 
-export type ResponseMessage = {
-    content: string;
-    role: string;
+export type ChatAppRequestContext = {
+    overrides: ChatAppRequestOverrides;
 };
 
+export interface ChatAppRequestOptions extends AIChatCompletionOperationOptions {
+    context: ChatAppRequestContext;
+}
+
 export type Thought = {
     title: string;
     description: string;
@@ -34,25 +39,10 @@ export type ResponseContext = {
     thoughts: Thought[];
 };
 
-export type ChatAppResponseOrError = {
-    message: ResponseMessage;
+export interface ChatCompletionResponse extends AIChatCompletion {
     context: ResponseContext;
-    session_state: string;
-    error?: string;
-};
+}
 
-export type ChatAppResponse = {
-    message: ResponseMessage;
+export interface ChatCompletionDeltaResponse extends AIChatCompletionDelta {
     context: ResponseContext;
-    session_state: string | null;
-};
-
-export type ChatAppRequestContext = {
-    overrides?: ChatAppRequestOverrides;
-};
-
-export type ChatAppRequest = {
-    messages: ResponseMessage[];
-    context?: ChatAppRequestContext;
-    session_state: string | null;
-};
+}
diff --git a/frontend/src/components/AnalysisPanel/AnalysisPanel.tsx b/frontend/src/components/AnalysisPanel/AnalysisPanel.tsx
@@ -1,15 +1,15 @@
 import { Pivot, PivotItem } from "@fluentui/react";
 
 import { SupportingContent } from "../SupportingContent";
-import { ChatAppResponse } from "../../api";
+import { ChatCompletionResponse } from "../../api";
 import { AnalysisPanelTabs } from "./AnalysisPanelTabs";
 import { ThoughtProcess } from "./ThoughtProcess";
 
 interface Props {
     className: string;
     activeTab: AnalysisPanelTabs;
     onActiveTabChanged: (tab: AnalysisPanelTabs) => void;
-    answer: ChatAppResponse;
+    answer: ChatCompletionResponse;
 }
 
 const pivotItemDisabledStyle = { disabled: true, style: { color: "grey" } };

diff --git a/frontend/src/components/Answer/Answer.tsx b/frontend/src/components/Answer/Answer.tsx
@@ -4,13 +4,13 @@ import DOMPurify from "dompurify";
 
 import styles from "./Answer.module.css";
 
-import { ChatAppResponse } from "../../api";
+import { ChatCompletionResponse } from "../../api";
 import { parseAnswerToHtml } from "./AnswerParser";
 import { AnswerIcon } from "./AnswerIcon";
 import { SpeechOutput } from "./SpeechOutput";
 
 interface Props {
-    answer: ChatAppResponse;
+    answer: ChatCompletionResponse;
     isSelected?: boolean;
     isStreaming: boolean;
     onThoughtProcessClicked: () => void;