fix: empty assistant instruction by default

janhq · Dec 5, 2023 · 6ab908f · 6ab908f
1 parent 27b62ed
commit 6ab908f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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>
   )