git-aicommit 4.0.0 → 5.0.0

package/.github/workflows/npm-publish.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish

package/README.md

@@ -34,28 +34,30 @@ touch $HOME/.git-aicommitrc
 
 ```js
 // $HOME/.git-aicommitrc
-module.exports = {
+export default {
     openAiKey: process.env.OPENAI_API_KEY,
     addAllChangesBeforeCommit: true,
     autocommit: true,
     openCommitTextEditor: false,
-    promptBeforeDiff: 'Read the following git diff for a multiple files:',
-    promptAfterDiff: 'Generate 1 to 3 paragraphs to explain this diff to a human without mentioning changes themselves:',
+    language: 'english',
+    systemMessagePromptTemplate: '' +
+        'You are expert AI, 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' +
+        '{diff}',
     excludeFromDiff: [
-        '*.lock'
+        '*.lock', '*.lockb'
     ],
     diffFilter: 'ACMRTUXB',
     completionPromptParams: {
-        model: "text-davinci-002",
-        max_tokens: 500,
-        temperature: 0.2,
-        top_p: 1,
-        presence_penalty: 0,
-        frequency_penalty: 0,
-        best_of: 1,
-        n: 1,
-        stream: false,
-        stop: ["\n\n\n"],
+        model: "gpt-3.5-turbo",
+        temperature: 0.0,
+        maxTokens: 1000,
     }
 }
 ```

package/autocommit.js

@@ -1,13 +1,19 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 
 import { execSync, spawn } from "child_process";
 import rc from 'rc';
-import { ChatOpenAI } from "langchain/chat_models";
-import {ChatPromptTemplate, HumanMessagePromptTemplate, SystemMessagePromptTemplate} from "langchain/prompts";
+import {
+    ChatPromptTemplate,
+    HumanMessagePromptTemplate,
+    PromptTemplate,
+    SystemMessagePromptTemplate
+} from "langchain/prompts";
 import defaultConfig from './config.js';
-import dotenv from 'dotenv';
-
-dotenv.config();
+import {RecursiveCharacterTextSplitter} from "langchain/text_splitter";
+import {loadSummarizationChain} from "langchain/chains";
+import {ChatOpenAI} from "langchain/chat_models/openai";
+import {OpenAI} from "langchain/llms/openai";
+import fs from "fs";
 
 const config = rc(
     'git-aicommit',
@@ -35,13 +41,14 @@ if (!config.openAiKey) {
 const excludeFromDiff = config.excludeFromDiff || [];
 const diffFilter = config.diffFilter || 'ACMRTUXB';
 const diffCommand = `git diff --staged \
+    --no-ext-diff \
     --diff-filter=${diffFilter} \
     -- "${excludeFromDiff.map(
         (pattern) => `:(exclude)${pattern}`
     ).join(' ')}"
 `;
 
-const diff = execSync(diffCommand, {encoding: 'utf8'});
+let diff = execSync(diffCommand, {encoding: 'utf8'});
 
 if (!diff) {
     console.error("Diff seems empty. Please commit manually.");
@@ -50,18 +57,67 @@ if (!diff) {
 
 const openai = new ChatOpenAI({
     modelName: config.modelName,
-    apiKey: config.openAiKey,
+    openAIApiKey: config.openAiKey,
     temperature: config.temperature,
     maxTokens: config.maxTokens,
 });
 
-const systemMessagePromptTemplate = SystemMessagePromptTemplate.fromTemplate(config.systemMessagePromptTemplate)
-const humanPromptTemplate = HumanMessagePromptTemplate.fromTemplate(config.humanPromptTemplate)
+const systemMessagePromptTemplate = SystemMessagePromptTemplate.fromTemplate(
+    config.systemMessagePromptTemplate
+);
+
+const humanPromptTemplate = HumanMessagePromptTemplate.fromTemplate(
+    config.humanPromptTemplate
+);
 
 const chatPrompt = ChatPromptTemplate.fromPromptMessages([
     systemMessagePromptTemplate,
     humanPromptTemplate,
-])
+]);
+
+if (diff.length > 2000) {
+    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')
+}
 
 const prompt = await chatPrompt.formatMessages({
     diff: diff,
@@ -69,6 +125,10 @@ const prompt = await chatPrompt.formatMessages({
 })
 
 const res = await openai.call(prompt)
+    .catch((e) => {
+        console.error(`Error during OpenAI request: ${e.message}`);
+        process.exit(1);
+    });
 
 const commitMessage = res.text.trim();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-aicommit",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "Generates auto commit messages with OpenAI GPT3 model",
   "main": "autocommit.js",
   "repository": "https://github.com/shanginn/autocommit",
@@ -8,10 +8,10 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "dotenv": "^16.0.2",
-    "langchain": "^0.0.47",
-    "openai": "^3.0.0",
-    "rc": "1.2.8"
+    "@dqbd/tiktoken": "^1.0.6",
+    "langchain": "^0.0.59",
+    "openai": "^3.2.1",
+    "rc": "^1.2.8"
   },
   "preferGlobal": true,
   "bin": {