From a979ba091ad24f1aba574b06b31ea0dee50e7da3 Mon Sep 17 00:00:00 2001 From: GPT10 <57486732+di-sukharev@users.noreply.github.com> Date: Mon, 19 Aug 2024 10:41:26 +0300 Subject: [PATCH] 3.0.19 (#384) * fix(config.ts): move 'gpt-4o-mini' in MODEL_LIST * docs(config.ts): update API key validation message with detailed instructions * refactor(config.ts): simplify model validation logic to check for string type instead of MODEL_LIST * 3.0.19 --- out/cli.cjs | 12 ++++-------- out/github-action.cjs | 10 +++------- package-lock.json | 4 ++-- package.json | 2 +- src/commands/config.ts | 15 ++++----------- 5 files changed, 14 insertions(+), 29 deletions(-) diff --git a/out/cli.cjs b/out/cli.cjs index cae8864..cf62280 100755 --- a/out/cli.cjs +++ b/out/cli.cjs @@ -28111,7 +28111,7 @@ function G3(t2, e3) { // package.json var package_default = { name: "opencommit", - version: "3.0.18", + version: "3.0.19", description: "Auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}", keywords: [ "git", @@ -30663,6 +30663,7 @@ var TestAi = class { // src/commands/config.ts var MODEL_LIST = { openai: [ + "gpt-4o-mini", "gpt-3.5-turbo", "gpt-3.5-turbo-instruct", "gpt-3.5-turbo-0613", @@ -30687,7 +30688,6 @@ var MODEL_LIST = { "gpt-4-32k-0613", "gpt-4o", "gpt-4o-2024-05-13", - "gpt-4o-mini", "gpt-4o-mini-2024-07-18" ], anthropic: [ @@ -30731,7 +30731,7 @@ var configValidators = { validateConfig( "OpenAI API_KEY", value || config12.OCO_ANTHROPIC_API_KEY || config12.OCO_AI_PROVIDER.startsWith("ollama") || config12.OCO_AZURE_API_KEY || config12.OCO_AI_PROVIDER == "test" || config12.OCO_AI_PROVIDER == "flowise", - "You need to provide an OpenAI/Anthropic/Azure API key" + "You need to provide an OpenAI/Anthropic/Azure or other provider API key via `oco config set OCO_OPENAI_API_KEY=your_key`, for help refer to docs https://github.com/di-sukharev/opencommit" ); validateConfig( "OCO_OPENAI_API_KEY" /* OCO_OPENAI_API_KEY */, @@ -30841,11 +30841,7 @@ var configValidators = { ["OCO_MODEL" /* OCO_MODEL */](value, config12 = {}) { validateConfig( "OCO_MODEL" /* OCO_MODEL */, - [ - ...MODEL_LIST.openai, - ...MODEL_LIST.anthropic, - ...MODEL_LIST.gemini - ].includes(value) || config12.OCO_AI_PROVIDER == "ollama" || config12.OCO_AI_PROVIDER == "azure" || config12.OCO_AI_PROVIDER == "test" || config12.OCO_AI_PROVIDER == "flowise", + typeof value === "string", `${value} is not supported yet, use: ${[ diff --git a/out/github-action.cjs b/out/github-action.cjs index 6cf111d..61b7a71 100644 --- a/out/github-action.cjs +++ b/out/github-action.cjs @@ -49470,6 +49470,7 @@ var TestAi = class { // src/commands/config.ts var MODEL_LIST = { openai: [ + "gpt-4o-mini", "gpt-3.5-turbo", "gpt-3.5-turbo-instruct", "gpt-3.5-turbo-0613", @@ -49494,7 +49495,6 @@ var MODEL_LIST = { "gpt-4-32k-0613", "gpt-4o", "gpt-4o-2024-05-13", - "gpt-4o-mini", "gpt-4o-mini-2024-07-18" ], anthropic: [ @@ -49538,7 +49538,7 @@ var configValidators = { validateConfig( "OpenAI API_KEY", value || config11.OCO_ANTHROPIC_API_KEY || config11.OCO_AI_PROVIDER.startsWith("ollama") || config11.OCO_AZURE_API_KEY || config11.OCO_AI_PROVIDER == "test" || config11.OCO_AI_PROVIDER == "flowise", - "You need to provide an OpenAI/Anthropic/Azure API key" + "You need to provide an OpenAI/Anthropic/Azure or other provider API key via `oco config set OCO_OPENAI_API_KEY=your_key`, for help refer to docs https://github.com/di-sukharev/opencommit" ); validateConfig( "OCO_OPENAI_API_KEY" /* OCO_OPENAI_API_KEY */, @@ -49648,11 +49648,7 @@ var configValidators = { ["OCO_MODEL" /* OCO_MODEL */](value, config11 = {}) { validateConfig( "OCO_MODEL" /* OCO_MODEL */, - [ - ...MODEL_LIST.openai, - ...MODEL_LIST.anthropic, - ...MODEL_LIST.gemini - ].includes(value) || config11.OCO_AI_PROVIDER == "ollama" || config11.OCO_AI_PROVIDER == "azure" || config11.OCO_AI_PROVIDER == "test" || config11.OCO_AI_PROVIDER == "flowise", + typeof value === "string", `${value} is not supported yet, use: ${[ diff --git a/package-lock.json b/package-lock.json index d1e27d6..4dc2f79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "opencommit", - "version": "3.0.18", + "version": "3.0.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "opencommit", - "version": "3.0.18", + "version": "3.0.19", "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", diff --git a/package.json b/package.json index 396a2ae..c8598b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opencommit", - "version": "3.0.18", + "version": "3.0.19", "description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫", "keywords": [ "git", diff --git a/src/commands/config.ts b/src/commands/config.ts index fe01b96..644273c 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -45,6 +45,7 @@ export enum CONFIG_MODES { export const MODEL_LIST = { openai: [ + 'gpt-4o-mini', 'gpt-3.5-turbo', 'gpt-3.5-turbo-instruct', 'gpt-3.5-turbo-0613', @@ -69,7 +70,6 @@ export const MODEL_LIST = { 'gpt-4-32k-0613', 'gpt-4o', 'gpt-4o-2024-05-13', - 'gpt-4o-mini', 'gpt-4o-mini-2024-07-18' ], @@ -134,7 +134,7 @@ export const configValidators = { config.OCO_AZURE_API_KEY || config.OCO_AI_PROVIDER == 'test' || config.OCO_AI_PROVIDER == 'flowise', - 'You need to provide an OpenAI/Anthropic/Azure API key' + 'You need to provide an OpenAI/Anthropic/Azure or other provider API key via `oco config set OCO_OPENAI_API_KEY=your_key`, for help refer to docs https://github.com/di-sukharev/opencommit' ); validateConfig( CONFIG_KEYS.OCO_OPENAI_API_KEY, @@ -276,15 +276,7 @@ export const configValidators = { [CONFIG_KEYS.OCO_MODEL](value: any, config: any = {}) { validateConfig( CONFIG_KEYS.OCO_MODEL, - [ - ...MODEL_LIST.openai, - ...MODEL_LIST.anthropic, - ...MODEL_LIST.gemini - ].includes(value) || - config.OCO_AI_PROVIDER == 'ollama' || - config.OCO_AI_PROVIDER == 'azure' || - config.OCO_AI_PROVIDER == 'test' || - config.OCO_AI_PROVIDER == 'flowise', + typeof value === 'string', `${value} is not supported yet, use:\n\n ${[ ...MODEL_LIST.openai, ...MODEL_LIST.anthropic, @@ -459,6 +451,7 @@ export const getConfig = ({ outro( `Manually fix the '.env' file or global '~/.opencommit' config file.` ); + process.exit(1); } }