Merge branch 'dev' of https://github.com/gsproston-scottlogic/prompt-…

…injection into 98-phase-switching

frontend/src/App.tsx

@@ -1,4 +1,5 @@
-import React from "react";
+import { useState } from "react";
+
 import "./App.css";
 import AttackBox from "./components/AttackBox/AttackBox";
 import ChatBox from "./components/ChatBox/ChatBox";
@@ -8,12 +9,14 @@ import ApiKeyBox from "./components/ApiKeyBox/ApiKeyBox";
 import PhaseSelectionBox from "./components/PhaseSelectionBox/PhaseSelectionBox";
 import Header from "./components/Header";
 import ModelSelectionBox from "./components/ModelSelectionBox/ModelSelectionBox";
-import { useState } from "react";
 import { EmailInfo } from "./models/email";
+import { CHAT_MESSAGE_TYPE, ChatMessage } from "./models/chat";
+import { DefenceInfo } from "./models/defence";
 
 function App() {
   const [defenceBoxKey, setDefenceBoxKey] = useState<number>(0);
   const [emails, setEmails] = useState<EmailInfo[]>([]);
+  const [messages, setMessages] = useState<ChatMessage[]>([]);
   const [triggeredDefences, setTriggeredDefences] = useState<string[]>([]);
 
   const updateTriggeredDefences = (defenceDetails: string[]) => {
@@ -23,11 +26,42 @@ function App() {
     setDefenceBoxKey(defenceBoxKey + 1);
   };
 
+  // methods to modify messages
+  const addChatMessage = (message: ChatMessage) => {
+    setMessages((messages: ChatMessage[]) => [...messages, message]);
+  };
+  const addInfoMessage = (message: string) => {
+    addChatMessage({
+      message: message,
+      type: CHAT_MESSAGE_TYPE.INFO,
+      isOriginalMessage: true,
+    });
+  };
+  const clearMessages = () => {
+    setMessages([]);
+  };
+
+  // methods to be called when defences are (de)activated
+  // this adds an info message to the chat
+  const defenceActivated = (defenceInfo: DefenceInfo) => {
+    const infoMessage = `${defenceInfo.name} defence activated`;
+    addInfoMessage(infoMessage.toLowerCase());
+  };
+  const defenceDeactivated = (defenceInfo: DefenceInfo) => {
+    const infoMessage = `${defenceInfo.name} defence deactivated`;
+    addInfoMessage(infoMessage.toLowerCase());
+  };
+
   return (
     <span id="main-area">
       <div className="side-bar">
         <div className="side-bar-header">defence mechanisms</div>
-        <DefenceBox key={defenceBoxKey} triggeredDefences={triggeredDefences} />
+        <DefenceBox
+          key={defenceBoxKey}
+          triggeredDefences={triggeredDefences}
+          defenceActivated={defenceActivated}
+          defenceDeactivated={defenceDeactivated}
+        />
 
         <div className="side-bar-header">attack mechanisms</div>
         <AttackBox />
@@ -39,8 +73,11 @@ function App() {
       <div id="centre-area">
         <Header />
         <ChatBox
+          messages={messages}
           setEmails={setEmails}
           updateTriggeredDefences={updateTriggeredDefences}
+          addChatMessage={addChatMessage}
+          clearMessages={clearMessages}
         />
       </div>
       <div className="side-bar">

frontend/src/components/ChatBox/ChatBox.tsx

@@ -3,26 +3,33 @@ import "./ChatBox.css";
 import ChatBoxFeed from "./ChatBoxFeed";
 import { clearChat, sendMessage } from "../../service/chatService";
 import { getSentEmails } from "../../service/emailService";
-import { ChatMessage, ChatResponse } from "../../models/chat";
+import {
+  CHAT_MESSAGE_TYPE,
+  ChatMessage,
+  ChatResponse,
+} from "../../models/chat";
 import { EmailInfo } from "../../models/email";
 
 function ChatBox(
   this: any,
   {
+    messages,
     setEmails,
     updateTriggeredDefences,
+    addChatMessage,
+    clearMessages,
   }: {
+    messages: ChatMessage[];
     setEmails: (emails: EmailInfo[]) => void;
     updateTriggeredDefences: (defences: string[]) => void;
+    addChatMessage: (message: ChatMessage) => void;
+    clearMessages: () => void;
   }
 ) {
   const [isSendingMessage, setIsSendingMessage] = useState<boolean>(false);
-  const [messages, setMessages] = useState<ChatMessage[]>([]);
 
   // called on mount
   useEffect(() => {
-    // clear remote messages
-    clearChat();
     // get sent emails
     getSentEmails().then((sentEmails) => {
       setEmails(sentEmails);
@@ -31,7 +38,7 @@ function ChatBox(
 
   const clearClicked = () => {
     // clear local messages
-    setMessages([]);
+    clearMessages();
     // clear remote messages
     clearChat();
   };
@@ -45,10 +52,11 @@ function ChatBox(
       const message = event.currentTarget.value;
 
       // if input has been edited, add both messages to the list of messages. otherwise add original message only
-      setMessages((messages: ChatMessage[]) => [
-        ...messages,
-        { message: message, isUser: true, isOriginalMessage: true },
-      ]);
+      addChatMessage({
+        message: message,
+        type: CHAT_MESSAGE_TYPE.USER,
+        isOriginalMessage: true,
+      });
       // clear the input
       event.currentTarget.value = "";
 
@@ -57,25 +65,19 @@ function ChatBox(
       const isTransformed = transformedMessage !== message;
       // add the transformed message to the chat box if it is different from the original message
       if (isTransformed) {
-        setMessages((messages: ChatMessage[]) => [
-          ...messages,
-          {
-            message: transformedMessage,
-            isUser: true,
-            isOriginalMessage: false,
-          },
-        ]);
+        addChatMessage({
+          message: transformedMessage,
+          type: CHAT_MESSAGE_TYPE.USER,
+          isOriginalMessage: false,
+        });
       }
       // add it to the list of messages
-      setMessages((messages: ChatMessage[]) => [
-        ...messages,
-        {
-          isUser: false,
-          message: response.reply,
-          defenceInfo: response.defenceInfo,
-          isOriginalMessage: true,
-        },
-      ]);
+      addChatMessage({
+        type: CHAT_MESSAGE_TYPE.BOT,
+        message: response.reply,
+        defenceInfo: response.defenceInfo,
+        isOriginalMessage: true,
+      });
       // update triggered defences
       updateTriggeredDefences(response.defenceInfo.triggeredDefences);
 

frontend/src/components/ChatBox/ChatBoxFeed.tsx

@@ -1,12 +1,17 @@
 import "./ChatBoxFeed.css";
-import { ChatMessage } from "../../models/chat";
+import { CHAT_MESSAGE_TYPE, ChatMessage } from "../../models/chat";
 import ChatBoxMessage from "./ChatBoxMessage";
+import ChatBoxInfoText from "./ChatBoxInfoText";
 
 function ChatBoxFeed({ messages }: { messages: ChatMessage[] }) {
   return (
     <div id="chat-box-feed">
       {[...messages].reverse().map((message, index) => {
-        return <ChatBoxMessage key={index} message={message} />;
+        if (message.type === CHAT_MESSAGE_TYPE.INFO) {
+          return <ChatBoxInfoText key={index} text={message.message} />;
+        } else {
+          return <ChatBoxMessage key={index} message={message} />;
+        }
       })}
     </div>
   );

frontend/src/components/ChatBox/ChatBoxInfoText.css

@@ -0,0 +1,5 @@
+.chat-box-info-text {
+  color: #888;
+  font-size: 14px;
+  padding-top: 16px;
+}

frontend/src/components/ChatBox/ChatBoxInfoText.tsx

@@ -0,0 +1,7 @@
+import "./ChatBoxInfoText.css";
+
+function ChatBoxInfoText({ text }: { text: string }) {
+  return <div className="chat-box-info-text">{text}</div>;
+}
+
+export default ChatBoxInfoText;

frontend/src/components/ChatBox/ChatBoxMessage.tsx

@@ -1,11 +1,11 @@
-import { ChatMessage } from "../../models/chat";
+import { CHAT_MESSAGE_TYPE, ChatMessage } from "../../models/chat";
 import "./ChatBoxMessage.css";
 
 function ChatBoxMessage({ message }: { message: ChatMessage }) {
   return (
     <div
       className={
-        message.isUser
+        message.type === CHAT_MESSAGE_TYPE.USER
           ? message.isOriginalMessage
             ? "chat-box-message chat-box-message-user"
             : "chat-box-message chat-box-message-user-transformed"
@@ -15,8 +15,10 @@ function ChatBoxMessage({ message }: { message: ChatMessage }) {
       }
       lang="en"
     >
-      {(message.isUser && message.isOriginalMessage && <b>Input: </b>) ||
-        (message.isUser && !message.isOriginalMessage && <b>Edited: </b>)}
+      {(message.type === CHAT_MESSAGE_TYPE.USER &&
+        message.isOriginalMessage && <b>Input: </b>) ||
+        (message.type === CHAT_MESSAGE_TYPE.USER &&
+          !message.isOriginalMessage && <b>Edited: </b>)}
       {message.message}
     </div>
   );

frontend/src/components/DefenceBox/DefenceBox.tsx

@@ -8,9 +8,17 @@ import {
   configureDefence,
 } from "../../service/defenceService";
 import { DEFENCE_DETAILS } from "../../Defences";
-import { DefenceConfig } from "../../models/defence";
+import { DefenceConfig, DefenceInfo } from "../../models/defence";
 
-function DefenceBox({ triggeredDefences }: { triggeredDefences: string[] }) {
+function DefenceBox({
+  triggeredDefences,
+  defenceActivated,
+  defenceDeactivated,
+}: {
+  triggeredDefences: string[];
+  defenceActivated: (defenceInfo: DefenceInfo) => void;
+  defenceDeactivated: (defenceInfo: DefenceInfo) => void;
+}) {
   // list of defence mechanisms
   const [defenceDetails, setDefenceDetails] = useState(DEFENCE_DETAILS);
 
@@ -45,7 +53,6 @@ function DefenceBox({ triggeredDefences }: { triggeredDefences: string[] }) {
 
   // update triggered defences
   useEffect(() => {
-    console.log("updating triggered defences: ", triggeredDefences);
     // update state
     const newDefences = defenceDetails.map((defenceDetail) => {
       defenceDetail.isTriggered = triggeredDefences.includes(defenceDetail.id);
@@ -62,6 +69,7 @@ function DefenceBox({ triggeredDefences }: { triggeredDefences: string[] }) {
         if (defenceDetail.id === defenceType) {
           defenceDetail.isActive = true;
           defenceDetail.isTriggered = false;
+          defenceActivated(defenceDetail);
         }
         return defenceDetail;
       });
@@ -76,6 +84,7 @@ function DefenceBox({ triggeredDefences }: { triggeredDefences: string[] }) {
         if (defenceDetail.id === defenceType) {
           defenceDetail.isActive = false;
           defenceDetail.isTriggered = false;
+          defenceDeactivated(defenceDetail);
         }
         return defenceDetail;
       });
@@ -99,10 +108,6 @@ function DefenceBox({ triggeredDefences }: { triggeredDefences: string[] }) {
     });
   };
 
-  useEffect(() => {
-    console.log("defenceDetails: ", defenceDetails);
-  }, [defenceDetails]);
-
   return (
     <div id="strategy-box">
       {defenceDetails.map((defenceDetail, index) => {

frontend/src/components/DefenceBox/DefenceConfiguration.tsx

@@ -12,9 +12,10 @@ function DefenceConfiguration(
     setConfigurationValue: (configId: string, value: string) => void;
   }
 ) {
-  const setConfiguration = (event: React.KeyboardEvent<HTMLInputElement>) => {
+  const setConfiguration = (event: React.KeyboardEvent<HTMLDivElement>) => {
     if (event.key === "Enter") {
-      setConfigurationValue(config.id, event.currentTarget.value);
+      const value = event.currentTarget.innerText.trim();
+      setConfigurationValue(config.id, value);
     }
   };
 

frontend/src/components/DefenceBox/DefenceMechanism.tsx

@@ -77,17 +77,19 @@ function DefenceMechanism({
         {isInfoBoxVisible ? (
           <div className="strategy-mechanism-info-box">
             <div>{defenceDetail.info}</div>
-            <div className="defence-mechanism-config">
-              {defenceDetail.config?.map((config, index) => {
-                return (
-                  <DefenceConfiguration
-                    key={config.id}
-                    config={config}
-                    setConfigurationValue={setConfigurationValue}
-                  />
-                );
-              })}
-            </div>
+            {defenceDetail.config ? (
+              <div className="defence-mechanism-config">
+                {defenceDetail.config.map((config, index) => {
+                  return (
+                    <DefenceConfiguration
+                      key={config.id}
+                      config={config}
+                      setConfigurationValue={setConfigurationValue}
+                    />
+                  );
+                })}
+              </div>
+            ) : null}
           </div>
         ) : null}
       </div>

frontend/src/components/ModelSelectionBox/ModelSelectionBox.tsx

@@ -49,7 +49,9 @@ function ModelSelectionBox() {
           placeholder={modelInUse}
         >
           {chatModelOptions.map((model) => (
-            <option value={model}>{model}</option>
+            <option key={model} value={model}>
+              {model}
+            </option>
           ))}
           ;
         </select>

frontend/src/models/chat.ts

@@ -1,3 +1,5 @@
+import { type } from "@testing-library/user-event/dist/type";
+
 enum CHAT_MODELS {
   GPT_4 = "gpt-4",
   GPT_4_0613 = "gpt-4-0613",
@@ -9,16 +11,22 @@ enum CHAT_MODELS {
   GPT_3_5_TURBO_16K_0613 = "gpt-3.5-turbo-16k-0613",
 }
 
+enum CHAT_MESSAGE_TYPE {
+  BOT,
+  INFO,
+  USER,
+}
+
 interface ChatDefenceReport {
   blocked: boolean;
   triggeredDefences: string[];
 }
 
 interface ChatMessage {
-  isUser: boolean;
   defenceInfo?: ChatDefenceReport;
   message: string;
   isOriginalMessage: boolean;
+  type: CHAT_MESSAGE_TYPE;
 }
 
 interface ChatResponse {
@@ -28,4 +36,4 @@ interface ChatResponse {
 }
 
 export type { ChatMessage, ChatResponse };
-export { CHAT_MODELS };
+export { CHAT_MODELS, CHAT_MESSAGE_TYPE };