From 6a59d9883edec3ba5e5cb58e55849ad022758a63 Mon Sep 17 00:00:00 2001 From: an-lee Date: Wed, 15 May 2024 16:05:47 +0800 Subject: [PATCH] fix default engine setting validation --- enjoy/src/commands/json.command.ts | 4 ++-- enjoy/src/constants.ts | 2 +- .../components/preferences/default-engine-settings.tsx | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/enjoy/src/commands/json.command.ts b/enjoy/src/commands/json.command.ts index f0a08920..d4efa3b6 100644 --- a/enjoy/src/commands/json.command.ts +++ b/enjoy/src/commands/json.command.ts @@ -1,5 +1,5 @@ import { ChatOpenAI } from "@langchain/openai"; -import { NOT_SUPPORTE_JSON_FORMAT_MODELS } from "@/constants"; +import { NOT_SUPPORT_JSON_FORMAT_MODELS } from "@/constants"; import { zodToJsonSchema } from "zod-to-json-schema"; export const jsonCommand = async ( @@ -15,7 +15,7 @@ export const jsonCommand = async ( const { key, temperature = 0, baseUrl, schema } = options; let { modelName = "gpt-4o" } = options; - if (NOT_SUPPORTE_JSON_FORMAT_MODELS.indexOf(modelName) > -1) { + if (NOT_SUPPORT_JSON_FORMAT_MODELS.indexOf(modelName) > -1) { modelName = "gpt-4o"; } diff --git a/enjoy/src/constants.ts b/enjoy/src/constants.ts index adf35cc6..6da15024 100644 --- a/enjoy/src/constants.ts +++ b/enjoy/src/constants.ts @@ -125,7 +125,7 @@ export const PROCESS_TIMEOUT = 1000 * 60 * 15; export const AI_GATEWAY_ENDPOINT = "https://gateway.ai.cloudflare.com/v1/11d43ab275eb7e1b271ba4089ecc3864/enjoy"; -export const NOT_SUPPORTE_JSON_FORMAT_MODELS = [ +export const NOT_SUPPORT_JSON_FORMAT_MODELS = [ "gpt-4-vision-preview", "gpt-4", "gpt-4-32k", diff --git a/enjoy/src/renderer/components/preferences/default-engine-settings.tsx b/enjoy/src/renderer/components/preferences/default-engine-settings.tsx index 42c9c34f..c4a27629 100644 --- a/enjoy/src/renderer/components/preferences/default-engine-settings.tsx +++ b/enjoy/src/renderer/components/preferences/default-engine-settings.tsx @@ -58,7 +58,11 @@ export const DefaultEngineSettings = () => { models.default ||= providers[name].models[0]; Object.keys(models).forEach((key: keyof typeof models) => { if (!providers[name].models.includes(models[key])) { - delete models[key]; + if (key === "default") { + models[key] = providers[name].models[0]; + } else { + delete models[key]; + } } });