Merge remote-tracking branch 'origin/dev' into marcelwiegand-master

🐛(anthropic.ts): fix incorrect usage of 'typeof' operator for MODEL variable
🐛(openAi.ts): fix incorrect usage of 'typeof' operator for MODEL variable
2026-01-12 23:28:16 -05:00 · 2024-08-19 12:29:55 +03:00 · 2024-08-19 11:13:37 +02:00 · 2024-08-19 11:13:09 +02:00 · 2024-08-19 10:42:36 +03:00 · 2024-08-19 10:41:26 +03:00
8 changed files with 16 additions and 31 deletions
--- a/example.txt
+++ b/example.txt
--- 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.17",
+  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:

 ${[
--- 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:

 ${[
--- 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",
--- 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",
--- 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);
    }
  }
--- 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(
--- 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(
Author	SHA1	Message	Date
di-sukharev	58ad1880ef	Merge remote-tracking branch 'origin/dev' into marcelwiegand-master	2024-08-19 12:29:55 +03:00
marcelwiegand	5ee17235cb	🐛(anthropic.ts): fix incorrect usage of 'typeof' operator for MODEL variable	2024-08-19 11:13:37 +02:00
marcelwiegand	f9c7316eb3	🐛(openAi.ts): fix incorrect usage of 'typeof' operator for MODEL variable	2024-08-19 11:13:09 +02:00
di-sukharev	dfe2730a45	build	2024-08-19 10:42:36 +03:00
GPT10	a979ba091a	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	2024-08-19 10:41:26 +03:00
di-sukharev	6bbe07a9a1	build	2024-08-19 10:28:45 +03:00
di-sukharev	0156bb9dc9	3.0.19	2024-08-19 10:26:46 +03:00
di-sukharev	e27bbd0ac1	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	2024-08-19 10:25:24 +03:00
GPT10	f3371ac1e3	3.0.18 (#382 ) * 📝 (README.md): add support for custom AI models and update documentation to reflect new environment variable OCO_ AI_PROVIDER (#351) * feat/add gemini (#349) * fix: prompt-module/@commitlint (#336) * docs: spelling fix (#325) --------- Co-authored-by: tumf <y.takahara@gmail.com> Co-authored-by: Drew Payment <drew.payment@gmail.com> Co-authored-by: Takanori Matsumoto <matscube@gmail.com> Co-authored-by: Kellan Stevens <kellan@kellanstevens.com> Co-authored-by: JMN09 <jmn09@mail.aub.edu> Co-authored-by: JMN09 <157629053+JMN09@users.noreply.github.com>	2024-08-18 14:55:33 +03:00
di-sukharev	9cc9f9d757	build	2024-08-18 14:47:25 +03:00