Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: display default error message #2533

Merged
merged 1 commit into from
Mar 29, 2024
Merged

fix: display default error message #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/src/browser/extensions/engines/OAIEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 100,20 @@ export abstract class OAIEngine extends AIEngine {
events.emit(MessageEvent.OnMessageUpdate, message)
},
error: async (err: any) => {
console.error(`Inference error: ${JSON.stringify(err, null, 2)}`)
if (this.isCancelled || message.content.length) {
message.status = MessageStatus.Stopped
events.emit(MessageEvent.OnMessageUpdate, message)
return
}
message.status = MessageStatus.Error
message.content[0] = {
type: ContentType.Text,
text: {
value: err.message,
annotations: [],
},
}
message.error_code = err.code
events.emit(MessageEvent.OnMessageUpdate, message)
},
Expand Down
2 changes: 2 additions & 0 deletions core/src/types/message/messageEntity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 83,8 @@ export enum MessageStatus {
export enum ErrorCode {
InvalidApiKey = 'invalid_api_key',

InsufficientQuota = 'insufficient_quota',

Unknown = 'unknown',
}

Expand Down
34 changes: 34 additions & 0 deletions web/containers/AutoLink/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,34 @@
import React from 'react'

type Props = {
text: string
}

const AutoLink: React.FC<Props> = ({ text }) => {
const delimiter =
/((?:https?:\/\/)?(?:(?:[a-z0-9]?(?:[a-z0-9-]{1,61}[a-z0-9])?\.[^.|\s]) [a-z.]*[a-z] |(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})(?::\d{1,5})*[a-z0-9.,_/~#&=;% ?\-\\(\\)]*)/gi

return (
<>
{text.split(delimiter).map((word) => {
const match = word.match(delimiter)
if (match) {
const url = match[0]
return (
<a
key={url}
target="blank"
href={url.startsWith('http') ? url : `http://${url}`}
className="text-blue-400"
>
{url}
</a>
)
}
return word
})}
</>
)
}

export default React.memo(AutoLink)
14 changes: 8 additions & 6 deletions web/screens/Chat/ErrorMessage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 3,7 @@ import { Button } from '@janhq/uikit'
import { useAtomValue, useSetAtom } from 'jotai'
import { RefreshCcw } from 'lucide-react'

import AutoLink from '@/containers/AutoLink'
import ModalTroubleShooting, {
modalTroubleShootingAtom,
} from '@/containers/ModalTroubleShoot'
Expand Down Expand Up @@ -31,10 32,11 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
resendChatMessage(message)
}

const errorTitle = getErrorTitle(
message.error_code ?? ErrorCode.Unknown,
message.content[0]?.text?.value
)
const errorTitle =
getErrorTitle(
message.error_code ?? ErrorCode.Unknown,
message.content[0]?.text?.value
) ?? 'Unknown error occurred.'

return (
<div className="mt-10">
Expand Down Expand Up @@ -95,9 97,9 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
) : (
<div
key={message.id}
className="flex flex-col items-center text-center text-sm font-medium text-gray-500"
className="mx-6 flex flex-col items-center space-y-2 text-center text-sm font-medium text-gray-500"
>
<p>{errorTitle}</p>
<AutoLink text={errorTitle} />
<p>
Jan’s in beta. Access&nbsp;
<span
Expand Down
Loading