3.2.3 (#431)
* 378: fix hook env (#402) * fix(prepare-commit-msg-hook): update error handling to provide clearer instructions for setting API keys and improve user guidance * Fix: a bug that causes an error when pushing without setting git remote (#396) * update deploy commands * feat(cli): add context flag for providing additional commit message input * Fix [Bug]: punycode` module is deprecated #426 (#433) Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com> * npm audit fix (#432) Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com> * Feat: Add an option to `Don't push` when there are multiple git remotes (#434) --------- Co-authored-by: GPT8 <57486732+di-sukharev@users.noreply.github.com> * feat(engine): add support for MLX AI provider (#437) --------- Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> * feat(config, engine): add support for Mistral AI provider and engine (#436) * docs(CONTRIBUTING.md): update `TODO.md` reference (#435) Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> * feat(config, engine): add support for Mistral AI provider and engine * ``` feat(package): add mistralai and zod dependencies ``` * fix: recreate package-lock.json with node20 * fix: recreate package-lock.json with node v20.18.1 based on branch dev --------- Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: pedro-valentim <> --------- Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com> Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: Takanori Matsumoto <matscube@gmail.com> Co-authored-by: BILLY Maxime <ozeliurs@gmail.com> Co-authored-by: Welington Sampaio <welington.sampaio@icloud.com> Co-authored-by: Tiger Kaovilai <passawit.kaovilai@gmail.com> Co-authored-by: albi ⚡️ <sigismondi.alberto@gmail.com> Co-authored-by: Emmanuel Ferdman <emmanuelferdman@gmail.com> Co-authored-by: Pedro Valentim Silva Leite <18179935+pedro-valentim@users.noreply.github.com>
This commit is contained in:
+63
-14
@@ -20487,7 +20487,7 @@ var require_mappingTable = __commonJS({
|
||||
var require_tr46 = __commonJS({
|
||||
"node_modules/node-fetch/node_modules/tr46/index.js"(exports, module2) {
|
||||
"use strict";
|
||||
var punycode = require("punycode");
|
||||
const punycode = require('punycode/');
|
||||
var mappingTable = require_mappingTable();
|
||||
var PROCESSING_OPTIONS = {
|
||||
TRANSITIONAL: 0,
|
||||
@@ -20649,7 +20649,7 @@ var require_tr46 = __commonJS({
|
||||
var require_url_state_machine = __commonJS({
|
||||
"node_modules/node-fetch/node_modules/whatwg-url/lib/url-state-machine.js"(exports, module2) {
|
||||
"use strict";
|
||||
var punycode = require("punycode");
|
||||
const punycode = require('punycode/');
|
||||
var tr46 = require_tr46();
|
||||
var specialSchemes = {
|
||||
ftp: 21,
|
||||
@@ -48745,6 +48745,8 @@ var getDefaultModel = (provider) => {
|
||||
switch (provider) {
|
||||
case "ollama":
|
||||
return "";
|
||||
case "mlx":
|
||||
return "";
|
||||
case "anthropic":
|
||||
return MODEL_LIST.anthropic[0];
|
||||
case "gemini":
|
||||
@@ -48776,7 +48778,7 @@ var configValidators = {
|
||||
validateConfig(
|
||||
"OCO_API_KEY",
|
||||
value,
|
||||
'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "azure" or "gemini" or "flowise" or "anthropic". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`'
|
||||
'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`'
|
||||
);
|
||||
return value;
|
||||
},
|
||||
@@ -48882,8 +48884,8 @@ var configValidators = {
|
||||
"test",
|
||||
"flowise",
|
||||
"groq"
|
||||
].includes(value) || value.startsWith("ollama"),
|
||||
`${value} is not supported yet, use 'ollama', 'anthropic', 'azure', 'gemini', 'flowise' or 'openai' (default)`
|
||||
].includes(value) || value.startsWith("ollama") || value.startsWith("mlx"),
|
||||
`${value} is not supported yet, use 'ollama', 'mlx', anthropic', 'azure', 'gemini', 'flowise' or 'openai' (default)`
|
||||
);
|
||||
return value;
|
||||
},
|
||||
@@ -63325,6 +63327,38 @@ var GroqEngine = class extends OpenAiEngine {
|
||||
}
|
||||
};
|
||||
|
||||
// src/engine/mlx.ts
|
||||
var MLXEngine = class {
|
||||
constructor(config6) {
|
||||
this.config = config6;
|
||||
this.client = axios_default.create({
|
||||
url: config6.baseURL ? `${config6.baseURL}/${config6.apiKey}` : "http://localhost:8080/v1/chat/completions",
|
||||
headers: { "Content-Type": "application/json" }
|
||||
});
|
||||
}
|
||||
async generateCommitMessage(messages) {
|
||||
const params = {
|
||||
messages,
|
||||
temperature: 0,
|
||||
top_p: 0.1,
|
||||
repetition_penalty: 1.5,
|
||||
stream: false
|
||||
};
|
||||
try {
|
||||
const response = await this.client.post(
|
||||
this.client.getUri(this.config),
|
||||
params
|
||||
);
|
||||
const choices = response.data.choices;
|
||||
const message = choices[0].message;
|
||||
return message?.content;
|
||||
} catch (err) {
|
||||
const message = err.response?.data?.error ?? err.message;
|
||||
throw new Error(`MLX provider error: ${message}`);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// src/utils/engine.ts
|
||||
function getEngine() {
|
||||
const config6 = getConfig();
|
||||
@@ -63351,6 +63385,8 @@ function getEngine() {
|
||||
return new FlowiseEngine(DEFAULT_CONFIG2);
|
||||
case "groq" /* GROQ */:
|
||||
return new GroqEngine(DEFAULT_CONFIG2);
|
||||
case "mlx" /* MLX */:
|
||||
return new MLXEngine(DEFAULT_CONFIG2);
|
||||
default:
|
||||
return new OpenAiEngine(DEFAULT_CONFIG2);
|
||||
}
|
||||
@@ -63732,7 +63768,14 @@ var CONVENTIONAL_COMMIT_KEYWORDS = "Do not preface the commit with anything, exc
|
||||
var getCommitConvention = (fullGitMojiSpec) => config4.OCO_EMOJI ? fullGitMojiSpec ? FULL_GITMOJI_SPEC : GITMOJI_HELP : CONVENTIONAL_COMMIT_KEYWORDS;
|
||||
var getDescriptionInstruction = () => config4.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.";
|
||||
var getOneLineCommitInstruction = () => config4.OCO_ONE_LINE_COMMIT ? "Craft a concise commit message that encapsulates all changes made, with an emphasis on the primary updates. If the modifications share a common theme or scope, mention it succinctly; otherwise, leave the scope out to maintain focus. The goal is to provide a clear and unified overview of the changes in a one single message, without diverging into a list of commit per file change." : "";
|
||||
var INIT_MAIN_PROMPT2 = (language, fullGitMojiSpec) => ({
|
||||
var userInputCodeContext = (context2) => {
|
||||
if (context2 !== "" && context2 !== " ") {
|
||||
return `Additional context provided by the user: <context>${context2}</context>
|
||||
Consider this context when generating the commit message, incorporating relevant information when appropriate.`;
|
||||
}
|
||||
return "";
|
||||
};
|
||||
var INIT_MAIN_PROMPT2 = (language, fullGitMojiSpec, context2) => ({
|
||||
role: "system",
|
||||
content: (() => {
|
||||
const commitConvention = fullGitMojiSpec ? "GitMoji specification" : "Conventional Commit Convention";
|
||||
@@ -63742,12 +63785,14 @@ var INIT_MAIN_PROMPT2 = (language, fullGitMojiSpec) => ({
|
||||
const descriptionGuideline = getDescriptionInstruction();
|
||||
const oneLineCommitGuideline = getOneLineCommitInstruction();
|
||||
const generalGuidelines = `Use the present tense. Lines must not be longer than 74 characters. Use ${language} for the commit message.`;
|
||||
const userInputContext = userInputCodeContext(context2);
|
||||
return `${missionStatement}
|
||||
${diffInstruction}
|
||||
${conventionGuidelines}
|
||||
${descriptionGuideline}
|
||||
${oneLineCommitGuideline}
|
||||
${generalGuidelines}`;
|
||||
${generalGuidelines}
|
||||
${userInputContext}`;
|
||||
})()
|
||||
});
|
||||
var INIT_DIFF_PROMPT = {
|
||||
@@ -63789,7 +63834,7 @@ var INIT_CONSISTENCY_PROMPT = (translation4) => ({
|
||||
role: "assistant",
|
||||
content: getContent(translation4)
|
||||
});
|
||||
var getMainCommitPrompt = async (fullGitMojiSpec) => {
|
||||
var getMainCommitPrompt = async (fullGitMojiSpec, context2) => {
|
||||
switch (config4.OCO_PROMPT_MODULE) {
|
||||
case "@commitlint":
|
||||
if (!await commitlintLLMConfigExists()) {
|
||||
@@ -63811,7 +63856,7 @@ var getMainCommitPrompt = async (fullGitMojiSpec) => {
|
||||
];
|
||||
default:
|
||||
return [
|
||||
INIT_MAIN_PROMPT2(translation3.localLanguage, fullGitMojiSpec),
|
||||
INIT_MAIN_PROMPT2(translation3.localLanguage, fullGitMojiSpec, context2),
|
||||
INIT_DIFF_PROMPT,
|
||||
INIT_CONSISTENCY_PROMPT(translation3)
|
||||
];
|
||||
@@ -63838,8 +63883,8 @@ function mergeDiffs(arr, maxStringLength) {
|
||||
var config5 = getConfig();
|
||||
var MAX_TOKENS_INPUT = config5.OCO_TOKENS_MAX_INPUT;
|
||||
var MAX_TOKENS_OUTPUT = config5.OCO_TOKENS_MAX_OUTPUT;
|
||||
var generateCommitMessageChatCompletionPrompt = async (diff, fullGitMojiSpec) => {
|
||||
const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec);
|
||||
var generateCommitMessageChatCompletionPrompt = async (diff, fullGitMojiSpec, context2) => {
|
||||
const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec, context2);
|
||||
const chatContextAsCompletionRequest = [...INIT_MESSAGES_PROMPT];
|
||||
chatContextAsCompletionRequest.push({
|
||||
role: "user",
|
||||
@@ -63855,9 +63900,12 @@ var GenerateCommitMessageErrorEnum = ((GenerateCommitMessageErrorEnum2) => {
|
||||
return GenerateCommitMessageErrorEnum2;
|
||||
})(GenerateCommitMessageErrorEnum || {});
|
||||
var ADJUSTMENT_FACTOR = 20;
|
||||
var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false) => {
|
||||
var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false, context2 = "") => {
|
||||
try {
|
||||
const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(fullGitMojiSpec);
|
||||
const INIT_MESSAGES_PROMPT = await getMainCommitPrompt(
|
||||
fullGitMojiSpec,
|
||||
context2
|
||||
);
|
||||
const INIT_MESSAGES_PROMPT_LENGTH = INIT_MESSAGES_PROMPT.map(
|
||||
(msg) => tokenCount(msg.content) + 4
|
||||
).reduce((a3, b3) => a3 + b3, 0);
|
||||
@@ -63877,7 +63925,8 @@ var generateCommitMessageByDiff = async (diff, fullGitMojiSpec = false) => {
|
||||
}
|
||||
const messages = await generateCommitMessageChatCompletionPrompt(
|
||||
diff,
|
||||
fullGitMojiSpec
|
||||
fullGitMojiSpec,
|
||||
context2
|
||||
);
|
||||
const engine = getEngine();
|
||||
const commitMessage = await engine.generateCommitMessage(messages);
|
||||
|
||||
Reference in New Issue
Block a user