git-aicommit 6.0.0 → 7.1.0

package/README.md

@@ -9,7 +9,7 @@ Tired of writing commit messages? Let the computer do it for you!
 ## Installation
 
 ```bash
-npm install -g git-aicommit
+bun add -g git-aicommit
 ```
 
 ## Configuration
@@ -36,30 +36,33 @@ touch $HOME/.git-aicommitrc
 // $HOME/.git-aicommitrc
 export default {
     openAiKey: process.env.OPENAI_API_KEY,
-    addAllChangesBeforeCommit: true,
+    azureOpenAiKey: process.env.AZURE_OPENAI_API_KEY,
+    azureOpenAiInstanceName: process.env.AZURE_OPENAI_API_INSTANCE_NAME,
+    azureOpenAiDeploymentName: process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME,
+    azureOpenAiVersion: process.env.AZURE_OPENAI_API_VERSION,
     autocommit: true,
     openCommitTextEditor: false,
     language: 'english',
     systemMessagePromptTemplate: '' +
-        'You are expert AI, your job is to write clear and concise Git commit messages.' +
+        'You are expert software developer, your job is to write clear and concise Git commit messages. ' +
         'Your responsibility is to ensure that these messages accurately describe the changes made in each commit,' +
         'follow established guidelines. Provide a clear history of changes to the codebase.' +
         'Write 1-2 sentences. Output only the commit message without comments or other text.',
     humanPromptTemplate: '' +
         'Read the following git diff for a multiple files and ' +
         'write 1-2 sentences commit message in {language}' +
-        'without mentioning lines or files:\n' +
+        'without mentioning lines or files.' +
+        'If the reason behind the changed can be deducted from the changed, provide this reason:\n' +
         '{diff}',
     excludeFromDiff: [
-        '*.lock', '*.lockb'
+        '*.lock', '*.lockb', '*-lock.json', '*-lock.yaml'
     ],
     diffFilter: 'ACMRTUXB',
-    completionPromptParams: {
-        model: "gpt-3.5-turbo",
-        temperature: 0.0,
-        maxTokens: 1000,
-    }
+    modelName: "gpt-4.1-mini",
+    temperature: 0.0,
+    maxTokens: 2000,
 }
+
 ```
 
 ### Command line arguments
@@ -77,12 +80,10 @@ git-aicommit
 Or make an alias:
 
 ```bash
-alias gai='git-aicommit'
+alias gai="git add --all && git-aicommit && git push"
 
 ## And run it:
 gai
 ```
 
-It that simple!
-    
-
+It's that simple!

package/autocommit.js

@@ -1,16 +1,10 @@
-#!/usr/bin/env node
+#!/usr/bin/env bun
 
 import { execSync, spawn } from "child_process";
 import rc from 'rc';
-import {
-    ChatPromptTemplate,
-    HumanMessagePromptTemplate,
-    PromptTemplate,
-    SystemMessagePromptTemplate
-} from "langchain/prompts";
 import defaultConfig from './config.js';
-import {ChatOpenAI} from "langchain/chat_models/openai";
-import {getModelContextSize} from "./count_tokens.js";
+import { OpenAI } from "openai";
+import {calculateMaxTokens, getModelContextSize} from "./count_tokens.js";
 
 const config = rc(
     'git-aicommit',
@@ -22,26 +16,26 @@ const config = rc(
 );
 
 try {
-  execSync(
-    'git rev-parse --is-inside-work-tree',
-    {encoding: 'utf8', stdio: 'ignore'}
-  );
+    execSync(
+        'git rev-parse --is-inside-work-tree',
+        {encoding: 'utf8', stdio: 'ignore'}
+    );
 } catch (e) {
-  console.error("This is not a git repository");
-  process.exit(1);
+    console.error("This is not a git repository");
+    process.exit(1);
 }
 
 if (!config.openAiKey && !config.azureOpenAiKey) {
-  console.error("Please set OPENAI_API_KEY or AZURE_OPENAI_API_KEY");
-  process.exit(1);
+    console.error("Please set OPENAI_API_KEY or AZURE_OPENAI_API_KEY");
+    process.exit(1);
 }
 
 // if any settings related to AZURE are set, if there are items that are not set, will error.
 if (config.azureOpenAiKey && !(
     config.azureOpenAiInstanceName && config.azureOpenAiDeploymentName && config.azureOpenAiVersion
 )){
-  console.error("Please set AZURE_OPENAI_API_KEY, AZURE_OPENAI_API_INSTANCE_NAME, AZURE_OPENAI_API_DEPLOYMENT_NAME, AZURE_OPENAI_API_VERSION when Azure OpenAI Service.");
-  process.exit(1);
+    console.error("Please set AZURE_OPENAI_API_KEY, AZURE_OPENAI_API_INSTANCE_NAME, AZURE_OPENAI_API_DEPLOYMENT_NAME, AZURE_OPENAI_API_VERSION when Azure OpenAI Service.");
+    process.exit(1);
 }
 
 const excludeFromDiff = config.excludeFromDiff || [];
@@ -50,8 +44,8 @@ const diffCommand = `git diff --staged \
     --no-ext-diff \
     --diff-filter=${diffFilter} \
     -- ${excludeFromDiff.map(
-        (pattern) => `':(exclude)${pattern}'`
-    ).join(' ')}
+    (pattern) => `':(exclude)${pattern}'`
+).join(' ')}
 `;
 
 let diff = execSync(diffCommand, {encoding: 'utf8'});
@@ -61,106 +55,63 @@ if (!diff) {
     process.exit(1);
 }
 
-const openai = new ChatOpenAI({
-    modelName: config.modelName,
-    openAIApiKey: config.openAiKey,
-    azureOpenAIApiKey: config.azureOpenAiKey,
-    azureOpenAIApiInstanceName: config.azureOpenAiInstanceName,
-    azureOpenAIApiDeploymentName: config.azureOpenAiDeploymentName,
-    azureOpenAIApiVersion: config.azureOpenAiVersion,
-    temperature: config.temperature,
-    maxTokens: config.maxTokens,
+const openai = new OpenAI({
+    apiKey: config.openAiKey,
+    baseURL: config.azureOpenAiKey ? `https://${config.azureOpenAiInstanceName}.openai.azure.com/openai/deployments/${config.azureOpenAiDeploymentName}` : undefined,
+    defaultHeaders: config.azureOpenAiKey ? { 'api-key': config.azureOpenAiKey } : undefined,
+    defaultQuery: config.azureOpenAiKey ? { 'api-version': config.azureOpenAiVersion } : undefined, // defaultQuery for api-version as per OpenAI SDK v4+ for Azure
 });
 
-const systemMessagePromptTemplate = SystemMessagePromptTemplate.fromTemplate(
-    config.systemMessagePromptTemplate
-);
+async function getChatCompletion(messages) {
+    const response = await openai.chat.completions.create({
+        model: config.modelName || 'gpt-4.1-mini',
+        messages: messages,
+        temperature: config.temperature,
+        max_tokens: config.maxTokens,
+    });
 
-const humanPromptTemplate = HumanMessagePromptTemplate.fromTemplate(
-    config.humanPromptTemplate
-);
+    return response.choices[0].message.content.trim();
+}
 
-const chatPrompt = ChatPromptTemplate.fromPromptMessages([
-    systemMessagePromptTemplate,
-    humanPromptTemplate,
-]);
+const systemMessage = { role: "system", content: config.systemMessagePromptTemplate };
+const userMessage = { role: "user", content: config.humanPromptTemplate.replace("{diff}", diff).replace("{language}", config.language) };
 
-const chatMessages = await chatPrompt.formatMessages({
-    diff: diff,
-    language: config.language,
+const tokenCount = await calculateMaxTokens({
+    prompt: diff,
+    modelName: config.modelName || 'gpt-4.1-mini'
 });
 
-const tokenCount = (await openai.getNumTokensFromMessages(chatMessages)).totalCount
-const contextSize = getModelContextSize(config.modelName)
+const contextSize = getModelContextSize(config.modelName || 'gpt-4.1-mini');
 
 if (tokenCount > contextSize) {
-    console.log('Diff is too long. Splitting into multiple requests.')
-    // TODO: split smarter
-    const filenameRegex = /^a\/(.+?)\s+b\/(.+?)/;
-    const diffByFiles = diff
-        .split('diff ' + '--git ') // Wierd string concat in order to avoid splitting on this line when using autocommit in this repo :)
-        .filter((fileDiff) => fileDiff.length > 0)
-        .map((fileDiff) => {
-            const match = fileDiff.match(filenameRegex);
-            const filename = match ? match[1] : 'Unknown file';
-
-            const content = fileDiff
-                .replaceAll(filename, '')
-                .replaceAll('a/ b/\n', '')
-
-            return chatPrompt
-                .formatMessages({
-                    diff: content,
-                    language: config.language,
-                })
-                .then((prompt) => {
-                    return openai.call(prompt)
-                        .then((res) => {
-                            return {
-                                filename: filename,
-                                changes: res.text.trim(),
-                            }
-                        })
-                        .catch((e) => {
-                            console.error(`Error during OpenAI request: ${e.message}`);
-                            process.exit(1);
-                        });
-                });
-        });
-
-    // wait for all promises to resolve
-    const mergeChanges = await Promise.all(diffByFiles);
-
-    diff = mergeChanges
-        .map((fileDiff) => {
-            return `diff --git ${fileDiff.filename}\n${fileDiff.changes}`
-
-        })
-        .join('\n\n')
+    console.log('Diff is too long for the current model context. Please lower the amount of changes in the commit or switch to a model with a larger context window.');
+    process.exit(1);
 }
 
-const prompt = await chatPrompt.formatMessages({
-    diff: diff,
-    language: config.language,
-})
-
-const res = await openai.call(prompt)
-    .catch((e) => {
-        console.error(`Error during OpenAI request: ${e.message}`);
-        process.exit(1);
-    });
-
-const commitMessage = res.text.trim();
+const messages = [
+    systemMessage,
+    userMessage
+];
 
+const commitMessage = await getChatCompletion(messages);
 
 if (!config.autocommit) {
     console.log(`Autocommit is disabled. Here is the message:\n ${commitMessage}`);
 } else {
     console.log(`Committing with following message:\n ${commitMessage}`);
-    execSync(
-        `git commit -m "${commitMessage.replace(/"/g, '')}"`,
-        {encoding: 'utf8'}
-    );
+    try {
+        execSync(
+            'git commit -F -',
+            {
+                input: commitMessage,
+                encoding: 'utf8',
+                stdio: 'inherit'
+            }
+        );
+    } catch (error) {
+        console.error("Failed to commit.", error);
+        process.exit(1);
+    }
 }
 
 if (config.openCommitTextEditor) {

package/config.js

@@ -8,7 +8,7 @@ export default {
     openCommitTextEditor: false,
     language: 'english',
     systemMessagePromptTemplate: '' +
-        'You are expert AI, your job is to write clear and concise Git commit messages.' +
+        'You are expert software developer, your job is to write clear and concise Git commit messages. ' +
         'Your responsibility is to ensure that these messages accurately describe the changes made in each commit,' +
         'follow established guidelines. Provide a clear history of changes to the codebase.' +
         'Write 1-2 sentences. Output only the commit message without comments or other text.',
@@ -16,13 +16,13 @@ export default {
         'Read the following git diff for a multiple files and ' +
         'write 1-2 sentences commit message in {language}' +
         'without mentioning lines or files.' +
-        'Explain why these changes were made (summarize the reasoning):\n' +
+        'If the reason behind the changed can be deducted from the changed, provide this reason:\n' +
         '{diff}',
     excludeFromDiff: [
         '*.lock', '*.lockb', '*-lock.json', '*-lock.yaml'
     ],
     diffFilter: 'ACMRTUXB',
-    modelName: "gpt-3.5-turbo-16k",
+    modelName: "gpt-4.1-mini",
     temperature: 0.0,
     maxTokens: 2000,
 }

package/count_tokens.js

@@ -1,27 +1,27 @@
-// langchain/dist/base_language/count_tokens.js
 export const getModelNameForTiktoken = (modelName) => {
     if (modelName.startsWith("gpt-3.5-turbo-16k")) {
         return "gpt-3.5-turbo-16k";
     }
+
     if (modelName.startsWith("gpt-3.5-turbo-")) {
         return "gpt-3.5-turbo";
     }
+
     if (modelName.startsWith("gpt-4-32k-")) {
         return "gpt-4-32k";
     }
+
     if (modelName.startsWith("gpt-4-")) {
         return "gpt-4";
     }
-    return modelName;
-};
-export const getEmbeddingContextSize = (modelName) => {
-    switch (modelName) {
-        case "text-embedding-ada-002":
-            return 8191;
-        default:
-            return 2046;
+
+    if (modelName.startsWith("gpt-4o-")) {
+        return "gpt-4o";
     }
+    return modelName;
 };
+
+
 export const getModelContextSize = (modelName) => {
     switch (getModelNameForTiktoken(modelName)) {
         case "gpt-3.5-turbo-16k":
@@ -32,33 +32,24 @@ export const getModelContextSize = (modelName) => {
             return 32768;
         case "gpt-4":
             return 8192;
-        case "text-davinci-003":
-            return 4097;
-        case "text-curie-001":
-            return 2048;
-        case "text-babbage-001":
-            return 2048;
-        case "text-ada-001":
-            return 2048;
-        case "code-davinci-002":
-            return 8000;
-        case "code-cushman-001":
-            return 2048;
+        case "gpt-4o":
+            return 128000;
         default:
-            return 4097;
+            return 4096;
     }
 };
+
 export const importTiktoken = async () => {
     try {
         const { encoding_for_model } = await import("@dqbd/tiktoken");
         return { encoding_for_model };
-    }
-    catch (error) {
+    } catch (error) {
         console.log(error);
         return { encoding_for_model: null };
     }
 };
-export const calculateMaxTokens = async ({ prompt, modelName, }) => {
+
+export const calculateMaxTokens = async ({ prompt, modelName }) => {
     const { encoding_for_model } = await importTiktoken();
     // fallback to approximate calculation if tiktoken is not available
     let numTokens = Math.ceil(prompt.length / 4);
@@ -69,8 +60,7 @@ export const calculateMaxTokens = async ({ prompt, modelName, }) => {
             numTokens = tokenized.length;
             encoding.free();
         }
-    }
-    catch (error) {
+    } catch (error) {
         console.warn("Failed to calculate number of tokens with tiktoken, falling back to approximate count", error);
     }
     const maxTokens = getModelContextSize(modelName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-aicommit",
-  "version": "6.0.0",
+  "version": "7.1.0",
   "description": "Generates auto commit messages with OpenAI GPT3 model",
   "main": "autocommit.js",
   "repository": "https://github.com/shanginn/autocommit",
@@ -8,10 +8,9 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "langchain": "^0.0.75",
-    "openai": "^3.3.0",
+    "openai": "^4.52.7",
     "rc": "^1.2.8",
-    "tiktoken": "^1.0.8"
+    "tiktoken": "^1.0.15"
   },
   "preferGlobal": true,
   "bin": {