fix: empty assistant instruction by default (#855)

* fix: empty assistant instruction by default

* chore: there should be no error dialog for in-app update
This commit is contained in:
Louis 2023-12-05 15:46:18 +07:00 committed by GitHub
parent 27b62ed91a
commit 07fc1a91f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 9 deletions

View File

@ -33,7 +33,6 @@ export function handleAppUpdates() {
/* App Update Error */ /* App Update Error */
autoUpdater.on("error", (info: any) => { autoUpdater.on("error", (info: any) => {
dialog.showMessageBox({ message: info.message });
WindowManager.instance.currentWindow?.webContents.send( WindowManager.instance.currentWindow?.webContents.send(
"APP_UPDATE_ERROR", "APP_UPDATE_ERROR",
{} {}

View File

@ -96,7 +96,7 @@ export default class JanAssistantExtension implements AssistantExtension {
name: "Jan", name: "Jan",
description: "A default assistant that can use all downloaded models", description: "A default assistant that can use all downloaded models",
model: "*", model: "*",
instructions: "Your name is Jan.", instructions: "",
tools: undefined, tools: undefined,
file_ids: [], file_ids: [],
metadata: undefined, metadata: undefined,

View File

@ -59,6 +59,7 @@ export default function useSendChatMessage() {
const messages: ChatCompletionMessage[] = [ const messages: ChatCompletionMessage[] = [
activeThread.assistants[0]?.instructions, activeThread.assistants[0]?.instructions,
] ]
.filter((e) => e && e.trim() !== '')
.map<ChatCompletionMessage>((instructions) => { .map<ChatCompletionMessage>((instructions) => {
const systemMessage: ChatCompletionMessage = { const systemMessage: ChatCompletionMessage = {
role: ChatCompletionRole.System, role: ChatCompletionRole.System,
@ -138,6 +139,7 @@ export default function useSendChatMessage() {
const messages: ChatCompletionMessage[] = [ const messages: ChatCompletionMessage[] = [
activeThread.assistants[0]?.instructions, activeThread.assistants[0]?.instructions,
] ]
.filter((e) => e && e.trim() !== '')
.map<ChatCompletionMessage>((instructions) => { .map<ChatCompletionMessage>((instructions) => {
const systemMessage: ChatCompletionMessage = { const systemMessage: ChatCompletionMessage = {
role: ChatCompletionRole.System, role: ChatCompletionRole.System,

View File

@ -13,13 +13,14 @@ import { twMerge } from 'tailwind-merge'
import { toaster } from '@/containers/Toast' import { toaster } from '@/containers/Toast'
import useSendChatMessage from '@/hooks/useSendChatMessage'
import { extensionManager } from '@/extension' import { extensionManager } from '@/extension'
import { import {
deleteMessageAtom, deleteMessageAtom,
getCurrentChatMessagesAtom, getCurrentChatMessagesAtom,
} from '@/helpers/atoms/ChatMessage.atom' } from '@/helpers/atoms/ChatMessage.atom'
import { activeThreadAtom } from '@/helpers/atoms/Conversation.atom' import { activeThreadAtom } from '@/helpers/atoms/Conversation.atom'
import useSendChatMessage from '@/hooks/useSendChatMessage'
const MessageToolbar = ({ message }: { message: ThreadMessage }) => { const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
const deleteMessage = useSetAtom(deleteMessageAtom) const deleteMessage = useSetAtom(deleteMessageAtom)
@ -82,12 +83,14 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
> >
<Copy size={14} /> <Copy size={14} />
</div> </div>
{message.status === MessageStatus.Ready && (
<div <div
className="cursor-pointer px-2 py-2 hover:bg-background/80" className="cursor-pointer px-2 py-2 hover:bg-background/80"
onClick={onDeleteClick} onClick={onDeleteClick}
> >
<Trash2Icon size={14} /> <Trash2Icon size={14} />
</div> </div>
)}
</div> </div>
</div> </div>
) )