diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 9c7b7e6f1..38c272e85 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -1,5 +1,8 @@ name: Upstream Sync +permissions: + contents: write + on: schedule: - cron: "0 */6 * * *" # every 6 hours @@ -12,7 +15,7 @@ jobs: if: ${{ github.event.repository.fork }} steps: - # Step 1: run a standard checkout action, provided by github + # Step 1: run a standard checkout action - name: Checkout target repo uses: actions/checkout@v3 diff --git a/README.md b/README.md index 815aba1af..40386a005 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ One-Click to deploy your own ChatGPT web UI. - 在 1 分钟内使用 Vercel **免费一键部署** - 精心设计的 UI，响应式设计，支持深色模式 -- 极快的首屏加载速度（~85kb） +- 极快的首屏加载速度（~100kb） - 海量的内置 prompt 列表，来自[中文](https://github.com/PlexPt/awesome-chatgpt-prompts-zh)和[英文](https://github.com/f/awesome-chatgpt-prompts) - 自动压缩上下文聊天记录，在节省 Token 的同时支持超长对话 - 一键导出聊天记录，完整的 Markdown 支持 @@ -31,7 +31,7 @@ One-Click to deploy your own ChatGPT web UI. - **Deploy for free with one-click** on Vercel in under 1 minute - Responsive design, and dark mode -- Fast first screen loading speed (~85kb) +- Fast first screen loading speed (~100kb) - Awesome prompts powered by [awesome-chatgpt-prompts-zh](https://github.com/PlexPt/awesome-chatgpt-prompts-zh) and [awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt-prompts) - Automatically compresses chat history to support long conversations while also saving your tokens - One-click export all chat history with full Markdown support @@ -74,7 +74,9 @@ One-Click to deploy your own ChatGPT web UI. - 前往 vercel 控制台，删除掉原先的 project，然后新建 project，选择你刚刚 fork 出来的项目重新进行部署即可； - 在重新部署的过程中，请手动添加名为 `OPENAI_API_KEY` 的环境变量，并填入你的 api key 作为值。 -本项目会持续更新，如果你想让代码库总是保持更新，可以查看 [Github 的文档](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) 了解如何让 fork 的项目与上游代码同步，建议定期进行同步操作以获得新功能。 +本项目会持续更新，当你 Fork 项目之后，默认会每天自动同步上游代码，无需额外操作。 + +如果你想让手动立即更新，可以查看 [Github 的文档](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) 了解如何让 fork 的项目与上游代码同步。 你可以 star/watch 本项目或者 follow 作者来及时获得新功能更新通知。 @@ -87,7 +89,9 @@ We recommend that you follow the steps below to re-deploy: - Go to the Vercel dashboard, delete the original project, then create a new project and select the project you just forked to redeploy; - Please manually add an environment variable named `OPENAI_API_KEY` and enter your API key as the value during the redeploy process. -This project will be continuously maintained. If you want to keep the code repository up to date, you can check out the [Github documentation](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to learn how to synchronize a forked project with upstream code. It is recommended to perform synchronization operations regularly. +This project will be continuously updated, and after forking the project, the upstream code will be automatically synchronized every day without additional operations. + +If you want to update instantly, you can check out the [Github documentation](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) to learn how to synchronize a forked project with upstream code. You can star or watch this project or follow author to get release notifictions in time. diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 94ae484ce..ebd383845 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -12,14 +12,7 @@ import BotIcon from "../icons/bot.svg"; import AddIcon from "../icons/add.svg"; import DeleteIcon from "../icons/delete.svg"; -import { - Message, - SubmitKey, - useChatStore, - ChatSession, - BOT_HELLO, - ROLES, -} from "../store"; +import { Message, SubmitKey, useChatStore, BOT_HELLO, ROLES } from "../store"; import { copyToClipboard, @@ -378,7 +371,8 @@ export function Chat(props: {}) { chatStore.onUserInput(userInput).then(() => setIsLoading(false)); setUserInput(""); setPromptHints([]); - inputRef.current?.focus(); + if (!isMobileScreen()) inputRef.current?.focus(); + setAutoScroll(true); }; // stop response @@ -514,7 +508,10 @@ export function Chat(props: {}) { bordered title={Locale.Chat.Actions.Export} onClick={() => { - exportMessages(session.messages, session.topic); + exportMessages( + session.messages.filter((msg) => !msg.isError), + session.topic, + ); }} /> @@ -531,7 +528,11 @@ export function Chat(props: {}) { className={styles["chat-body"]} ref={scrollRef} onScroll={(e) => onChatBodyScroll(e.currentTarget)} - onTouchStart={() => inputRef.current?.blur()} + onWheel={(e) => setAutoScroll(hitBottom && e.deltaY > 0)} + onTouchStart={() => { + inputRef.current?.blur(); + setAutoScroll(false); + }} > {messages.map((message, i) => { const isUser = message.role === "user"; @@ -592,7 +593,6 @@ export function Chat(props: {}) { if (!isMobileScreen()) return; setUserInput(message.content); }} - onMouseOver={() => inputRef.current?.blur()} > @@ -627,9 +627,6 @@ export function Chat(props: {}) { setAutoScroll(false); setTimeout(() => setPromptHints([]), 500); }} - onMouseOver={() => { - inputRef.current?.focus(); - }} autoFocus={sidebarCollapse} /> { + constructor(props: any) { + super(props); + this.state = { hasError: false, error: null, info: null }; + } + + componentDidCatch(error: Error, info: React.ErrorInfo) { + // Update state with error details + this.setState({ hasError: true, error, info }); + } + + render() { + if (this.state.hasError) { + // Render error message + return ( +
+

Oops, something went wrong!

+ 
+            {this.state.error?.toString()}
+            {this.state.info?.componentStack}
+
+ + + } + bordered + /> + +
+ ); + } + // if no error occurred, render children + return this.props.children; + } +} diff --git a/app/components/home.tsx b/app/components/home.tsx index 631fd7918..91e0fe33c 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -1,5 +1,6 @@ "use client"; +require("../polyfill"); import { useState, useEffect } from "react"; import { IconButton } from "./button"; @@ -8,7 +9,6 @@ import styles from "./home.module.scss"; import SettingsIcon from "../icons/settings.svg"; import GithubIcon from "../icons/github.svg"; import ChatGptIcon from "../icons/chatgpt.svg"; -import DeleteIcon from "../icons/delete.svg"; import BotIcon from "../icons/bot.svg"; import AddIcon from "../icons/add.svg"; import LoadingIcon from "../icons/three-dots.svg"; @@ -24,6 +24,7 @@ import { Chat } from "./chat"; import dynamic from "next/dynamic"; import { REPO_URL } from "../constant"; +import { ErrorBoundary } from "./error"; import type { Prompt } from "../store/prompt"; @@ -137,7 +138,7 @@ const useHasHydrated = () => { return hasHydrated; }; -export function Home() { +function _Home() { const [createNewSession, currentIndex, removeSession] = useChatStore( (state) => [ state.newSession, @@ -333,3 +334,11 @@ export function Home() { ); } + +export function Home() { + return ( + + <_Home> + + ); +} diff --git a/app/components/settings.module.scss b/app/components/settings.module.scss index ad994f68d..7d40d83b8 100644 --- a/app/components/settings.module.scss +++ b/app/components/settings.module.scss @@ -18,3 +18,12 @@ .avatar { cursor: pointer; } + +.password-input { + display: flex; + justify-content: flex-end; + + .password-eye { + margin-right: 4px; + } +} diff --git a/app/components/settings.tsx b/app/components/settings.tsx index 4c5adb86b..4645f3191 100644 --- a/app/components/settings.tsx +++ b/app/components/settings.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useRef, useMemo } from "react"; +import { useState, useEffect, useMemo, HTMLProps } from "react"; import EmojiPicker, { Theme as EmojiTheme } from "emoji-picker-react"; @@ -8,6 +8,8 @@ import ResetIcon from "../icons/reload.svg"; import CloseIcon from "../icons/close.svg"; import ClearIcon from "../icons/clear.svg"; import EditIcon from "../icons/edit.svg"; +import EyeIcon from "../icons/eye.svg"; +import EyeOffIcon from "../icons/eye-off.svg"; import { List, ListItem, Popover, showToast } from "./ui-lib"; @@ -19,6 +21,7 @@ import { ALL_MODELS, useUpdateStore, useAccessStore, + ModalConfigValidator, } from "../store"; import { Avatar } from "./chat"; @@ -28,6 +31,7 @@ import Link from "next/link"; import { UPDATE_URL } from "../constant"; import { SearchService, usePromptStore } from "../store/prompt"; import { requestUsage } from "../requests"; +import { ErrorBoundary } from "./error"; function SettingItem(props: { title: string; @@ -47,6 +51,25 @@ function SettingItem(props: { ); } +function PasswordInput(props: HTMLProps) { + const [visible, setVisible] = useState(false); + + function changeVisibility() { + setVisible(!visible); + } + + return ( +
+ : } + onClick={changeVisibility} + className={styles["password-eye"]} + /> + +
+ ); +} + export function Settings(props: { closeSettings: () => void }) { const [showEmojiPicker, setShowEmojiPicker] = useState(false); const [config, updateConfig, resetConfig, clearAllData, clearSessions] = @@ -91,11 +114,13 @@ export function Settings(props: { closeSettings: () => void }) { useEffect(() => { checkUpdate(); checkUsage(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); const accessStore = useAccessStore(); const enabledAccessControl = useMemo( () => accessStore.enabledAccessControl(), + // eslint-disable-next-line react-hooks/exhaustive-deps [], ); @@ -103,8 +128,15 @@ export function Settings(props: { closeSettings: () => void }) { const builtinCount = SearchService.count.builtin; const customCount = promptStore.prompts.size ?? 0; + const showUsage = accessStore.token !== ""; + useEffect(() => { + if (showUsage) { + checkUsage(); + } + }, [showUsage]); + return ( - <> +
@@ -327,14 +359,14 @@ export function Settings(props: { closeSettings: () => void }) { title={Locale.Settings.AccessCode.Title} subTitle={Locale.Settings.AccessCode.SubTitle} > - { accessStore.updateCode(e.currentTarget.value); }} - > + /> ) : ( <> @@ -344,25 +376,27 @@ export function Settings(props: { closeSettings: () => void }) { title={Locale.Settings.Token.Title} subTitle={Locale.Settings.Token.SubTitle} > - { accessStore.updateToken(e.currentTarget.value); }} - > + /> - {loadingUsage ? ( + {!showUsage || loadingUsage ? (
) : ( void }) { onChange={(e) => { updateConfig( (config) => - (config.modelConfig.model = e.currentTarget.value), + (config.modelConfig.model = ModalConfigValidator.model( + e.currentTarget.value, + )), ); }} > @@ -437,7 +473,7 @@ export function Settings(props: { closeSettings: () => void }) { > void }) { updateConfig( (config) => (config.modelConfig.temperature = - e.currentTarget.valueAsNumber), + ModalConfigValidator.temperature( + e.currentTarget.valueAsNumber, + )), ); }} > @@ -457,13 +495,15 @@ export function Settings(props: { closeSettings: () => void }) { updateConfig( (config) => (config.modelConfig.max_tokens = - e.currentTarget.valueAsNumber), + ModalConfigValidator.max_tokens( + e.currentTarget.valueAsNumber, + )), ) } > @@ -474,7 +514,7 @@ export function Settings(props: { closeSettings: () => void }) { > void }) { updateConfig( (config) => (config.modelConfig.presence_penalty = - e.currentTarget.valueAsNumber), + ModalConfigValidator.presence_penalty( + e.currentTarget.valueAsNumber, + )), ); }} >
- + ); } diff --git a/app/constant.ts b/app/constant.ts index fff77607e..169a5eee5 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -1,6 +1,7 @@ export const OWNER = "Yidadaa"; export const REPO = "ChatGPT-Next-Web"; export const REPO_URL = `https://github.com/${OWNER}/${REPO}`; +export const ISSUE_URL = `https://github.com/${OWNER}/${REPO}/issues`; export const UPDATE_URL = `${REPO_URL}#%E4%BF%9D%E6%8C%81%E6%9B%B4%E6%96%B0-keep-updated`; export const FETCH_COMMIT_URL = `https://api.github.com/repos/${OWNER}/${REPO}/commits?per_page=1`; export const FETCH_TAG_URL = `https://api.github.com/repos/${OWNER}/${REPO}/tags?per_page=1`; diff --git a/app/icons/eye-off.svg b/app/icons/eye-off.svg new file mode 100644 index 000000000..a0a44f7ac --- /dev/null +++ b/app/icons/eye-off.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/icons/eye.svg b/app/icons/eye.svg new file mode 100644 index 000000000..b5df29d5b --- /dev/null +++ b/app/icons/eye.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/locales/cn.ts b/app/locales/cn.ts index a0e1da7a2..49bcce235 100644 --- a/app/locales/cn.ts +++ b/app/locales/cn.ts @@ -58,6 +58,7 @@ const cn = { en: "English", tw: "繁體中文", es: "Español", + it: "Italiano", }, }, Avatar: "头像", @@ -108,6 +109,7 @@ const cn = { }, IsChecking: "正在检查…", Check: "重新检查", + NoAccess: "输入API Key查看余额", }, AccessCode: { Title: "访问码", diff --git a/app/locales/en.ts b/app/locales/en.ts index 06a39765c..ae8e88c2d 100644 --- a/app/locales/en.ts +++ b/app/locales/en.ts @@ -60,6 +60,7 @@ const en: LocaleType = { en: "English", tw: "繁體中文", es: "Español", + it: "Italiano", }, }, Avatar: "Avatar", @@ -110,6 +111,7 @@ const en: LocaleType = { }, IsChecking: "Checking...", Check: "Check Again", + NoAccess: "Enter API Key to check balance", }, AccessCode: { Title: "Access Code", diff --git a/app/locales/es.ts b/app/locales/es.ts index 42d65d319..f3714ef3b 100644 --- a/app/locales/es.ts +++ b/app/locales/es.ts @@ -60,6 +60,7 @@ const es: LocaleType = { en: "Inglés", tw: "繁體中文", es: "Español", + it: "Italiano", }, }, Avatar: "Avatar", @@ -110,6 +111,7 @@ const es: LocaleType = { }, IsChecking: "Comprobando...", Check: "Comprobar de nuevo", + NoAccess: "Introduzca la clave API para comprobar el saldo", }, AccessCode: { Title: "Código de acceso", diff --git a/app/locales/index.ts b/app/locales/index.ts index dd9b74d64..5c41eeb77 100644 --- a/app/locales/index.ts +++ b/app/locales/index.ts @@ -2,10 +2,11 @@ import CN from "./cn"; import EN from "./en"; import TW from "./tw"; import ES from "./es"; +import IT from "./it"; export type { LocaleType } from "./cn"; -export const AllLangs = ["cn", "tw", "en", "es"] as const; +export const AllLangs = ["en", "cn", "tw", "es", "it"] as const; type Lang = (typeof AllLangs)[number]; const LANG_KEY = "lang"; @@ -47,6 +48,8 @@ export function getLang(): Lang { return "tw"; } else if (lang.includes("es")) { return "es"; + } else if (lang.includes("it")) { + return "it"; } else { return "en"; } @@ -57,4 +60,4 @@ export function changeLang(lang: Lang) { location.reload(); } -export default { en: EN, cn: CN, tw: TW, es: ES }[getLang()]; +export default { en: EN, cn: CN, tw: TW, es: ES, it: IT }[getLang()]; diff --git a/app/locales/it.ts b/app/locales/it.ts new file mode 100644 index 000000000..c4736c1e0 --- /dev/null +++ b/app/locales/it.ts @@ -0,0 +1,165 @@ +import { SubmitKey } from "../store/app"; +import type { LocaleType } from "./index"; + +const it: LocaleType = { + WIP: "Work in progress...", + Error: { + Unauthorized: + "Accesso non autorizzato, inserire il codice di accesso nella pagina delle impostazioni.", + }, + ChatItem: { + ChatItemCount: (count: number) => `${count} messaggi`, + }, + Chat: { + SubTitle: (count: number) => `${count} messaggi con ChatGPT`, + Actions: { + ChatList: "Vai alla Chat List", + CompressedHistory: "Prompt di memoria della cronologia compressa", + Export: "Esportazione di tutti i messaggi come Markdown", + Copy: "Copia", + Stop: "Stop", + Retry: "Riprova", + }, + Rename: "Rinomina Chat", + Typing: "Typing…", + Input: (submitKey: string) => { + var inputHints = `Scrivi qualcosa e premi ${submitKey} per inviare`; + if (submitKey === String(SubmitKey.Enter)) { + inputHints += ", premi Shift + Enter per andare a capo"; + } + return inputHints; + }, + Send: "Invia", + }, + Export: { + Title: "Tutti i messaggi", + Copy: "Copia tutto", + Download: "Scarica", + }, + Memory: { + Title: "Prompt di memoria", + EmptyContent: "Vuoto.", + Copy: "Copia tutto", + }, + Home: { + NewChat: "Nuova Chat", + DeleteChat: "Confermare la cancellazione della conversazione selezionata?", + }, + Settings: { + Title: "Impostazioni", + SubTitle: "Tutte le impostazioni", + Actions: { + ClearAll: "Cancella tutti i dati", + ResetAll: "Resetta tutte le impostazioni", + Close: "Chiudi", + }, + Lang: { + Name: "Lingue", + Options: { + cn: "简体中文", + en: "English", + tw: "繁體中文", + es: "Español", + it: "Italiano", + }, + }, + Avatar: "Avatar", + FontSize: { + Title: "Dimensione carattere", + SubTitle: "Regolare la dimensione dei caratteri del contenuto della chat", + }, + Update: { + Version: (x: string) => `Versione: ${x}`, + IsLatest: "Ultima versione", + CheckUpdate: "Controlla aggiornamenti", + IsChecking: "Sto controllando gli aggiornamenti...", + FoundUpdate: (x: string) => `Trovata nuova versione: ${x}`, + GoToUpdate: "Aggiorna", + }, + SendKey: "Tasto invia", + Theme: "tema", + TightBorder: "Bordi stretti", + SendPreviewBubble: "Invia l'anteprima della bolla", + Prompt: { + Disable: { + Title: "Disabilita l'auto completamento", + SubTitle: "Input / per attivare il completamento automatico", + }, + List: "Elenco dei suggerimenti", + ListCount: (builtin: number, custom: number) => + `${builtin} built-in, ${custom} user-defined`, + Edit: "Modifica", + }, + HistoryCount: { + Title: "Conteggio dei messaggi allegati", + SubTitle: "Numero di messaggi inviati allegati per richiesta", + }, + CompressThreshold: { + Title: "Soglia di compressione della cronologia", + SubTitle: + "Comprimerà se la lunghezza dei messaggi non compressi supera il valore", + }, + Token: { + Title: "Chiave API", + SubTitle: + "Utilizzare la chiave per ignorare il limite del codice di accesso", + Placeholder: "OpenAI API Key", + }, + Usage: { + Title: "Bilancio Account", + SubTitle(used: any) { + return `Usato in questo mese $${used}`; + }, + IsChecking: "Controllando...", + Check: "Controlla ancora", + NoAccess: "Inserire la chiave API per controllare il saldo", + }, + AccessCode: { + Title: "Codice d'accesso", + SubTitle: "Controllo d'accesso abilitato", + Placeholder: "Inserisci il codice d'accesso", + }, + Model: "Modello GPT", + Temperature: { + Title: "Temperature", + SubTitle: "Un valore maggiore rende l'output più casuale", + }, + MaxTokens: { + Title: "Token massimi", + SubTitle: "Lunghezza massima dei token in ingresso e dei token generati", + }, + PresencePenlty: { + Title: "Penalità di presenza", + SubTitle: + "Un valore maggiore aumenta la probabilità di parlare di nuovi argomenti", + }, + }, + Store: { + DefaultTopic: "Nuova conversazione", + BotHello: "Ciao, come posso aiutarti oggi?", + Error: "Qualcosa è andato storto, riprova più tardi.", + Prompt: { + History: (content: string) => + "Questo è un riassunto della cronologia delle chat tra l'IA e l'utente:" + + content, + Topic: + "Si prega di generare un titolo di quattro o cinque parole che riassuma la nostra conversazione senza alcuna traccia, punteggiatura, virgolette, punti, simboli o testo aggiuntivo. Rimuovere le virgolette", + Summarize: + "Riassumi brevemente la nostra discussione in 200 caratteri o meno per usarla come spunto per una futura conversazione.", + }, + ConfirmClearAll: + "Confermi la cancellazione di tutti i dati della chat e delle impostazioni?", + }, + Copy: { + Success: "Copiato sugli appunti", + Failed: + "Copia fallita, concedere l'autorizzazione all'accesso agli appunti", + }, + Context: { + Toast: (x: any) => `Con ${x} prompts contestuali`, + Edit: "Prompt contestuali e di memoria", + Add: "Aggiungi altro", + }, +}; + +export default it; diff --git a/app/locales/tw.ts b/app/locales/tw.ts index 44f65adbf..fff2f15dc 100644 --- a/app/locales/tw.ts +++ b/app/locales/tw.ts @@ -59,6 +59,7 @@ const tw: LocaleType = { en: "English", tw: "繁體中文", es: "Español", + it: "Italiano", }, }, Avatar: "大頭貼", @@ -108,6 +109,7 @@ const tw: LocaleType = { }, IsChecking: "正在檢查…", Check: "重新檢查", + NoAccess: "輸入API Key查看餘額", }, AccessCode: { Title: "訪問碼", diff --git a/app/page.tsx b/app/page.tsx index 2ad763cec..1d1da2227 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,7 +1,5 @@ import { Analytics } from "@vercel/analytics/react"; -import "array.prototype.at"; - import { Home } from "./components/home"; export default function App() { diff --git a/app/polyfill.ts b/app/polyfill.ts new file mode 100644 index 000000000..517f06e7c --- /dev/null +++ b/app/polyfill.ts @@ -0,0 +1,27 @@ +declare global { + interface Array { + at(index: number): T | undefined; + } +} + +if (!Array.prototype.at) { + Array.prototype.at = function (index: number) { + // Get the length of the array + const length = this.length; + + // Convert negative index to a positive index + if (index < 0) { + index = length + index; + } + + // Return undefined if the index is out of range + if (index < 0 || index >= length) { + return undefined; + } + + // Use Array.prototype.slice method to get value at the specified index + return Array.prototype.slice.call(this, index, index + 1)[0]; + }; +} + +export {}; diff --git a/app/requests.ts b/app/requests.ts index 479110f70..4c8ac081a 100644 --- a/app/requests.ts +++ b/app/requests.ts @@ -1,5 +1,5 @@ import type { ChatRequest, ChatReponse } from "./api/openai/typing"; -import { filterConfig, Message, ModelConfig, useAccessStore } from "./store"; +import { Message, ModelConfig, useAccessStore } from "./store"; import Locale from "./locales"; import { showToast } from "./components/ui-lib"; @@ -118,7 +118,7 @@ export async function requestChatStream( filterBot?: boolean; modelConfig?: ModelConfig; onMessage: (message: string, done: boolean) => void; - onError: (error: Error) => void; + onError: (error: Error, statusCode?: number) => void; onController?: (controller: AbortController) => void; }, ) { @@ -127,11 +127,6 @@ export async function requestChatStream( filterBot: options?.filterBot, }); - // valid and assign model config - if (options?.modelConfig) { - Object.assign(req, filterConfig(options.modelConfig)); - } - console.log("[Request] ", req); const controller = new AbortController(); @@ -182,11 +177,10 @@ export async function requestChatStream( finish(); } else if (res.status === 401) { console.error("Anauthorized"); - responseText = Locale.Error.Unauthorized; - finish(); + options?.onError(new Error("Anauthorized"), res.status); } else { console.error("Stream Error", res.body); - options?.onError(new Error("Stream Error")); + options?.onError(new Error("Stream Error"), res.status); } } catch (err) { console.error("NetWork Error", err); diff --git a/app/store/app.ts b/app/store/app.ts index 4d4c3743e..8813a4dde 100644 --- a/app/store/app.ts +++ b/app/store/app.ts @@ -18,6 +18,7 @@ if (!Array.prototype.at) { export type Message = ChatCompletionResponseMessage & { date: string; streaming?: boolean; + isError?: boolean; }; export enum SubmitKey { @@ -88,43 +89,39 @@ export const ALL_MODELS = [ }, ]; -export function isValidModel(name: string) { - return ALL_MODELS.some((m) => m.name === name && m.available); +export function limitNumber( + x: number, + min: number, + max: number, + defaultValue: number, +) { + if (typeof x !== "number" || isNaN(x)) { + return defaultValue; + } + + return Math.min(max, Math.max(min, x)); } -export function isValidNumber(x: number, min: number, max: number) { - return typeof x === "number" && x <= max && x >= min; +export function limitModel(name: string) { + return ALL_MODELS.some((m) => m.name === name && m.available) + ? name + : ALL_MODELS[4].name; } -export function filterConfig(oldConfig: ModelConfig): Partial { - const config = Object.assign({}, oldConfig); - - const validator: { - [k in keyof ModelConfig]: (x: ModelConfig[keyof ModelConfig]) => boolean; - } = { - model(x) { - return isValidModel(x as string); - }, - max_tokens(x) { - return isValidNumber(x as number, 100, 32000); - }, - presence_penalty(x) { - return isValidNumber(x as number, -2, 2); - }, - temperature(x) { - return isValidNumber(x as number, 0, 2); - }, - }; - - Object.keys(validator).forEach((k) => { - const key = k as keyof ModelConfig; - if (!validator[key](config[key])) { - delete config[key]; - } - }); - - return config; -} +export const ModalConfigValidator = { + model(x: string) { + return limitModel(x); + }, + max_tokens(x: number) { + return limitNumber(x, 0, 32000, 2000); + }, + presence_penalty(x: number) { + return limitNumber(x, -2, 2, 0); + }, + temperature(x: number) { + return limitNumber(x, 0, 2, 1); + }, +}; const DEFAULT_CONFIG: ChatConfig = { historyMessageCount: 4, @@ -356,9 +353,15 @@ export const useChatStore = create()( set(() => ({})); } }, - onError(error) { - botMessage.content += "\n\n" + Locale.Store.Error; + onError(error, statusCode) { + if (statusCode === 401) { + botMessage.content = Locale.Error.Unauthorized; + } else { + botMessage.content += "\n\n" + Locale.Store.Error; + } botMessage.streaming = false; + userMessage.isError = true; + botMessage.isError = true; set(() => ({})); ControllerPool.remove(sessionIndex, messageIndex); }, @@ -388,7 +391,9 @@ export const useChatStore = create()( getMessagesWithMemory() { const session = get().currentSession(); const config = get().config; - const n = session.messages.length; + const messages = session.messages.filter((msg) => !msg.isError); + const n = messages.length; + const context = session.context.slice(); if (session.memoryPrompt && session.memoryPrompt.length > 0) { @@ -397,7 +402,7 @@ export const useChatStore = create()( } const recentMessages = context.concat( - session.messages.slice(Math.max(0, n - config.historyMessageCount)), + messages.slice(Math.max(0, n - config.historyMessageCount)), ); return recentMessages; diff --git a/app/styles/globals.scss b/app/styles/globals.scss index a723495f4..3bbd644c0 100644 --- a/app/styles/globals.scss +++ b/app/styles/globals.scss @@ -186,7 +186,8 @@ input[type="range"]::-webkit-slider-thumb:hover { } input[type="number"], -input[type="text"] { +input[type="text"], +input[type="password"] { appearance: none; border-radius: 10px; border: var(--border-in-light); @@ -270,3 +271,18 @@ pre { filter: brightness(0.9); } } + +.error { + width: 80%; + border-radius: 20px; + border: var(--border-in-light); + box-shadow: var(--card-shadow); + padding: 20px; + overflow: auto; + background-color: var(--white); + color: var(--black); + + pre { + overflow: auto; + } +} diff --git a/package.json b/package.json index 927e6d4ec..97fa1e8b7 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "dependencies": { "@svgr/webpack": "^6.5.1", "@vercel/analytics": "^0.1.11", - "array.prototype.at": "^1.1.1", "emoji-picker-react": "^4.4.7", "eventsource-parser": "^0.1.0", "fuse.js": "^6.6.2", diff --git a/yarn.lock b/yarn.lock index 7780ebdac..65f99a763 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1572,16 +1572,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array.prototype.at@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array.prototype.at/-/array.prototype.at-1.1.1.tgz#6deda3cd3c704afa16361387ea344e0b8d8831b5" - integrity sha512-n/wYNLJy/fVEU9EGPt2ww920hy1XX3XB2yTREFy1QsxctBgQV/tZIwg1G8jVxELna4pLCzg/xvvS/DDXtI4NNg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - array.prototype.flat@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"