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

Fix error handling. Not all exceptions from different kind of browser… #112

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix error handling. Not all exceptions from different kind of browser… #112

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95bea7f
Fix error handling. Not all exceptions from different kind of browser…
waterguog42 Mar 16, 2024
92d9eba
Fixing compatibility with Azure OpenAI and upgraded the openai librar…
waterguog42 Mar 16, 2024
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
Next Next commit
Fix error handling. Not all exceptions from different kind of browser… 
…s have toJSON() method
  • Loading branch information
@waterguog42
waterguog42 committed Mar 16, 2024
commit 95bea7fcaf2a9d143091929bffacbd6381365697
4 changes: 2 additions & 2 deletions src/components/ChatItem.tsx
View file
Original file line number Diff line number Diff line change
@@ -23,14 +23,14 @@ export function ChatItem({ chat, isActive }: { chat: Chat, isActive: boolean })
chat.pinned = !chat.pinned;
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
const message = error.message;
if (message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
if (message) {
notifications.show({
title: "Error",
4 changes: 2 additions & 2 deletions src/components/CreatePromptModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -56,14 +56,14 @@ export function CreatePromptModal({ content }: { content?: string }) {
});
close();
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
const message = error.message;
if (message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
if (message) {
notifications.show({
title: "Error",
2 changes: 1 addition & 1 deletion src/components/DeleteChatModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ export function DeleteChatModal({
message: "Chat deleted.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
2 changes: 1 addition & 1 deletion src/components/DeletePromptModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ export function DeletePromptModal({ prompt }: { prompt: Prompt }) {
message: "Chat deleted.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
4 changes: 2 additions & 2 deletions src/components/EditChatModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -37,14 +37,14 @@ export function EditChatModal({
});
close();
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
4 changes: 2 additions & 2 deletions src/components/EditPromptModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -41,14 +41,14 @@ export function EditPromptModal({ prompt }: { prompt: Prompt }) {
message: "Prompt updated",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
22 changes: 11 additions & 11 deletions src/components/SettingsModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -75,14 +75,14 @@ export function SettingsModal({ children }: { children: ReactElement }) {
message: "Your OpenAI Key has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
const message = error.message;
if (message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
if (message) {
notifications.show({
title: "Error",
@@ -141,7 +141,7 @@ export function SettingsModal({ children }: { children: ReactElement }) {
message: "Your OpenAI Type has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
@@ -177,14 +177,14 @@ export function SettingsModal({ children }: { children: ReactElement }) {
message: "Your OpenAI Model has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
@@ -217,14 +217,14 @@ export function SettingsModal({ children }: { children: ReactElement }) {
message: "Your OpenAI Auth has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
@@ -253,14 +253,14 @@ export function SettingsModal({ children }: { children: ReactElement }) {
message: "Your OpenAI Base has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
@@ -301,14 +301,14 @@ export function SettingsModal({ children }: { children: ReactElement }) {
message: "Your OpenAI Version has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
8 changes: 4 additions & 4 deletions src/routes/ChatRoute.tsx
View file
Original file line number Diff line number Diff line change
@@ -174,14 +174,14 @@ export function ChatRoute() {
}
}
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",
@@ -288,14 +288,14 @@ export function ChatRoute() {
message: "Your OpenAI Model has been saved.",
});
} catch (error: any) {
if (error.toJSON().message === "Network Error") {
if (error.message === "Network Error") {
notifications.show({
title: "Error",
color: "red",
message: "No internet connection.",
});
}
const message = error.response?.data?.error?.message;
const message = error.message;
if (message) {
notifications.show({
title: "Error",