Revert "Suggest adding 'Edit' option to the Yes/No confirmation #53 (#70)"

This reverts commit 70f048672c.

README.md

@@ -54,18 +54,6 @@ oc
 
 ## Features
 
-### Switch to GPT-4
-
-By default OpenCommit uses GPT-3.5-turbo (ChatGPT).
-
-You may switch to GPT-4 which performs better, but costs ~x15 times more 🤠
-
-```sh
-oc config set model=gpt-4
-```
-
-Make sure you do lowercase `gpt-4`.
-
 ### Preface commits with emoji 🤠
 
 [GitMoji](https://gitmoji.dev/) convention is used.
@@ -96,24 +84,6 @@ To remove description:
 oc config set description=false
 ```
 
-### Configure openAI maxTokens param
-
-Default value for `maxTokens` is 196, sometimes you can get 400 error if request+response exceeds `maxToken` parameter.
-
-so you can increase it:
-
-```sh
-oc config set OPENAI_MAX_TOKENS=<number>
-```
-
-### Configure BASE_PATH for openAI api
-
-if you want to call GPT via proxy — you can change `BASE_PATH` parameter:
-
-```sh
-oc config set OPENAI_BASE_PATH=<string>
-```
-
 ### Internationalization support
 
 To specify the language used to generate commit messages:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "opencommit",
-  "version": "2.0.13",
+  "version": "2.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "opencommit",
-      "version": "2.0.13",
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "^0.6.1",
@@ -22,7 +22,6 @@
       },
       "bin": {
         "oc": "out/cli.cjs",
-        "oco": "out/cli.cjs",
         "opencommit": "out/cli.cjs"
       },
       "devDependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "2.0.13",
+  "version": "2.0.1",
   "description": "GPT CLI to auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
   "keywords": [
     "git",

src/api.ts

@@ -13,7 +13,6 @@ const config = getConfig();
 
 let apiKey = config?.OPENAI_API_KEY;
 let basePath = config?.OPENAI_BASE_PATH;
-let maxTokens = config?.OPENAI_MAX_TOKENS;
 
 const [command, mode] = process.argv.slice(2);
 
@@ -30,8 +29,6 @@ if (!apiKey && command !== 'config' && mode !== CONFIG_MODES.set) {
   process.exit(1);
 }
 
-const MODEL = config?.model || 'gpt-3.5-turbo';
-
 class OpenAi {
   private openAiApiConfiguration = new OpenAiApiConfiguration({
     apiKey: apiKey
@@ -50,11 +47,11 @@ class OpenAi {
   ): Promise<string | undefined> => {
     try {
       const { data } = await this.openAI.createChatCompletion({
-        model: MODEL,
+        model: 'gpt-3.5-turbo',
         messages,
         temperature: 0,
         top_p: 0.1,
-        max_tokens: maxTokens ?? 196
+        max_tokens: 196
       });
 
       const message = data.choices[0].message;

src/commands/commit.ts

@@ -73,7 +73,7 @@ ${chalk.grey('——————————————————')}`
       ...extraArgs
     ]);
 
-    outro(`${chalk.green('✔')} Successfully committed`);
+    outro(`${chalk.green('✔')} successfully committed`);
 
     outro(stdout);
 
@@ -102,7 +102,7 @@ ${chalk.grey('——————————————————')}`
         ]);
 
         pushSpinner.stop(
-          `${chalk.green('✔')} Successfully pushed all commits to ${remotes[0]}`
+          `${chalk.green('✔')} successfully pushed all commits to ${remotes[0]}`
         );
 
         if (stdout) outro(stdout);
@@ -126,7 +126,7 @@ ${chalk.grey('——————————————————')}`
         pushSpinner.stop(
           `${chalk.green(
             '✔'
-          )} Successfully pushed all commits to ${selectedRemote}`
+          )} successfully pushed all commits to ${selectedRemote}`
         );
 
         if (stdout) outro(stdout);

src/commands/config.ts

@@ -10,11 +10,9 @@ import { getI18nLocal } from '../i18n';
 
 export enum CONFIG_KEYS {
   OPENAI_API_KEY = 'OPENAI_API_KEY',
-  OPENAI_MAX_TOKENS = 'OPENAI_MAX_TOKENS',
   OPENAI_BASE_PATH = 'OPENAI_BASE_PATH',
   description = 'description',
   emoji = 'emoji',
-  model = 'model',
   language = 'language'
 }
 
@@ -64,16 +62,6 @@ export const configValidators = {
     return value;
   },
 
-  [CONFIG_KEYS.OPENAI_MAX_TOKENS](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OPENAI_MAX_TOKENS,
-      typeof value === 'number',
-      'Must be a number'
-    );
-
-    return value;
-  },
-
   [CONFIG_KEYS.emoji](value: any) {
     validateConfig(
       CONFIG_KEYS.emoji,
@@ -100,15 +88,6 @@ export const configValidators = {
       `${value} is not supported yet`
     );
     return value;
-  },
-
-  [CONFIG_KEYS.model](value: any) {
-    validateConfig(
-      CONFIG_KEYS.OPENAI_BASE_PATH,
-      value === 'gpt-3.5-turbo' || value === 'gpt-4',
-      `${value} is not supported yet, use 'gpt-4' or 'gpt-3.5-turbo' (default)`
-    );
-    return value;
   }
 };
 
@@ -159,7 +138,7 @@ export const setConfig = (keyValues: [key: string, value: string][]) => {
 
   writeFileSync(configPath, iniStringify(config), 'utf8');
 
-  outro(`${chalk.green('✔')} Config successfully set`);
+  outro(`${chalk.green('✔')} config successfully set`);
 };
 
 export const configCommand = command(

src/commands/githook.ts

@@ -92,7 +92,7 @@ export const hookCommand = command(
       }
 
       throw new Error(
-        `Unsupported mode: ${mode}. Supported modes are: 'set' or 'unset'`
+        `unsupported mode: ${mode}. Supported modes are: 'set' or 'unset'`
       );
     } catch (error) {
       outro(`${chalk.red('✖')} ${error}`);

src/generateCommitMessageFromGitDiff.ts

@@ -15,7 +15,7 @@ const INIT_MESSAGES_PROMPT: Array<ChatCompletionRequestMessage> = [
   {
     role: ChatCompletionRequestMessageRoleEnum.System,
     // prettier-ignore
-    content: `You are to act as the author of a commit message in git. Your mission is to create clean and comprehensive commit messages in the conventional commit convention and explain WHAT were the changes and WHY the changes were done. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message.
+    content: `You are to act as the author of a commit message in git. Your mission is to create clean and comprehensive commit messages in the conventional commit convention and explain why a change was done. I'll send you an output of 'git diff --staged' command, and you convert it into a commit message.
 ${config?.emoji? 'Use GitMoji convention to preface the commit.': 'Do not preface the commit with anything.'}
 ${config?.description  ? 'Add a short description of WHY the changes are done after the commit message. Don\'t start it with "This commit", just describe the changes.': "Don't add any descriptions to the commit, only commit message."}
 Use the present tense. Lines must not be longer than 74 characters. Use ${translation.localLanguage} to answer.`

src/i18n/en.json

@@ -1,6 +1,6 @@
 {
   "localLanguage": "english",
-  "commitFix": "fix(server.ts): change port variable case from lowercase port to uppercase PORT to improve semantics",
-  "commitFeat": "feat(server.ts): add support for process.env.PORT environment variable to be able to run app on a configurable port",
+  "commitFix": "fix(server.ts): change port variable case from lowercase port to uppercase PORT",
+  "commitFeat": "feat(server.ts): add support for process.env.PORT environment variable",
   "commitDescription": "The port variable is now named PORT, which improves consistency with the naming conventions as PORT is a constant. Support for an environment variable allows the application to be more flexible as it can now run on any available port specified via the process.env.PORT environment variable."
 }