Move the extraContext from storage to app.context.

Author: igardev

examples/server/public/index.html.gz

@@ -79,6 +79,7 @@ export default function ChatScreen() {
     pendingMessages,
     canvasData,
     replaceMessageAndGenerate,
+    setExtraContext
   } = useAppContext();
   const [inputMsg, setInputMsg] = useState('');
   const inputRef = useRef<HTMLTextAreaElement>(null);
@@ -88,7 +89,7 @@ export default function ChatScreen() {
     const handleMessage = (event: MessageEvent) => {
       if (event.data?.command === 'setText') {
         setInputMsg(event.data?.text);
-        StorageUtils.setExtraContext(event.data?.context)
+          setExtraContext(event.data?.context)
         inputRef.current?.focus();
       }
     };

examples/server/webui/src/components/ChatScreen.tsx

@@ -44,6 +44,10 @@ interface AppContextValue {
   saveConfig: (config: typeof CONFIG_DEFAULT) => void;
   showSettings: boolean;
   setShowSettings: (show: boolean) => void;
+
+  // extra context
+  extraContext: string;
+  setExtraContext: (extraCtx: string) => void;
 }
 
 // this callback is used for scrolling to the bottom of the chat and switching to the last node
@@ -82,6 +86,7 @@ export const AppContextProvider = ({
   const [config, setConfig] = useState(StorageUtils.getConfig());
   const [canvasData, setCanvasData] = useState<CanvasData | null>(null);
   const [showSettings, setShowSettings] = useState(false);
+  const [extraContext, setExtraContext] = useState("");
 
   // handle change when the convId from URL is changed
   useEffect(() => {
@@ -174,9 +179,8 @@ export const AppContextProvider = ({
           : [{ role: 'system', content: config.systemMessage } as APIMessage]),
         ...normalizeMsgsForAPI(currMessages),
       ];
-      let extraContext:string = await StorageUtils.getExtraContext()
       if (extraContext && extraContext != ""){
-        // insert extra context just after the systemMessage
+        // insert extra context just before the user messages
         messages.splice(config.systemMessage.length === 0 ? 0 : 1, 0, { role: 'user', content:extraContext } as APIMessage)
       }
       if (config.excludeThoughtOnReq) {
@@ -376,6 +380,8 @@ export const AppContextProvider = ({
         saveConfig,
         showSettings,
         setShowSettings,
+        extraContext,
+        setExtraContext,
       }}
     >
       {children}

examples/server/webui/src/utils/app.context.tsx

@@ -21,7 +21,6 @@ const dispatchConversationChange = (convId: string) => {
 const db = new Dexie('LlamacppWebui') as Dexie & {
   conversations: Table<Conversation>;
   messages: Table<Message>;
-  extraContext: string;
 };
 
 // https://dexie.org/docs/Version/Version.stores()
@@ -117,12 +116,6 @@ const StorageUtils = {
     });
     return conv;
   },
-  async setExtraContext(extraContext: string): Promise<void> {
-    db.extraContext = extraContext
-  },
-  async getExtraContext(): Promise<string> {
-    return db.extraContext;
-  },
   /**
    * if convId does not exist, throw an error
    */