Merge branch 'main' into release

JinayJain · Apr 3, 2024 · c80d355 · c80d355
2 parents 59751d8 + 83790be
commit c80d355
Show file tree

Hide file tree

Showing 6 changed files with 557 additions and 353 deletions.
diff --git a/package.json b/package.json
@@ -26,9 +26,9 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^4.8.0",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "^8.0.x",
     "react-syntax-highlighter": "^15.5.0",
-    "rehype-katex": "^7.0.0",
+    "rehype-katex": "^6.0.x",
     "remark-breaks": "^4.0.0",
     "remark-math": "^6.0.0",
     "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store"

diff --git a/src/components/Search.tsx b/src/components/Search.tsx
@@ -89,10 +89,11 @@ function Search({
   }, []);
 
   useEffect(() => {
-    console.log("model changed", model);
     const updateModel = async () => {
       if (model) {
         await store.set(STORE_KEY.MODEL, model);
+        await store.save();
+        console.log("model changed", model);
       }
     };
 

diff --git a/src/pages/App.tsx b/src/pages/App.tsx
@@ -34,35 +34,21 @@ function App() {
 
   const handleGenerate = useCallback(
     async (prompt: string, temperature = 1.0) => {
-      addPrompt(prompt);
+      if (isLoading || !prompt) {
+        return;
+      }
 
-      const NUM_WORDS = 50;
+      setIsLoading(true);
+      setError(null);
 
-      // if (prompt) {
-      //   const chatHistory: ChatMessage[] = [
-      //     ...chatLog,
-      //     { role: "user", text: prompt },
-      //   ];
-      //   addUser(prompt);
-      //   setError(null);
-      //   setIsLoading(true);
-      //   try {
-      //     const response = await chatComplete({
-      //       chat: chatHistory,
-      //       onChunk(chunk) {},
-      //       apiParams: {
-      //         temperature,
-      //       },
-      //     });
-      //     addAssistant(response);
-      //   } catch (e) {
-      //     if (e instanceof Error) {
-      //       setError(e);
-      //     }
-      //     console.log(e);
-      //   }
-      //   setIsLoading(false);
-      // }
+      try {
+        await addPrompt(prompt, temperature);
+      } catch (e) {
+        if (e instanceof Error) {
+          setError(e);
+        }
+      }
+      setIsLoading(false);
     },
     [addPrompt]
   );
@@ -85,24 +71,24 @@ function App() {
       />
 
       <Box overflowY="auto" maxH="100%">
-        {/* {error && (
-            <Box
-              as={motion.div}
-              initial={{ opacity: 0 }}
-              animate={{ opacity: 1 }}
-              exit={{ opacity: 0 }}
-              mb={2}
-              rounded="md"
-              overflow="hidden"
-              background="blackAlpha.800"
-            >
-              {error.message === "Unauthorized" ? (
-                <UnauthorizedErrorBox />
-              ) : (
-                <ErrorBox error={error} />
-              )}
-            </Box>
-          )} */}
+        {error && (
+          <Box
+            as={motion.div}
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            mb={2}
+            rounded="md"
+            overflow="hidden"
+            background="blackAlpha.800"
+          >
+            {error.message === "Unauthorized" ? (
+              <UnauthorizedErrorBox />
+            ) : (
+              <ErrorBox error={error} />
+            )}
+          </Box>
+        )}
 
         <Messages messages={messages} />
 

diff --git a/src/util/ai.ts b/src/util/ai.ts
@@ -18,7 +18,7 @@ export function useChat() {
   const [messages, setMessages] = useState<Message[]>([]);
 
   const addPrompt = useCallback(
-    async (prompt: string) => {
+    async (prompt: string, temperature: number = 1.0) => {
       const model = (await store.get(STORE_KEY.MODEL)) as keyof typeof MODELS;
       const responseId = generateId();
 

diff --git a/src/util/llm.ts b/src/util/llm.ts
@@ -35,10 +35,16 @@ async function processLine(line: string) {
 type SendRequestFn = (
   chat: Message[],
   controller: AbortController,
-  model: string
+  model: string,
+  temperature?: number
 ) => Promise<Response>;
 
-const sendOpenAiApiRequest: SendRequestFn = async (chat, controller, model) => {
+const sendOpenAiApiRequest: SendRequestFn = async (
+  chat,
+  controller,
+  model,
+  temperature
+) => {
   const apiKey = await store.get(STORE_KEY.OPENAI_API_KEY);
   const max_tokens =
     Number(await store.get(STORE_KEY.MAX_TOKENS)) || DEFAULT_MAX_TOKENS;
@@ -69,6 +75,7 @@ const sendOpenAiApiRequest: SendRequestFn = async (chat, controller, model) => {
       ],
       stream: true,
       max_tokens,
+      temperature,
     }),
   });
 };
@@ -168,10 +175,12 @@ async function chatComplete({
   chat,
   onChunk,
   model,
+  temperature = 1.0,
 }: {
   chat: Message[];
   onChunk: (message: string) => void;
   model: string;
+  temperature?: number;
 }) {
   const controller = new AbortController();
 
@@ -182,7 +191,7 @@ async function chatComplete({
     controller.abort();
   }, timeoutSec * 1000);
 
-  const res = await sendOpenAiApiRequest(chat, controller, model);
+  const res = await sendOpenAiApiRequest(chat, controller, model, temperature);
 
   if (!res.ok) {
     if (res.status === 401) {