From 07fc1a91f3e568de7d6dd58ec2db1917f3501a76 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Tue, 5 Dec 2023 15:46:18 +0700
Subject: [PATCH] fix: empty assistant instruction by default (#855)

* fix: empty assistant instruction by default

* chore: there should be no error dialog for in-app update
---
 electron/handlers/update.ts                 |  1 -
 extensions/assistant-extension/src/index.ts |  2 +-
 web/hooks/useSendChatMessage.ts             |  2 ++
 web/screens/Chat/MessageToolbar/index.tsx   | 17 ++++++++++-------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/electron/handlers/update.ts b/electron/handlers/update.ts
index 08d32fffe..667acca95 100644
--- a/electron/handlers/update.ts
+++ b/electron/handlers/update.ts
@@ -33,7 +33,6 @@ export function handleAppUpdates() {
 
   /* App Update Error */
   autoUpdater.on("error", (info: any) => {
-    dialog.showMessageBox({ message: info.message });
     WindowManager.instance.currentWindow?.webContents.send(
       "APP_UPDATE_ERROR",
       {}
diff --git a/extensions/assistant-extension/src/index.ts b/extensions/assistant-extension/src/index.ts
index 8d01021b7..3e1ab4898 100644
--- a/extensions/assistant-extension/src/index.ts
+++ b/extensions/assistant-extension/src/index.ts
@@ -96,7 +96,7 @@ export default class JanAssistantExtension implements AssistantExtension {
       name: "Jan",
       description: "A default assistant that can use all downloaded models",
       model: "*",
-      instructions: "Your name is Jan.",
+      instructions: "",
       tools: undefined,
       file_ids: [],
       metadata: undefined,
diff --git a/web/hooks/useSendChatMessage.ts b/web/hooks/useSendChatMessage.ts
index 8b9a1bada..3e4a8f026 100644
--- a/web/hooks/useSendChatMessage.ts
+++ b/web/hooks/useSendChatMessage.ts
@@ -59,6 +59,7 @@ export default function useSendChatMessage() {
     const messages: ChatCompletionMessage[] = [
       activeThread.assistants[0]?.instructions,
     ]
+      .filter((e) => e && e.trim() !== '')
       .map<ChatCompletionMessage>((instructions) => {
         const systemMessage: ChatCompletionMessage = {
           role: ChatCompletionRole.System,
@@ -138,6 +139,7 @@ export default function useSendChatMessage() {
     const messages: ChatCompletionMessage[] = [
       activeThread.assistants[0]?.instructions,
     ]
+      .filter((e) => e && e.trim() !== '')
       .map<ChatCompletionMessage>((instructions) => {
         const systemMessage: ChatCompletionMessage = {
           role: ChatCompletionRole.System,
diff --git a/web/screens/Chat/MessageToolbar/index.tsx b/web/screens/Chat/MessageToolbar/index.tsx
index a0929336c..e5f3c245f 100644
--- a/web/screens/Chat/MessageToolbar/index.tsx
+++ b/web/screens/Chat/MessageToolbar/index.tsx
@@ -13,13 +13,14 @@ import { twMerge } from 'tailwind-merge'
 
 import { toaster } from '@/containers/Toast'
 
+import useSendChatMessage from '@/hooks/useSendChatMessage'
+
 import { extensionManager } from '@/extension'
 import {
   deleteMessageAtom,
   getCurrentChatMessagesAtom,
 } from '@/helpers/atoms/ChatMessage.atom'
 import { activeThreadAtom } from '@/helpers/atoms/Conversation.atom'
-import useSendChatMessage from '@/hooks/useSendChatMessage'
 
 const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
   const deleteMessage = useSetAtom(deleteMessageAtom)
@@ -82,12 +83,14 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
         >
           <Copy size={14} />
         </div>
-        <div
-          className="cursor-pointer px-2 py-2 hover:bg-background/80"
-          onClick={onDeleteClick}
-        >
-          <Trash2Icon size={14} />
-        </div>
+        {message.status === MessageStatus.Ready && (
+          <div
+            className="cursor-pointer px-2 py-2 hover:bg-background/80"
+            onClick={onDeleteClick}
+          >
+            <Trash2Icon size={14} />
+          </div>
+        )}
       </div>
     </div>
   )