git-aicommit 4.0.1 → 5.1.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

@@ -8,10 +8,8 @@ Tired of writing commit messages? Let the computer do it for you!
 
 ## Installation
 
-It's recommended to use [bun](https://bun.sh/)
-
 ```bash
-bun install -g git-aicommit
+npm install -g git-aicommit
 ```
 
 ## Configuration

package/autocommit.js

@@ -1,19 +1,26 @@
-#!/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',
     {
         ...defaultConfig,
         openAiKey: process.env.OPENAI_API_KEY,
+        azureOpenAIApiKey: process.env.AZURE_OPENAI_API_KEY
     },
 );
 
@@ -27,21 +34,29 @@ try {
   process.exit(1);
 }
 
-if (!config.openAiKey) {
-  console.error("Please set OPENAI_API_KEY");
+if (!config.openAiKey && !config.azureOpenAiKey) {
+  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);
 }
 
 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.");
@@ -51,17 +66,70 @@ if (!diff) {
 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 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 +137,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/config.js

@@ -1,5 +1,9 @@
 export default {
     openAiKey: process.env.OPENAI_API_KEY,
+    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,
     addAllChangesBeforeCommit: true,
     autocommit: true,
     openCommitTextEditor: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-aicommit",
-  "version": "4.0.1",
+  "version": "5.1.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.7",
+    "langchain": "^0.0.75",
+    "openai": "^3.2.1",
+    "rc": "^1.2.8"
   },
   "preferGlobal": true,
   "bin": {