Merge remote-tracking branch 'origin/dev'

src/api.ts

@@ -7,7 +7,9 @@ import {
   OpenAIApi
 } from 'openai';
 
-import { CONFIG_MODES, getConfig } from './commands/config';
+import {CONFIG_MODES, DEFAULT_MODEL_TOKEN_LIMIT, getConfig} from './commands/config';
+import {tokenCount} from './utils/tokenCount';
+import {GenerateCommitMessageErrorEnum} from './generateCommitMessageFromGitDiff';
 
 const config = getConfig();
 
@@ -56,6 +58,14 @@ class OpenAi {
       max_tokens: maxTokens || 500
     };
     try {
+      const REQUEST_TOKENS = messages.map(
+          (msg) => tokenCount(msg.content) + 4
+      ).reduce((a, b) => a + b, 0);
+
+      if (REQUEST_TOKENS > (DEFAULT_MODEL_TOKEN_LIMIT - maxTokens)) {
+        throw new Error(GenerateCommitMessageErrorEnum.tooMuchTokens);
+      }
+
       const { data } = await this.openAI.createChatCompletion(params);
 
       const message = data.choices[0].message;

src/commands/config.ts

@@ -22,6 +22,8 @@ export enum CONFIG_KEYS {
   OCO_LANGUAGE = 'OCO_LANGUAGE'
 }
 
+export const DEFAULT_MODEL_TOKEN_LIMIT = 4096;
+
 export enum CONFIG_MODES {
   get = 'get',
   set = 'set'

src/generateCommitMessageFromGitDiff.ts

@@ -2,11 +2,11 @@ import {
     ChatCompletionRequestMessage,
     ChatCompletionRequestMessageRoleEnum
 } from 'openai';
-import { api } from './api';
+import {api} from './api';
-import { getConfig } from './commands/config';
+import {DEFAULT_MODEL_TOKEN_LIMIT, getConfig} from './commands/config';
-import { mergeDiffs } from './utils/mergeDiffs';
+import {mergeDiffs} from './utils/mergeDiffs';
-import { i18n, I18nLocals } from './i18n';
+import {i18n, I18nLocals} from './i18n';
-import { tokenCount } from './utils/tokenCount';
+import {tokenCount} from './utils/tokenCount';
 
 const config = getConfig();
 const translation = i18n[(config?.OCO_LANGUAGE as I18nLocals) || 'en'];
@@ -16,8 +16,8 @@ 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.
-${config?.OCO_EMOJI ? 'Use GitMoji convention to preface the commit.': 'Do not preface the commit with anything.'}
+${config?.OCO_EMOJI ? 'Use GitMoji convention to preface the commit.' : 'Do not preface the commit with anything.'}
-${config?.OCO_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."}
+${config?.OCO_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.`
     },
     {
@@ -74,24 +74,32 @@ export enum GenerateCommitMessageErrorEnum {
     emptyMessage = 'EMPTY_MESSAGE'
 }
 
-
 const INIT_MESSAGES_PROMPT_LENGTH = INIT_MESSAGES_PROMPT.map(
     (msg) => tokenCount(msg.content) + 4
 ).reduce((a, b) => a + b, 0);
 
-const MAX_REQ_TOKENS = 3000 - INIT_MESSAGES_PROMPT_LENGTH;
+const ADJUSTMENT_FACTOR = 20;
 
 export const generateCommitMessageByDiff = async (
     diff: string
 ): Promise<string> => {
     try {
-    if (tokenCount(diff) >= MAX_REQ_TOKENS) {
+        const MAX_REQUEST_TOKENS = DEFAULT_MODEL_TOKEN_LIMIT
+            - ADJUSTMENT_FACTOR
+            - INIT_MESSAGES_PROMPT_LENGTH
+            - config?.OCO_OPENAI_MAX_TOKENS;
+
+        if (tokenCount(diff) >= MAX_REQUEST_TOKENS) {
             const commitMessagePromises = getCommitMsgsPromisesFromFileDiffs(
                 diff,
-        MAX_REQ_TOKENS
+                MAX_REQUEST_TOKENS
             );
 
-      const commitMessages = await Promise.all(commitMessagePromises);
+            const commitMessages = [];
+            for (const promise of commitMessagePromises) {
+                commitMessages.push(await promise);
+                await delay(2000);
+            }
 
             return commitMessages.join('\n\n');
         } else {
@@ -123,9 +131,17 @@ function getMessagesPromisesByChangesInFile(
         maxChangeLength
     );
 
-  const lineDiffsWithHeader = mergedChanges.map(
+    const lineDiffsWithHeader = [];
-    (change) => fileHeader + change
+    for (const change of mergedChanges) {
-  );
+        const totalChange = fileHeader + change;
+        if (tokenCount(totalChange) > maxChangeLength) {
+            // If the totalChange is too large, split it into smaller pieces
+            const splitChanges = splitDiff(totalChange, maxChangeLength);
+            lineDiffsWithHeader.push(...splitChanges);
+        } else {
+            lineDiffsWithHeader.push(totalChange);
+        }
+    }
 
     const commitMsgsFromFileLineDiffs = lineDiffsWithHeader.map((lineDiff) => {
         const messages = generateCommitMessageChatCompletionPrompt(
@@ -138,6 +154,39 @@ function getMessagesPromisesByChangesInFile(
     return commitMsgsFromFileLineDiffs;
 }
 
+
+function splitDiff(diff: string, maxChangeLength: number) {
+    const lines = diff.split('\n');
+    const splitDiffs = [];
+    let currentDiff = '';
+
+    for (let line of lines) {
+        // If a single line exceeds maxChangeLength, split it into multiple lines
+        while (tokenCount(line) > maxChangeLength) {
+            const subLine = line.substring(0, maxChangeLength);
+            line = line.substring(maxChangeLength);
+            splitDiffs.push(subLine);
+        }
+
+        // Check the tokenCount of the currentDiff and the line separately
+        if (tokenCount(currentDiff) + tokenCount('\n' + line) > maxChangeLength) {
+            // If adding the next line would exceed the maxChangeLength, start a new diff
+            splitDiffs.push(currentDiff);
+            currentDiff = line;
+        } else {
+            // Otherwise, add the line to the current diff
+            currentDiff += '\n' + line;
+        }
+    }
+
+    // Add the last diff
+    if (currentDiff) {
+        splitDiffs.push(currentDiff);
+    }
+
+    return splitDiffs;
+}
+
 export function getCommitMsgsPromisesFromFileDiffs(
     diff: string,
     maxDiffLength: number
@@ -169,5 +218,11 @@ export function getCommitMsgsPromisesFromFileDiffs(
             commitMessagePromises.push(api.generateCommitMessage(messages));
         }
     }
+
+
     return commitMessagePromises;
 }
+
+function delay(ms: number) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}