From e6ccbed653c4d707e3d38996720a9cb9deedf741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:54:35 +0000 Subject: [PATCH 1/2] Bump i18next from 23.11.2 to 23.11.3 Bumps [i18next](https://github.com/i18next/i18next) from 23.11.2 to 23.11.3. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v23.11.2...v23.11.3) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd870531..c311219c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "github-markdown-css": "^5.5.1", "hast": "^1.0.0", "highlight.js": "^11.9.0", - "i18next": "^23.11.2", + "i18next": "^23.11.3", "i18next-browser-languagedetector": "^7.2.1", "i18next-http-backend": "^2.5.1", "postcss": "^8.4.38", @@ -7181,9 +7181,9 @@ } }, "node_modules/i18next": { - "version": "23.11.2", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.11.2.tgz", - "integrity": "sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA==", + "version": "23.11.3", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.11.3.tgz", + "integrity": "sha512-Pq/aSKowir7JM0rj+Wa23Kb6KKDUGno/HjG+wRQu0PxoTbpQ4N89MAT0rFGvXmLkRLNMb1BbBOKGozl01dabzg==", "funding": [ { "type": "individual", @@ -20954,9 +20954,9 @@ "peer": true }, "i18next": { - "version": "23.11.2", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.11.2.tgz", - "integrity": "sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA==", + "version": "23.11.3", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.11.3.tgz", + "integrity": "sha512-Pq/aSKowir7JM0rj+Wa23Kb6KKDUGno/HjG+wRQu0PxoTbpQ4N89MAT0rFGvXmLkRLNMb1BbBOKGozl01dabzg==", "requires": { "@babel/runtime": "^7.23.2" } diff --git a/package.json b/package.json index 99d3f8ea..4fc60999 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "github-markdown-css": "^5.5.1", "hast": "^1.0.0", "highlight.js": "^11.9.0", - "i18next": "^23.11.2", + "i18next": "^23.11.3", "i18next-browser-languagedetector": "^7.2.1", "i18next-http-backend": "^2.5.1", "postcss": "^8.4.38", From 3fe182485ea746b3b3522f256d587a9ae6f4a625 Mon Sep 17 00:00:00 2001 From: Diamond White Date: Mon, 29 Apr 2024 16:18:49 -0500 Subject: [PATCH 2/2] support more models by defaulting to text only on chat --- .gitignore | 1 + src/constants/apiEndpoints.ts | 8 ++++---- src/constants/appConstants.ts | 2 +- src/env.json | 2 +- src/models/ChatCompletion.ts | 2 +- src/service/ChatService.ts | 17 ++++++++++++----- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index a666fc3d..0f8e6333 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ # tools .idea +.vscode # local env local.env.json diff --git a/src/constants/apiEndpoints.ts b/src/constants/apiEndpoints.ts index a8740230..1ed0baa9 100644 --- a/src/constants/apiEndpoints.ts +++ b/src/constants/apiEndpoints.ts @@ -1,4 +1,4 @@ -export const OPENAI_ENDPOINT = 'https://api.openai.com'; -export const TTS_ENDPOINT = `${OPENAI_ENDPOINT}/v1/audio/speech`; -export const CHAT_COMPLETIONS_ENDPOINT = `${OPENAI_ENDPOINT}/v1/chat/completions`; -export const MODELS_ENDPOINT = `${OPENAI_ENDPOINT}/v1/models`; +export const OPENAI_ENDPOINT = 'https://api.deepinfra.com'; +export const TTS_ENDPOINT = `${OPENAI_ENDPOINT}/v1/openai/audio/speech`; +export const CHAT_COMPLETIONS_ENDPOINT = `${OPENAI_ENDPOINT}/v1/openai/chat/completions`; +export const MODELS_ENDPOINT = `${OPENAI_ENDPOINT}/v1/openai/models`; diff --git a/src/constants/appConstants.ts b/src/constants/appConstants.ts index 4027509a..a8acb179 100644 --- a/src/constants/appConstants.ts +++ b/src/constants/appConstants.ts @@ -7,7 +7,7 @@ export const MAX_ROWS = 20; export const MAX_TITLE_LENGTH = 128; export const CHAT_STREAM_DEBOUNCE_TIME = 250; -export const DEFAULT_MODEL = 'gpt-4-turbo'; +export const DEFAULT_MODEL = 'meta-llama/Meta-Llama-3-70B-Instruct'; export const DEFAULT_INSTRUCTIONS = 'You are a helpful assistant.'; diff --git a/src/env.json b/src/env.json index 98bd0812..95573c22 100644 --- a/src/env.json +++ b/src/env.json @@ -1,5 +1,5 @@ { "openapi_key": "your-api-key-here", - "default_model": "gpt-3.5-turbo", + "default_model": "meta-llama/Meta-Llama-3-70B-Instruct", "default_system_prompt": "You are a helpful assistant." } diff --git a/src/models/ChatCompletion.ts b/src/models/ChatCompletion.ts index 98fd9cae..aaf6a161 100644 --- a/src/models/ChatCompletion.ts +++ b/src/models/ChatCompletion.ts @@ -17,7 +17,7 @@ export interface ChatMessagePart { export interface ChatCompletionMessage { role: Role, - content: ChatMessagePart[]; + content: ChatMessagePart[] | string; } export interface ChatCompletionRequest { diff --git a/src/service/ChatService.ts b/src/service/ChatService.ts index e58e54b9..f72b9edb 100644 --- a/src/service/ChatService.ts +++ b/src/service/ChatService.ts @@ -54,11 +54,18 @@ export class ChatService { }); } }); + return { + role: message.role, + content: contentParts, + }; } - return { - role: message.role, - content: contentParts, - }; + else { + return { + role: message.role, + content: message.content, + }; + } + }); } @@ -317,7 +324,7 @@ export class ChatService { const models: OpenAIModel[] = data.data; // Filter, enrich with contextWindow from the imported constant, and sort return models - .filter(model => model.id.startsWith("gpt-")) + .filter(model => model.id) .map(model => { const details = modelDetails[model.id] || { contextWindowSize: 0,