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

Chat gpt next web main #5584

Closed
wants to merge 11 commits into from
Closed

Chat gpt next web main #5584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b8b49fd
Modifications
ayman-makki May 27, 2024
04b1518
updated assistants
ayman-makki May 27, 2024
74a8752
added Google
ayman-makki May 27, 2024
422415a
Merge branch 'main' of github.com:ChatGPTNextWeb/ChatGPT-Next-Web int…
ayman-makki Jul 2, 2024
39fb2ca
Merge pull request #2 from ayman-makki/ChatGPTNextWeb-main
ayman-makki Jul 2, 2024
f7373c4
updated assistants
ayman-makki Jul 2, 2024
ada1239
reverse
ayman-makki Jul 2, 2024
3c8b9ed
Merge branch 'main' of https://github.com/ayman-makki/chat-next-web
ayman-makki Jul 2, 2024
3c2fabc
assistants
ayman-makki Jul 2, 2024
2cae616
removing models
ayman-makki Jul 2, 2024
e5f4035
Merge branch 'main' of github.com:ChatGPTNextWeb/ChatGPT-Next-Web int…
ayman-makki Oct 4, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dev

# docker-compose env files
.env
.env.local

*.key
*.key.pub
Expand Down
50 changes: 25 additions & 25 deletions app/constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,41 +272,41 @@ export const DEFAULT_TTS_VOICES = [
];

const openaiModels = [
"gpt-3.5-turbo",
"gpt-3.5-turbo-1106",
"gpt-3.5-turbo-0125",
// "gpt-3.5-turbo",
// "gpt-3.5-turbo-1106",
// "gpt-3.5-turbo-0125",
"gpt-4",
"gpt-4-0613",
"gpt-4-32k",
"gpt-4-32k-0613",
"gpt-4-turbo",
"gpt-4-turbo-preview",
// "gpt-4-0613",
// "gpt-4-32k",
// "gpt-4-32k-0613",
// "gpt-4-turbo",
// "gpt-4-turbo-preview",
"gpt-4o",
"gpt-4o-2024-05-13",
"gpt-4o-2024-08-06",
"chatgpt-4o-latest",
"gpt-4o-mini",
"gpt-4o-mini-2024-07-18",
"gpt-4-vision-preview",
"gpt-4-turbo-2024-04-09",
"gpt-4-1106-preview",
"dall-e-3",
"o1-mini",
"o1-preview",
// "gpt-4o-2024-05-13",
// "gpt-4o-2024-08-06",
// "chatgpt-4o-latest",
// "gpt-4o-mini",
// "gpt-4o-mini-2024-07-18",
// "gpt-4-vision-preview",
// "gpt-4-turbo-2024-04-09",
// "gpt-4-1106-preview",
// "dall-e-3",
// "o1-mini",
// "o1-preview",
];

const googleModels = [
"gemini-1.0-pro",
// "gemini-1.0-pro",
"gemini-1.5-pro-latest",
"gemini-1.5-flash-latest",
"gemini-pro-vision",
// "gemini-pro-vision",
];

const anthropicModels = [
"claude-instant-1.2",
"claude-2.0",
"claude-2.1",
"claude-3-sonnet-20240229",
// "claude-instant-1.2",
// "claude-2.0",
// "claude-2.1",
// "claude-3-sonnet-20240229",
"claude-3-opus-20240229",
"claude-3-haiku-20240307",
"claude-3-5-sonnet-20240620",
Expand Down
11 changes: 7 additions & 4 deletions app/locales/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ const fr: PartialLocaleType = {
FoundUpdate: (x: string) => `Nouvelle version trouvΓ©e : ${x}`,
GoToUpdate: "Aller Γ  la mise Γ  jour",
},
SendKey: "Touche d'envoi",
SendKey: "Touche pour envoyer le message",
Theme: "Thème",
TightBorder: "Mode sans bordure",
SendPreviewBubble: {
Expand Down Expand Up @@ -521,7 +521,7 @@ const fr: PartialLocaleType = {
},
},
Mask: {
Name: "Masque",
Name: "Assistants",
Page: {
Title: "Masques de rΓ΄le prΓ©dΓ©finis",
SubTitle: (count: number) => `${count} dΓ©finitions de rΓ΄le prΓ©dΓ©finies`,
Expand Down Expand Up @@ -566,8 +566,11 @@ const fr: PartialLocaleType = {
},
NewChat: {
Return: "Retour",
Skip: "Commencer directement",
NotShow: "Ne plus afficher",
Skip: "Passer",
Title: "Choisir un assitant",
SubTitle: "PrΓ©configurez l'IA avec un prompt spΓ©cifique Γ  un besoin",
More: "En savoir plus",
NotShow: "Ne pas afficher Γ  nouveau",
ConfirmNoShow:
"Confirmer la désactivation ? Vous pourrez réactiver cette option à tout moment dans les paramètres.",
Title: "Choisir un masque",
Expand Down
201 changes: 150 additions & 51 deletions app/masks/en.ts
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/masks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if (typeof window != "undefined") {
})
.then((masks) => {
const { cn = [], tw = [], en = [] } = masks;
return [...cn, ...tw, ...en].map((m) => {
return [...en].map((m) => {
BUILTIN_MASKS.push(BUILTIN_MASK_STORE.add(m));
});
});
Expand Down
2 changes: 1 addition & 1 deletion app/store/prompt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const usePromptStore = createPersistStore(
if (typeof window === "undefined") {
return;
}

const PROMPT_URL = "./prompts.json";

type PromptList = Array<[string, string]>;
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"html-to-image": "^1.11.11",
"idb-keyval": "^6.2.1",
"lodash-es": "^4.17.21",
"mermaid": "^10.6.1",
"markdown-to-txt": "^2.0.1",
"mermaid": "^10.6.1",
"nanoid": "^5.0.3",
"next": "^14.1.1",
"node-fetch": "^3.3.1",
Expand Down Expand Up @@ -67,7 +67,7 @@
"eslint-config-next": "13.4.19",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-unused-imports": "^3.2.0",
"eslint-plugin-unused-imports": "^4.1.4",
"husky": "^8.0.0",
"lint-staged": "^13.2.2",
"prettier": "^3.0.2",
Expand All @@ -80,4 +80,4 @@
"lint-staged/yaml": "^2.2.2"
},
"packageManager": "[email protected]"
}
}
15 changes: 4 additions & 11 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3367,17 +3367,10 @@ eslint-plugin-react@^7.31.7:
semver "^6.3.0"
string.prototype.matchall "^4.0.8"

eslint-plugin-unused-imports@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz#63a98c9ad5f622cd9f830f70bc77739f25ccfe0d"
integrity sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==
dependencies:
eslint-rule-composer "^0.3.0"

eslint-rule-composer@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
eslint-plugin-unused-imports@^4.1.4:
version "4.1.4"
resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz#62ddc7446ccbf9aa7b6f1f0b00a980423cda2738"
integrity sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==

[email protected]:
version "5.1.1"
Expand Down
Loading