From 5ba486792ab72212ee0f7e2096a3853f59bf9523 Mon Sep 17 00:00:00 2001
From: an-lee <an.lee.work@gmail.com>
Date: Mon, 22 Apr 2024 16:51:20 +0800
Subject: [PATCH] Improve ux (#558)

* clear content once message sent

* do not retry when tts failed
---
 enjoy/src/renderer/hooks/use-conversation.tsx | 7 +++++--
 enjoy/src/renderer/pages/conversation.tsx     | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/enjoy/src/renderer/hooks/use-conversation.tsx b/enjoy/src/renderer/hooks/use-conversation.tsx
index 99594d54..c93f4c4f 100644
--- a/enjoy/src/renderer/hooks/use-conversation.tsx
+++ b/enjoy/src/renderer/hooks/use-conversation.tsx
@@ -73,7 +73,8 @@ export const useConversation = () => {
         maxRetries: 2,
       });
     } else if (conversation.engine === "googleGenerativeAi") {
-      if (!googleGenerativeAi) throw new Error("Google Generative AI API key is required");
+      if (!googleGenerativeAi)
+        throw new Error("Google Generative AI API key is required");
 
       return new ChatGoogleGenerativeAI({
         apiKey: googleGenerativeAi.key,
@@ -157,7 +158,7 @@ export const useConversation = () => {
 
     const llm = pickLlm(conversation);
     const chain = new ConversationChain({
-      llm,
+      llm: llm as any,
       memory,
       prompt,
       verbose: true,
@@ -240,12 +241,14 @@ export const useConversation = () => {
         apiKey: user.accessToken,
         baseURL: `${apiUrl}/api/ai`,
         dangerouslyAllowBrowser: true,
+        maxRetries: 1,
       });
     } else if (openai) {
       client = new OpenAI({
         apiKey: openai.key,
         baseURL: baseUrl || openai.baseUrl,
         dangerouslyAllowBrowser: true,
+        maxRetries: 1,
       });
     } else {
       throw new Error("OpenAI API key is required");
diff --git a/enjoy/src/renderer/pages/conversation.tsx b/enjoy/src/renderer/pages/conversation.tsx
index 6be3604f..89fdac93 100644
--- a/enjoy/src/renderer/pages/conversation.tsx
+++ b/enjoy/src/renderer/pages/conversation.tsx
@@ -129,9 +129,9 @@ export default () => {
       })
       .finally(() => {
         setSubmitting(false);
-        setContent("");
         clearTimeout(timeout);
       });
+    setContent("");
   };
 
   const onMessagesUpdate = (event: CustomEvent) => {
@@ -314,7 +314,6 @@ export default () => {
           <div className="focus-within:bg-background pr-4 py-2 flex items-end space-x-4 rounded-lg shadow-lg border scrollbar">
             <Textarea
               ref={inputRef}
-              disabled={submitting}
               value={content}
               onChange={(e) => setContent(e.target.value)}
               placeholder={t("pressEnterToSend")}
@@ -328,6 +327,8 @@ export default () => {
                 disabled={submitting || !content}
                 data-testid="conversation-page-submit"
                 onClick={() => handleSubmit(content)}
+                data-tooltip-id="global-tooltip"
+                data-tooltip-content={t("send")}
                 className="h-10"
               >
                 <SendIcon className="w-5 h-5" />