Merge branch 'dev' into master

di-sukharev · Aug 22, 2024 · 890e1c0 · 890e1c0
2 parents 182a03d + eb3be62
commit 890e1c0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/example.txt b/example.txt
diff --git 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
@@ -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
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "3.0.18",
+  "version": "3.0.20",
   "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
@@ -46,6 +46,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',
@@ -70,7 +71,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'
   ],
 
@@ -147,7 +147,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,
@@ -501,6 +501,7 @@ export const getConfig = ({
       outro(
         `Manually fix the '.env' file or global '~/.opencommit' config file.`
       );
+
       process.exit(1);
     }
   }

diff --git a/src/engine/anthropic.ts b/src/engine/anthropic.ts
@@ -48,7 +48,7 @@ if (
 
 const MODEL = config?.OCO_MODEL;
 if (provider === 'anthropic' &&
-  MODEL.typeof !== 'string' && 
+  typeof MODEL !== 'string' && 
   command !== 'config' &&
   mode !== CONFIG_MODES.set) {
 outro(

diff --git a/src/engine/openAi.ts b/src/engine/openAi.ts
@@ -54,7 +54,7 @@ if (
 
 const MODEL = config?.OCO_MODEL || 'gpt-3.5-turbo';
 if (provider === 'openai' &&
-  MODEL.typeof !== 'string' && 
+  typeof MODEL !== 'string' && 
     command !== 'config' &&
     mode !== CONFIG_MODES.set) {
   outro(