makes frontend use thie resultingChatInfoMessage

ScottLogic · Mar 22, 2024 · 2fa7519 · 2fa7519
1 parent b466448
commit 2fa7519
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/frontend/src/components/ControlPanel/ControlPanel.tsx b/frontend/src/components/ControlPanel/ControlPanel.tsx
@@ -2,7 +2,7 @@ import { DEFENCES_HIDDEN_LEVEL3_IDS, MODEL_DEFENCES } from '@src/Defences';
 import DefenceBox from '@src/components/DefenceBox/DefenceBox';
 import DocumentViewButton from '@src/components/DocumentViewer/DocumentViewButton';
 import ModelBox from '@src/components/ModelBox/ModelBox';
-import { ChatModel } from '@src/models/chat';
+import { ChatMessage, ChatModel } from '@src/models/chat';
 import {
  DEFENCE_ID,
  DefenceConfigItem,
@@ -24,6 +24,7 @@ function ControlPanel({
  setDefenceConfiguration,
  openDocumentViewer,
  addInfoMessage,
+ addChatMessage,
 }: {
  currentLevel: LEVEL_NAMES;
  defences: Defence[];
@@ -41,6 +42,7 @@ function ControlPanel({
  ) => Promise<boolean>;
  openDocumentViewer: () => void;
  addInfoMessage: (message: string) => void;
+ addChatMessage: (chatMessage: ChatMessage) => void;
 }) {
  const configurableDefences =
  currentLevel === LEVEL_NAMES.SANDBOX
@@ -103,6 +105,7 @@ function ControlPanel({
  setChatModelId={setChatModelId}
  chatModelOptions={chatModelOptions}
  addInfoMessage={addInfoMessage}
+ addChatMessage={addChatMessage}
  />
  )}
  </details>

diff --git a/frontend/src/components/MainComponent/MainBody.tsx b/frontend/src/components/MainComponent/MainBody.tsx
@@ -71,6 +71,7 @@ function MainBody({
  setDefenceConfiguration={setDefenceConfiguration}
  openDocumentViewer={openDocumentViewer}
  addInfoMessage={addInfoMessage}
+ addChatMessage={addChatMessage}
  />
  </div>
  <div className="centre-area">

diff --git a/frontend/src/components/ModelBox/ModelBox.tsx b/frontend/src/components/ModelBox/ModelBox.tsx
@@ -1,4 +1,4 @@
-import { ChatModel } from '@src/models/chat';
+import { ChatMessage, ChatModel } from '@src/models/chat';
 
 import ModelConfiguration from './ModelConfiguration';
 import ModelSelection from './ModelSelection';
@@ -10,11 +10,13 @@ function ModelBox({
  setChatModelId,
  chatModelOptions,
  addInfoMessage,
+ addChatMessage,
 }: {
  chatModel?: ChatModel;
  setChatModelId: (modelId: string) => void;
  chatModelOptions: string[];
  addInfoMessage: (message: string) => void;
+ addChatMessage: (chatMessage: ChatMessage) => void;
 }) {
  return (
  <div className="model-box">
@@ -26,7 +28,7 @@ function ModelBox({
  />
  <ModelConfiguration
  chatModel={chatModel}
- addInfoMessage={addInfoMessage}
+ addChatMessage={addChatMessage}
  />
  </div>
  );

diff --git a/frontend/src/components/ModelBox/ModelConfiguration.tsx b/frontend/src/components/ModelBox/ModelConfiguration.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 
 import {
+ ChatMessage,
  ChatModel,
  CustomChatModelConfiguration,
  MODEL_CONFIG_ID,
@@ -48,10 +49,10 @@ const DEFAULT_CONFIGS: CustomChatModelConfiguration[] = [
 
 function ModelConfiguration({
  chatModel,
- addInfoMessage,
+ addChatMessage,
 }: {
  chatModel?: ChatModel;
- addInfoMessage: (message: string) => void;
+ addChatMessage: (chatMessage: ChatMessage) => void;
 }) {
  const [customChatModelConfigs, setCustomChatModel] =
  useState<CustomChatModelConfiguration[]>(DEFAULT_CONFIGS);
@@ -77,13 +78,15 @@ function ModelConfiguration({
 
  setCustomChatModelByID(id, newValue);
 
- void chatService.configureGptModel(id, newValue).then((success) => {
- if (success) {
- addInfoMessage(`changed ${id} to ${newValue}`);
- } else {
- setCustomChatModelByID(id, prevValue);
- }
- });
+ void chatService
+ .configureGptModel(id, newValue)
+ .then((resultingChatInfoMessage) => {
+ if (resultingChatInfoMessage) {
+ addChatMessage(resultingChatInfoMessage);
+ } else {
+ setCustomChatModelByID(id, prevValue);
+ }
+ });
  }
 
  useEffect(() => {